if not get valid pid when waitpid, sleep (#5274)

xuweibj · robin2008 · commit 70d6e7f93cc9 · 2018-06-01T14:50:03.000+08:00
diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -1088,8 +1088,10 @@ rmdir \"/tmp/\$userid\" \n";
         }
 
         if (%child_node_map) {
+            my $pid_flag = 0;
             while ((my $cpid = waitpid(-1, WNOHANG)) > 0) {
                 if ($child_node_map{$cpid}) {
+                    $pid_flag = 1;
                     my $node = $child_node_map{$cpid};
                     my $rc = $? >> 8;
                     if ($rc != 0) {
@@ -1107,6 +1109,9 @@ rmdir \"/tmp/\$userid\" \n";
                     delete $child_node_map{$cpid};
                 }
             }
+            unless ($pid_flag) {
+                select(undef, undef, undef, 0.01);
+            }
         }
         my @del;
         while (my ($k, $v) = each %node_wait) {

Original file line number	Diff line number	Diff line change
`@@ -1088,8 +1088,10 @@ rmdir \"/tmp/\$userid\" \n";`
`1088`	`1088`	`}`
`1089`	`1089`
`1090`	`1090`	`if (%child_node_map) {`
	`1091`	`+ my $pid_flag = 0;`
`1091`	`1092`	`while ((my $cpid = waitpid(-1, WNOHANG)) > 0) {`
`1092`	`1093`	`if ($child_node_map{$cpid}) {`
	`1094`	`+ $pid_flag = 1;`
`1093`	`1095`	`my $node = $child_node_map{$cpid};`
`1094`	`1096`	`my $rc = $? >> 8;`
`1095`	`1097`	`if ($rc != 0) {`
`@@ -1107,6 +1109,9 @@ rmdir \"/tmp/\$userid\" \n";`
`1107`	`1109`	`delete $child_node_map{$cpid};`
`1108`	`1110`	`}`
`1109`	`1111`	`}`
	`1112`	`+ unless ($pid_flag) {`
	`1113`	`+ select(undef, undef, undef, 0.01);`
	`1114`	`+ }`
`1110`	`1115`	`}`
`1111`	`1116`	`my @del;`
`1112`	`1117`	`while (my ($k, $v) = each %node_wait) {`