From 116013695f146937063cb5edd9f604ec13bee283 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Sat, 12 Oct 2019 17:58:48 -0400 Subject: [PATCH] Fix bugs with bad strings --- client-common/common.py | 6 ++++-- node-daemon/pvcd/common.py | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/client-common/common.py b/client-common/common.py index 4fed660d..1a364906 100644 --- a/client-common/common.py +++ b/client-common/common.py @@ -293,13 +293,15 @@ def getPrimaryNode(zk_conn): def findTargetNode(zk_conn, dom_uuid): # Determine VM node limits; set config value if read fails try: - node_limit = zkhandler.readdata(zk_conn, '/domains/{}/node_limit'.format(node)).split(',') + node_limit = zkhandler.readdata(zk_conn, '/domains/{}/node_limit'.format(dom_uuid)).split(',') + if not any(node_limit): + node_limit = None except: node_limit = None # Determine VM search field or use default; set config value if read fails try: - search_field = zkhandler.readdata(zk_conn, '/domains/{}/node_selector'.format(node)).split(',') + search_field = zkhandler.readdata(zk_conn, '/domains/{}/node_selector'.format(dom_uuid)) except: search_field = 'mem' diff --git a/node-daemon/pvcd/common.py b/node-daemon/pvcd/common.py index 4ecc6e61..807cb7ac 100644 --- a/node-daemon/pvcd/common.py +++ b/node-daemon/pvcd/common.py @@ -142,17 +142,17 @@ def removeIPAddress(ipaddr, cidrnetmask, dev): def findTargetNode(zk_conn, config, dom_uuid): # Determine VM node limits; set config value if read fails try: - node_limit = zkhandler.readdata(zk_conn, '/domains/{}/node_limit'.format(node)).split(',') + node_limit = zkhandler.readdata(zk_conn, '/domains/{}/node_limit'.format(dom_uuid)).split(',') except: node_limit = None - zkhandler.writedata(zk_conn, { '/domains/{}/node_limit'.format(node): 'None' }) + zkhandler.writedata(zk_conn, { '/domains/{}/node_limit'.format(dom_uuid): 'None' }) # Determine VM search field or use default; set config value if read fails try: - search_field = zkhandler.readdata(zk_conn, '/domains/{}/node_selector'.format(node)).split(',') + search_field = zkhandler.readdata(zk_conn, '/domains/{}/node_selector'.format(dom_uuid)) except: search_field = config.migration_target_selector - zkhandler.writedata(zk_conn, { '/domains/{}/node_selector'.format(node): config.migration_target_selector }) + zkhandler.writedata(zk_conn, { '/domains/{}/node_selector'.format(dom_uuid): config.migration_target_selector }) # Execute the search if search_field == 'mem':