From: Venky Shankar <vshankar@redhat.com>
Date: Fri, 11 Oct 2019 07:44:32 +0000 (-0400)
Subject: mgr/volumes: guard volume delete by waiting for pending ops
X-Git-Tag: v14.2.8~49^2~33
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b1f85d896502b40af0fe01465e7bdf37c3e474e1;p=ceph.git

mgr/volumes: guard volume delete by waiting for pending ops

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 968f67576e10fcb486819cfe3e5b44586d0d7b84)
---

diff --git a/src/pybind/mgr/volumes/fs/volume.py b/src/pybind/mgr/volumes/fs/volume.py
index 733e7121b896..0a5d98eed35e 100644
--- a/src/pybind/mgr/volumes/fs/volume.py
+++ b/src/pybind/mgr/volumes/fs/volume.py
@@ -325,7 +325,7 @@ class VolumeClient(object):
             return -errno.ESHUTDOWN, "", "shutdown in progress"
 
         self.purge_queue.cancel_purge_job(volname)
-        self.connection_pool.del_fs_handle(volname)
+        self.connection_pool.del_fs_handle(volname, wait=True)
         # Tear down MDS daemons
         try:
             completion = self.mgr.remove_stateless_service("mds", volname)