From 4f44682478000e68e37d032f5c4f3b72fa7811d6 Mon Sep 17 00:00:00 2001 From: ertaozh Date: Mon, 23 Nov 2015 00:21:08 -0500 Subject: [PATCH] fix issue 444: Timeout while executing "renergy noderange temperature|powerusage" --- perl-xCAT/xCAT/Utils.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/perl-xCAT/xCAT/Utils.pm b/perl-xCAT/xCAT/Utils.pm index 2c346a2a3..de59edd5c 100644 --- a/perl-xCAT/xCAT/Utils.pm +++ b/perl-xCAT/xCAT/Utils.pm @@ -3512,14 +3512,19 @@ sub filter_nodes{ @{$fspnodes} = (); push @{$fspnodes}, @p6p7; - # for rnergy command, only the non-ppcle nodes get to the general ipmi.pm + # for renergy command, only the non-ppcle nodes get to the general ipmi.pm # ppcle of P8 and higher will get in the energy.pm + # But for option powerusage and temperature of renergy, they are only implementated in ipmi.pm + # So, all bmc node shall go to ipmi.pm. + @{$bmcnodes} = (); push @{$bmcnodes}, @nonppcle; if (grep /^(relhistogram)/, @args) { push @{$bmcnodes}, @ngpbmc; }elsif (grep /^(powerusage|temperature)/, @args) { + # Clear the bmc nodes to avoid duplication for non ppc64* nodes. + @{$bmcnodes} = (); push @{$bmcnodes}, @commonbmc; } else { push @{$mpnodes}, @ngpbmc;