Convert missed elements to new zkhandler
This commit is contained in:
parent
5740d0f2d5
commit
12ac3686de
|
@ -994,7 +994,7 @@ if enable_storage:
|
||||||
@zkhandler.zk_conn.DataWatch('/cmd/ceph')
|
@zkhandler.zk_conn.DataWatch('/cmd/ceph')
|
||||||
def cmd_ceph(data, stat, event=''):
|
def cmd_ceph(data, stat, event=''):
|
||||||
if data:
|
if data:
|
||||||
CephInstance.run_command(zkhandler.zk_conn, logger, this_node, data.decode('ascii'), d_osd)
|
CephInstance.run_command(zkhandler, logger, this_node, data.decode('ascii'), d_osd)
|
||||||
|
|
||||||
# OSD objects
|
# OSD objects
|
||||||
@zkhandler.zk_conn.ChildrenWatch('/ceph/osds')
|
@zkhandler.zk_conn.ChildrenWatch('/ceph/osds')
|
||||||
|
@ -1702,7 +1702,7 @@ def node_keepalive():
|
||||||
# Ensures that, if we lost the lock race and come out of waiting,
|
# Ensures that, if we lost the lock race and come out of waiting,
|
||||||
# we won't try to trigger our own fence thread.
|
# we won't try to trigger our own fence thread.
|
||||||
if zkhandler.read('/nodes/{}/daemonstate'.format(node_name)) != 'dead':
|
if zkhandler.read('/nodes/{}/daemonstate'.format(node_name)) != 'dead':
|
||||||
fence_thread = Thread(target=fencing.fenceNode, args=(node_name, zkhandler.zk_conn, config, logger), kwargs={})
|
fence_thread = Thread(target=fencing.fenceNode, args=(node_name, zkhandler, config, logger), kwargs={})
|
||||||
fence_thread.start()
|
fence_thread.start()
|
||||||
# Write the updated data after we start the fence thread
|
# Write the updated data after we start the fence thread
|
||||||
zkhandler.write([
|
zkhandler.write([
|
||||||
|
|
Loading…
Reference in New Issue