returns non zero value when prescripts fail in nodeset command
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9606 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
		| @@ -639,7 +639,13 @@ sub nimnodeset | ||||
|     $subreq->({command=>['runbeginpre'], | ||||
| 		node=>\@nodelist, | ||||
| 		arg=>["standalone", '-l']},\&pass_along); | ||||
|     if ($errored) { return; } | ||||
|     if ($errored) {  | ||||
| 	my $rsp; | ||||
| 	$rsp->{errorcode}->[0]=1; | ||||
| 	$rsp->{error}->[0]="Failed in running begin prescripts.\n"; | ||||
| 	$callback->($rsp); | ||||
| 	return 1;  | ||||
|     } | ||||
|   | ||||
|  | ||||
|     # | ||||
| @@ -1126,7 +1132,13 @@ sub nimnodeset | ||||
|                 node=>\@nodelist, | ||||
|                 arg=>["standalone", '-l']},\&pass_along); | ||||
|     } | ||||
|     if ($errored) { $retcode = 1; } | ||||
|     if ($errored) {  | ||||
| 	my $rsp; | ||||
| 	$rsp->{errorcode}->[0]=1; | ||||
| 	$rsp->{error}->[0]="Failed in running end prescripts.\n"; | ||||
| 	$callback->($rsp); | ||||
| 	return 1;  | ||||
|     } | ||||
|  | ||||
|     return  $retcode; | ||||
| } | ||||
| @@ -8128,7 +8140,13 @@ sub mkdsklsnode | ||||
|     $subreq->({command=>['runbeginpre'], | ||||
| 		node=>\@nodelist, | ||||
| 		arg=>["diskless", '-l']},\&pass_along); | ||||
|     if ($errored) { return; } | ||||
|     if ($errored) {  | ||||
| 	my $rsp; | ||||
| 	$rsp->{errorcode}->[0]=1; | ||||
| 	$rsp->{error}->[0]="Failed in running begin prescripts.\n"; | ||||
| 	$callback->($rsp); | ||||
| 	return 1;  | ||||
|     } | ||||
|  | ||||
|  | ||||
|     # | ||||
| @@ -9033,7 +9051,13 @@ sub mkdsklsnode | ||||
|                       node=>\@nodelist, | ||||
|                       arg=>["diskless", '-l']},\&pass_along); | ||||
|     } | ||||
|     if ($errored) { $retcode = 1; } | ||||
|     if ($errored) {  | ||||
| 	my $rsp; | ||||
| 	$rsp->{errorcode}->[0]=1; | ||||
| 	$rsp->{error}->[0]="Failed in running end prescripts.\n"; | ||||
| 	$callback->($rsp); | ||||
| 	return 1;  | ||||
|     } | ||||
|  | ||||
|  | ||||
|     return  $retcode; | ||||
| @@ -10100,7 +10124,13 @@ sub rmdsklsnode | ||||
| 	#	to handles my own children | ||||
| 	$errored=0; | ||||
| 	$subreq->({command=>['runbeginpre'], node=>\@nodelist, arg=>["remove", '-l']},\&pass_along); | ||||
| 	if ($errored) { return; } | ||||
| 	if ($errored) {  | ||||
| 	    my $rsp; | ||||
| 	    $rsp->{errorcode}->[0]=1; | ||||
| 	    $rsp->{error}->[0]="Failed in running begin prescripts.\n"; | ||||
| 	    $callback->($rsp); | ||||
| 	    return 1;  | ||||
| 	} | ||||
|  | ||||
|     # for each node | ||||
|     my @nodesfailed; | ||||
| @@ -10275,7 +10305,13 @@ sub rmdsklsnode | ||||
|                 node=>\@nodelist, | ||||
|                 arg=>["remove", '-l']},\&pass_along); | ||||
|     } | ||||
|     if ($errored) { $retcode = 1; } | ||||
|     if ($errored) {  | ||||
| 	my $rsp; | ||||
| 	$rsp->{errorcode}->[0]=1; | ||||
| 	$rsp->{error}->[0]="Failed in running end prescripts.\n"; | ||||
| 	$callback->($rsp); | ||||
| 	return 1;  | ||||
|     } | ||||
|  | ||||
|     return  $retcode; | ||||
|  | ||||
|   | ||||
| @@ -412,7 +412,13 @@ sub process_request { | ||||
|                     node=>\@rnodes, | ||||
|                     arg=>[$args[0]]},\&pass_along); | ||||
|        } | ||||
|        if ($errored) { return; } | ||||
|        if ($errored) {  | ||||
| 	  my $rsp; | ||||
| 	  $rsp->{errorcode}->[0]=1; | ||||
| 	  $rsp->{error}->[0]="Failed in running begin prescripts\n"; | ||||
| 	  $callback->($rsp); | ||||
| 	  return;  | ||||
|        } | ||||
|    } | ||||
|    | ||||
| #end prescripts code | ||||
| @@ -552,7 +558,13 @@ sub process_request { | ||||
|                      node=>\@rnodes, | ||||
|                      arg=>[$args[0]]},\&pass_along); | ||||
|       } | ||||
|       if ($errored) { return; } | ||||
|       if ($errored) {  | ||||
| 	  my $rsp; | ||||
| 	  $rsp->{errorcode}->[0]=1; | ||||
| 	  $rsp->{error}->[0]="Failed in running end prescripts\n"; | ||||
| 	  $callback->($rsp); | ||||
| 	  return;  | ||||
|       } | ||||
|   } | ||||
|  | ||||
|  | ||||
|   | ||||
| @@ -309,7 +309,13 @@ sub process_request { | ||||
|                     node=>\@rnodes, | ||||
|                     arg=>[$args[0]]},\&pass_along); | ||||
|        } | ||||
|        if ($errored) { return; } | ||||
|        if ($errored) {  | ||||
| 	  my $rsp; | ||||
| 	  $rsp->{errorcode}->[0]=1; | ||||
| 	  $rsp->{error}->[0]="Failed in running begin prescripts\n"; | ||||
| 	  $callback->($rsp); | ||||
| 	  return;  | ||||
|        } | ||||
|    } | ||||
|    | ||||
| #end prescripts code | ||||
| @@ -418,7 +424,13 @@ sub process_request { | ||||
|                      node=>\@rnodes, | ||||
|                      arg=>[$args[0]]},\&pass_along); | ||||
|       } | ||||
|       if ($errored) { return; } | ||||
|       if ($errored) { | ||||
| 	  my $rsp; | ||||
| 	  $rsp->{errorcode}->[0]=1; | ||||
| 	  $rsp->{error}->[0]="Failed in running end prescripts\n"; | ||||
| 	  $callback->($rsp); | ||||
| 	  return;  | ||||
|       } | ||||
|   } | ||||
|  | ||||
| } | ||||
|   | ||||
| @@ -453,7 +453,13 @@ sub process_request { | ||||
| 		      node=>\@rnodes, | ||||
| 		      arg=>[$args[0]]},\&pass_along); | ||||
|       } | ||||
|       if ($errored) { return; } | ||||
|       if ($errored) {  | ||||
| 	  my $rsp; | ||||
|  	  $rsp->{errorcode}->[0]=1; | ||||
| 	  $rsp->{error}->[0]="Failed in running begin prescripts.\n"; | ||||
| 	  $callback->($rsp); | ||||
| 	  return;  | ||||
|       } | ||||
|   }   | ||||
|  | ||||
|   #back to normal business | ||||
| @@ -551,7 +557,13 @@ sub process_request { | ||||
| 		      node=>\@rnodes, | ||||
| 		      arg=>[$args[0]]},\&pass_along); | ||||
|       } | ||||
|       if ($errored) { return; } | ||||
|       if ($errored) {  | ||||
| 	  my $rsp; | ||||
|  	  $rsp->{errorcode}->[0]=1; | ||||
| 	  $rsp->{error}->[0]="Failed in running end prescripts.\n"; | ||||
| 	  $callback->($rsp); | ||||
| 	  return;  | ||||
|       } | ||||
|   } | ||||
|  | ||||
| } | ||||
|   | ||||
| @@ -412,7 +412,13 @@ sub process_request { | ||||
| 		      node=>\@rnodes, | ||||
| 		      arg=>[$args[0]]},\&pass_along); | ||||
|       } | ||||
|       if ($errored) { return; } | ||||
|       if ($errored) { | ||||
| 	  my $rsp; | ||||
|  	  $rsp->{errorcode}->[0]=1; | ||||
| 	  $rsp->{error}->[0]="Failed in running begin prescripts.\n"; | ||||
| 	  $callback->($rsp); | ||||
| 	  return;  | ||||
|       } | ||||
|   }  | ||||
|  | ||||
|   #back to normal business | ||||
| @@ -501,7 +507,13 @@ sub process_request { | ||||
| 		      node=>\@rnodes, | ||||
| 		      arg=>[$args[0]]},\&pass_along); | ||||
|       } | ||||
|       if ($errored) { return; } | ||||
|       if ($errored) {  | ||||
| 	  my $rsp; | ||||
| 	  $rsp->{errorcode}->[0]=1; | ||||
| 	  $rsp->{error}->[0]="Failed in running end prescripts\n"; | ||||
| 	  $callback->($rsp); | ||||
| 	  return;  | ||||
|       } | ||||
|   } | ||||
| } | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user