From 12ce1715fceeb83cc70f7f1225232c5cdf98b7e8 Mon Sep 17 00:00:00 2001 From: Iztok Lebar Bajec Date: Sun, 4 May 2025 08:48:36 +0200 Subject: [PATCH 1/2] fix: bg_task check --- weka_upgrade_checker/weka_upgrade_checker.py | 27 ++++++++++---------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/weka_upgrade_checker/weka_upgrade_checker.py b/weka_upgrade_checker/weka_upgrade_checker.py index 3e79d9b..e911cbb 100755 --- a/weka_upgrade_checker/weka_upgrade_checker.py +++ b/weka_upgrade_checker/weka_upgrade_checker.py @@ -1729,20 +1729,21 @@ def validate_core_ids(containers): printlist(override_list, 5) if V(weka_version) >= V("4.0"): - INFO("CHECKING FOR WEKA CLUSTER TASKS") - bg_task = [] - cluster_tasks = json.loads( - subprocess.check_output(["weka", "cluster", "tasks", "-J"]) - ) + INFO("CHECKING FOR WEKA CLUSTER TASKS") + bg_task = [] + cluster_tasks = json.loads( + subprocess.check_output(["weka", "cluster", "tasks", "-J"]) + ) - for task in cluster_tasks: - if task["type"] != "FSCK": - WARN("There are active cluster tasks that should be considered before running the upgrade.") - bg_task += [task["type"], task["description"]] - printlist(bg_task, 2) - break - else: - GOOD("No unexpected Weka cluster tasks running") + for task in cluster_tasks: + if task["type"] != "FSCK": + WARN("There are active cluster tasks that should be considered before running the upgrade.") + bg_task += [task["type"], task["description"]] + printlist(bg_task, 2) + break + + if len(bg_task) == 0: + GOOD("No unexpected Weka cluster tasks running") INFO("CHECKING FOR WEKA BLACKLISTED NODES") blacklist = [] From 87ebeac2cf67b1985f829146c478f1c47563fa1d Mon Sep 17 00:00:00 2001 From: Iztok Lebar Bajec Date: Sun, 4 May 2025 08:55:15 +0200 Subject: [PATCH 2/2] fix: python3.12 SyntaxWarning`: invalid escape sequence --- weka_upgrade_checker/weka_upgrade_checker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weka_upgrade_checker/weka_upgrade_checker.py b/weka_upgrade_checker/weka_upgrade_checker.py index e911cbb..eb277e6 100755 --- a/weka_upgrade_checker/weka_upgrade_checker.py +++ b/weka_upgrade_checker/weka_upgrade_checker.py @@ -3607,7 +3607,7 @@ def backend_host_checks( INFO("VALIDATING CPU INSTRUCTION SET") results = parallel_execution( ssh_bk_hosts, - ['grep "\" /proc/cpuinfo'], + r['grep "\" /proc/cpuinfo'], use_check_output=True, ssh_identity=ssh_identity, )