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

Add write-lock-wait to all other Ceph commands

This commit is contained in:
Joshua Boniface 2019-06-21 09:05:00 -04:00
parent 33bf3ee3cf
commit 3d3fa1b99f
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
client-common/ceph.py
View File

@ -847,7 +847,12 @@ def add_osd(zk_conn, node, device, weight):
message = 'ERROR: Command ignored by node.' message = 'ERROR: Command ignored by node.'
success = False success = False
# Acquire a write lock to ensure things go smoothly
lock = zkhandler.writelock(zk_conn, '/ceph/cmd')
with lock:
time.sleep(1)
zkhandler.writedata(zk_conn, {'/ceph/cmd': ''}) zkhandler.writedata(zk_conn, {'/ceph/cmd': ''})
return success, message return success, message
def remove_osd(zk_conn, osd_id): def remove_osd(zk_conn, osd_id):
@ -874,7 +879,12 @@ def remove_osd(zk_conn, osd_id):
success = False success = False
message = 'ERROR Command ignored by node.' message = 'ERROR Command ignored by node.'
# Acquire a write lock to ensure things go smoothly
lock = zkhandler.writelock(zk_conn, '/ceph/cmd')
with lock:
time.sleep(1)
zkhandler.writedata(zk_conn, {'/ceph/cmd': ''}) zkhandler.writedata(zk_conn, {'/ceph/cmd': ''})
return success, message return success, message
def in_osd(zk_conn, osd_id): def in_osd(zk_conn, osd_id):
@ -901,7 +911,12 @@ def in_osd(zk_conn, osd_id):
success = False success = False
message = 'ERROR Command ignored by node.' message = 'ERROR Command ignored by node.'
# Acquire a write lock to ensure things go smoothly
lock = zkhandler.writelock(zk_conn, '/ceph/cmd')
with lock:
time.sleep(1)
zkhandler.writedata(zk_conn, {'/ceph/cmd': ''}) zkhandler.writedata(zk_conn, {'/ceph/cmd': ''})
return success, message return success, message
def out_osd(zk_conn, osd_id): def out_osd(zk_conn, osd_id):
@ -928,7 +943,12 @@ def out_osd(zk_conn, osd_id):
success = False success = False
message = 'ERROR Command ignored by node.' message = 'ERROR Command ignored by node.'
# Acquire a write lock to ensure things go smoothly
lock = zkhandler.writelock(zk_conn, '/ceph/cmd')
with lock:
time.sleep(1)
zkhandler.writedata(zk_conn, {'/ceph/cmd': ''}) zkhandler.writedata(zk_conn, {'/ceph/cmd': ''})
return success, message return success, message
def set_osd(zk_conn, option): def set_osd(zk_conn, option):
@ -976,7 +996,12 @@ def unset_osd(zk_conn, option):
success = False success = False
message = 'ERROR Command ignored by node.' message = 'ERROR Command ignored by node.'
# Acquire a write lock to ensure things go smoothly
lock = zkhandler.writelock(zk_conn, '/ceph/cmd')
with lock:
time.sleep(1)
zkhandler.writedata(zk_conn, {'/ceph/cmd': ''}) zkhandler.writedata(zk_conn, {'/ceph/cmd': ''})
return success, message return success, message
def get_list_osd(zk_conn, limit): def get_list_osd(zk_conn, limit):