mgr/volumes: cleanup on fs create error

* clean up on fs create error
* drop unnecessary check in create_pool

Signed-off-by: Jos Collin <jcollin@redhat.com>

diff --git a/src/pybind/mgr/volumes/fs/volume.py b/src/pybind/mgr/volumes/fs/volume.py
index 0cb46c8dcb49437651606709823137f85578decc..2998b6860a101aaa189440bb561f4b3482a0bdf2 100644 (file)
--- a/src/pybind/mgr/volumes/fs/volume.py
+++ b/src/pybind/mgr/volumes/fs/volume.py
@@ -249,9 +249,6 @@ class VolumeClient(object):
         # create the given pool
         command = {'prefix': 'osd pool create', 'pool': pool_name}
         r, outb, outs = self.mgr.mon_command(command)
-        if r != 0:
-            return r, outb, outs
-
         return r, outb, outs
 
     def remove_pool(self, pool_name):
@@ -304,11 +301,16 @@ class VolumeClient(object):
             return r, outb, outs
         r, outb, outs = self.create_pool(data_pool)
         if r != 0:
+            #cleanup
+            self.remove_pool(metadata_pool)
             return r, outb, outs
         # create filesystem
         r, outb, outs = self.create_filesystem(volname, metadata_pool, data_pool)
         if r != 0:
             log.error("Filesystem creation error: {0} {1} {2}".format(r, outb, outs))
+            #cleanup
+            self.remove_pool(data_pool)
+            self.remove_pool(metadata_pool)
             return r, outb, outs
         # create mds
         return self.create_mds(volname)