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

Clean up dangling references to cmd pipes

Browse Source 
Also removes the schema references for these CMD pipes as they are no
longer required.
This commit is contained in:
Joshua Boniface
2023-11-09 14:47:18 -05:00
parent ce17c60a20
commit 08411708f6
5 changed files with 2 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
node-daemon/pvcnoded/Daemon.py
View File

@ -903,14 +903,6 @@ def entrypoint():
)
if config["enable_hypervisor"]:
# VM command pipeline key
@zkhandler.zk_conn.DataWatch(zkhandler.schema.path("base.cmd.domain"))
def run_domain_command(data, stat, event=""):
if data:
VMInstance.vm_command(
zkhandler, logger, this_node, data.decode("ascii")
)
# VM domain objects
@zkhandler.zk_conn.ChildrenWatch(zkhandler.schema.path("base.domain"))
def update_domains(new_domain_list):
@ -942,14 +934,6 @@ def entrypoint():
d_node[node].update_domain_list(d_domain)
if config["enable_storage"]:
# Ceph command pipeline key
@zkhandler.zk_conn.DataWatch(zkhandler.schema.path("base.cmd.ceph"))
def run_ceph_command(data, stat, event=""):
if data:
CephInstance.ceph_command(
zkhandler, logger, this_node, data.decode("ascii"), d_osd
)
# OSD objects
@zkhandler.zk_conn.ChildrenWatch(zkhandler.schema.path("base.osd"))
def update_osds(new_osd_list):

100
node-daemon/pvcnoded/objects/VMInstance.py
View File

@ -22,7 +22,6 @@
import uuid
import time
import libvirt
import json
from threading import Thread
@ -32,8 +31,6 @@ import daemon_lib.common as common
import pvcnoded.objects.VMConsoleWatcherInstance as VMConsoleWatcherInstance
import daemon_lib.common as daemon_common
class VMInstance(object):
# Initialization function
@ -116,7 +113,7 @@ class VMInstance(object):
if self.dom is not None:
memory = int(self.dom.info()[2] / 1024)
else:
domain_information = daemon_common.getInformationFromXML(
domain_information = common.getInformationFromXML(
self.zkhandler, self.domuuid
)
memory = int(domain_information["memory"])
@ -961,98 +958,3 @@ class VMInstance(object):
# Return the dom object (or None)
return dom
# Flush the locks of a VM based on UUID
@staticmethod
def flush_locks(zkhandler, logger, dom_uuid, this_node=None):
logger.out('Flushing RBD locks for VM "{}"'.format(dom_uuid), state="i")
# Get the list of RBD images
rbd_list = zkhandler.read(("domain.storage.volumes", dom_uuid)).split(",")
for rbd in rbd_list:
# Check if a lock exists
(
lock_list_retcode,
lock_list_stdout,
lock_list_stderr,
) = common.run_os_command("rbd lock list --format json {}".format(rbd))
if lock_list_retcode != 0:
logger.out(
'Failed to obtain lock list for volume "{}"'.format(rbd), state="e"
)
continue
try:
lock_list = json.loads(lock_list_stdout)
except Exception as e:
logger.out(
'Failed to parse lock list for volume "{}": {}'.format(rbd, e),
state="e",
)
continue
# If there's at least one lock
if lock_list:
# Loop through the locks
for lock in lock_list:
if (
this_node is not None
and zkhandler.read(("domain.state", dom_uuid)) != "stop"
and lock["address"].split(":")[0] != this_node.storage_ipaddr
):
logger.out(
"RBD lock does not belong to this host (lock owner: {}): freeing this lock would be unsafe, aborting".format(
lock["address"].split(":")[0]
),
state="e",
)
zkhandler.write(
[
(("domain.state", dom_uuid), "fail"),
(
("domain.failed_reason", dom_uuid),
"Could not safely free RBD lock {} ({}) on volume {}; stop VM and flush locks manually".format(
lock["id"], lock["address"], rbd
),
),
]
)
break
# Free the lock
(
lock_remove_retcode,
lock_remove_stdout,
lock_remove_stderr,
) = common.run_os_command(
'rbd lock remove {} "{}" "{}"'.format(
rbd, lock["id"], lock["locker"]
)
)
if lock_remove_retcode != 0:
logger.out(
'Failed to free RBD lock "{}" on volume "{}": {}'.format(
lock["id"], rbd, lock_remove_stderr
),
state="e",
)
zkhandler.write(
[
(("domain.state", dom_uuid), "fail"),
(
("domain.failed_reason", dom_uuid),
"Could not free RBD lock {} ({}) on volume {}: {}".format(
lock["id"],
lock["address"],
rbd,
lock_remove_stderr,
),
),
]
)
break
logger.out(
'Freed RBD lock "{}" on volume "{}"'.format(lock["id"], rbd),
state="o",
)
return True