From: Jos Collin <jcollin@redhat.com>
Date: Thu, 2 Jan 2020 10:18:37 +0000 (+0530)
Subject: mgr/volumes: cleanup on fs create error
X-Git-Tag: v14.2.8~49^2~30
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b701323f7da01a4e33ae16ef5a0fd2fae24c95e6;p=ceph.git

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>
(cherry picked from commit 171c37504f71df95ec10fb294229abbc09d36e47)
---

diff --git a/src/pybind/mgr/volumes/fs/volume.py b/src/pybind/mgr/volumes/fs/volume.py
index 1c0e2db2ce7b..9a31dd35313f 100644
--- a/src/pybind/mgr/volumes/fs/volume.py
+++ b/src/pybind/mgr/volumes/fs/volume.py
@@ -246,9 +246,6 @@ class VolumeClient(object):
         # create the given pool
         command = {'prefix': 'osd pool create', 'pool': pool_name, 'pg_num': pg_num}
         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):
@@ -302,11 +299,16 @@ class VolumeClient(object):
             return r, outb, outs
         r, outb, outs = self.create_pool(data_pool, 8)
         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)