From: Michael Fritch <mfritch@suse.com>
Date: Tue, 3 Mar 2020 15:21:30 +0000 (-0700)
Subject: mgr/volumes: add missing `mgr` param
X-Git-Tag: v14.2.10~189^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7be1e6d155bb77fbe92939c08a3a35dfd7da10d2;p=ceph.git

mgr/volumes: add missing `mgr` param

fixes mypy errors:

volumes/fs/operations/volume.py: note: In function "create_volume":
volumes/fs/operations/volume.py:216: error: Too few arguments for "remove_pool"
volumes/fs/operations/volume.py:223: error: Too few arguments for "remove_pool"
volumes/fs/operations/volume.py:224: error: Too few arguments for "remove_pool"

Fixes: https://tracker.ceph.com/issues/44393
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit a3b61a357730e0834ded4e6c47be0998bc4ea472)
---

diff --git a/src/pybind/mgr/volumes/fs/operations/volume.py b/src/pybind/mgr/volumes/fs/operations/volume.py
index 634521b42cf..a97e9b8c73a 100644
--- a/src/pybind/mgr/volumes/fs/operations/volume.py
+++ b/src/pybind/mgr/volumes/fs/operations/volume.py
@@ -208,15 +208,15 @@ def create_volume(mgr, volname):
     r, outb, outs = create_pool(mgr, data_pool, 8)
     if r != 0:
         #cleanup
-        remove_pool(metadata_pool)
+        remove_pool(mgr, metadata_pool)
         return r, outb, outs
     # create filesystem
     r, outb, outs = create_filesystem(mgr, volname, metadata_pool, data_pool)
     if r != 0:
         log.error("Filesystem creation error: {0} {1} {2}".format(r, outb, outs))
         #cleanup
-        remove_pool(data_pool)
-        remove_pool(metadata_pool)
+        remove_pool(mgr, data_pool)
+        remove_pool(mgr, metadata_pool)
         return r, outb, outs
     # create mds
     return create_mds(mgr, volname)