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: v15.1.0~978^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=968f67576e10fcb486819cfe3e5b44586d0d7b84;p=ceph.git

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

Signed-off-by: Venky Shankar <vshankar@redhat.com>
---

diff --git a/src/pybind/mgr/volumes/fs/volume.py b/src/pybind/mgr/volumes/fs/volume.py
index 0d62fe040bf1..83debbc29449 100644
--- a/src/pybind/mgr/volumes/fs/volume.py
+++ b/src/pybind/mgr/volumes/fs/volume.py
@@ -320,7 +320,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_mds(volname)