From f9259dfec6fcd2827bd5c03ffd0d84303cbe47fd Mon Sep 17 00:00:00 2001 From: mellor Date: Mon, 25 Jul 2011 22:40:28 +0000 Subject: [PATCH] defect 3376989 -- fix problem where creating node with translated name in xcatd git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10154 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/rollupdate.pm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/rollupdate.pm b/xCAT-server/lib/xcat/plugins/rollupdate.pm index 38bcb4025..e653acc8b 100644 --- a/xCAT-server/lib/xcat/plugins/rollupdate.pm +++ b/xCAT-server/lib/xcat/plugins/rollupdate.pm @@ -2226,21 +2226,24 @@ sub runrollupdate { } if (($::scheduler eq "loadleveler") && ($::ll_reservation_id)){ - my @remove_res; + my @remove_res_LL; + my @remove_res_xCAT; foreach my $bn (keys %ll_res) { if (($ll_res{$bn}{remove}) && (! $ll_res{$bn}{removed}) ){ if ( defined($::XLATED{$bn}) ) { - push (@remove_res,$::XLATED{$bn}); + push (@remove_res_LL,$::XLATED{$bn}); + push (@remove_res_xCAT,$bn); } else { - push (@remove_res,$bn); + push (@remove_res_LL,$bn); + push (@remove_res_xCAT,$bn); } $ll_res{$bn}{removed} = 1; $ll_res{$bn}{not_done} = 0; } } - if (@remove_res) { - &remove_LL_reservations(\@remove_res); - xCAT::Utils->setAppStatus(\@remove_res,"RollingUpdate","update_complete"); + if (@remove_res_LL) { + &remove_LL_reservations(\@remove_res_LL); + xCAT::Utils->setAppStatus(\@remove_res_xCAT,"RollingUpdate","update_complete"); } } if ($not_done) {