From 5d357af63a58f032675dcb6e160b41642094bfe0 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Fri, 20 Jan 2012 17:23:08 +0100 Subject: [PATCH 1/2] bug #1060: fix parameter order in ganglia poll(cherry picked from commit cd9f6d670545d1d69aeb36ed65ff12bf7373d4fd) --- src/vmm_mad/remotes/poll_ganglia.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/vmm_mad/remotes/poll_ganglia.rb b/src/vmm_mad/remotes/poll_ganglia.rb index c9eaa91180..cac5400e74 100755 --- a/src/vmm_mad/remotes/poll_ganglia.rb +++ b/src/vmm_mad/remotes/poll_ganglia.rb @@ -50,9 +50,8 @@ GANGLIA_PORT=8649 domain=ARGV[0] -dom_id=ARGV[1] -host=ARGV[2] - +dom_id=ARGV[2] +host=ARGV[1] # Gets monitoring data from ganglia or file begin From 6060d4821de121e632468b150261c1febdde6132 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Fri, 20 Jan 2012 17:23:36 +0100 Subject: [PATCH 2/2] bug #1060: set VM to unknown when it cannot be monitoried(cherry picked from commit 2f4bf9bbe214bb84e138bb57fa354a0e3e7cefa8) --- src/vmm_mad/remotes/poll_ganglia.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/vmm_mad/remotes/poll_ganglia.rb b/src/vmm_mad/remotes/poll_ganglia.rb index cac5400e74..94a74cb946 100755 --- a/src/vmm_mad/remotes/poll_ganglia.rb +++ b/src/vmm_mad/remotes/poll_ganglia.rb @@ -68,6 +68,12 @@ end doms_info=ganglia.get_vms_information dom_id=domain.split('-').last +# Unknown state when the VM is not found +if !doms_info || !(doms_info[domain] || doms_info[dom_id]) + puts "STATE=d" + exit(0) +end + # Get key one- or key from the hash dom_info=doms_info[domain] dom_info=doms_info[dom_id] if !dom_info