From 67ec41aaf9a723ed52963def0bdb31e1aaa6b910 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Tue, 6 Feb 2024 13:30:48 -0500 Subject: [PATCH] Fix invalid memory errors for stopped VMs --- daemon-common/cluster.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon-common/cluster.py b/daemon-common/cluster.py index a416e43f..2b805b34 100644 --- a/daemon-common/cluster.py +++ b/daemon-common/cluster.py @@ -1230,7 +1230,7 @@ def get_resource_metrics(zkhandler): ) output_lines.append("# TYPE pvc_vm_memory_stats_actual gauge") for vm in vm_data: - actual_memory = vm["memory_stats"]["actual"] + actual_memory = vm["memory_stats"].get("actual", 0) output_lines.append( f"pvc_vm_memory_stats_actual{{vm=\"{vm['name']}\"}} {actual_memory}" ) @@ -1238,7 +1238,7 @@ def get_resource_metrics(zkhandler): output_lines.append("# HELP pvc_vm_memory_stats_rss PVC VM RSS memory KB") output_lines.append("# TYPE pvc_vm_memory_stats_rss gauge") for vm in vm_data: - rss_memory = vm["memory_stats"]["rss"] + rss_memory = vm["memory_stats"].get("rss", 0) output_lines.append( f"pvc_vm_memory_stats_rss{{vm=\"{vm['name']}\"}} {rss_memory}" )