parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 111 Wiki Activity

Verify the pool exists before removing it

This commit is contained in:
Joshua Boniface 2018-11-01 19:55:13 -04:00
parent 99fcb21e3b
commit 41bedbae3c
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client-common/ceph.py
View File

@ -41,6 +41,13 @@ def verifyOSD(zk_conn, osd_id):
else: else:
return False return False
# Verify Pool is valid in cluster
def verifyPool(zk_conn, name):
if zkhandler.exists(zk_conn, '/ceph/pools/{}'.format(name)):
return True
else:
return False
# Verify OSD path is valid in cluster # Verify OSD path is valid in cluster
def verifyOSDBlock(zk_conn, node, device): def verifyOSDBlock(zk_conn, node, device):
for osd in zkhandler.listchildren(zk_conn, '/ceph/osds'): for osd in zkhandler.listchildren(zk_conn, '/ceph/osds'):
@ -651,6 +658,9 @@ def add_pool(zk_conn, name, pgs):
return success, message return success, message
def remove_pool(zk_conn, name): def remove_pool(zk_conn, name):
if not verifyPool(zk_conn, name):
return False, 'ERROR: No pool with name "{}" is present in the cluster.'.format(name)
# Tell the cluster to create a new pool # Tell the cluster to create a new pool
remove_pool_string = 'pool_remove {}'.format(name) remove_pool_string = 'pool_remove {}'.format(name)
zkhandler.writedata(zk_conn, {'/ceph/cmd': remove_pool_string}) zkhandler.writedata(zk_conn, {'/ceph/cmd': remove_pool_string})