From e2f2d67ba882d3fc505832fe3fb80f1599ffabf5 Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Mon, 22 May 2017 22:41:14 -0400
Subject: [PATCH] Check the failed nodes array before printing out the (#3110)

error messages
---
 xCAT-server/lib/xcat/plugins/rinstall.pm | 32 +++++++++++++++---------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/rinstall.pm b/xCAT-server/lib/xcat/plugins/rinstall.pm
index 6b5d70f7b..7857aaa21 100644
--- a/xCAT-server/lib/xcat/plugins/rinstall.pm
+++ b/xCAT-server/lib/xcat/plugins/rinstall.pm
@@ -364,9 +364,11 @@ sub rinstall {
             }
         }
         my $rsp = {};
-        $rsp->{error}->[0] = "failed to run 'nodeset' against the following nodes: @failurenodes";
-        $rsp->{errorcode}->[0] = 1;
-        xCAT::MsgUtils->message("E", $rsp, $callback);
+        if (0+@failurenodes > 0) { 
+            $rsp->{error}->[0] = "Failed to run 'nodeset' against the following nodes: @failurenodes";
+            $rsp->{errorcode}->[0] = 1;
+            xCAT::MsgUtils->message("E", $rsp, $callback);
+        }
         @nodes = @successnodes;
     }
 
@@ -430,9 +432,11 @@ sub rinstall {
                     }
                 }
                 my $rsp = {};
-                $rsp->{error}->[0] = "failed to run 'rnetboot' against the following nodes: @failurenodes";
-                $rsp->{errorcode}->[0] = 1;
-                xCAT::MsgUtils->message("E", $rsp, $callback);
+                if (0+@failurenodes > 0) { 
+                    $rsp->{error}->[0] = "Failed to run 'rnetboot' against the following nodes: @failurenodes";
+                    $rsp->{errorcode}->[0] = 1;
+                    xCAT::MsgUtils->message("E", $rsp, $callback);
+                }
             }
         }
         else {
@@ -493,9 +497,11 @@ sub rinstall {
                         }
                     }
                     my $rsp = {};
-                    $rsp->{error}->[0] = "failed to run 'rsetboot' against the following nodes: @failurenodes";
-                    $rsp->{errorcode}->[0] = 1;
-                    xCAT::MsgUtils->message("E", $rsp, $callback);
+                    if (0+@failurenodes > 0) { 
+                        $rsp->{error}->[0] = "Failed to run 'rsetboot' against the following nodes: @failurenodes";
+                        $rsp->{errorcode}->[0] = 1;
+                        xCAT::MsgUtils->message("E", $rsp, $callback);
+                    }
                     @nodes = @successnodes;
                 }
             }
@@ -549,9 +555,11 @@ sub rinstall {
                     }
                 }
                 my $rsp = {};
-                $rsp->{error}->[0] = "failed to run 'rpower' against the following nodes: @failurenodes";
-                $rsp->{errorcode}->[0] = 1;
-                xCAT::MsgUtils->message("E", $rsp, $callback);
+                if (0+@failurenodes > 0) { 
+                    $rsp->{error}->[0] = "Failed to run 'rpower' against the following nodes: @failurenodes";
+                    $rsp->{errorcode}->[0] = 1;
+                    xCAT::MsgUtils->message("E", $rsp, $callback);
+                }
             }
         }
     }