mirror of
				https://github.com/xcat2/xcat-core.git
				synced 2025-10-30 19:02:27 +00:00 
			
		
		
		
	Move updatestatus to the last processing
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14341 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
		| @@ -888,7 +888,8 @@ sub updatenode | ||||
|     my $request  = shift; | ||||
|     my $callback = shift; | ||||
|     my $subreq   = shift; | ||||
|  | ||||
|     @::SUCCESSFULLNODES=(); | ||||
|     @::FAILEDNODES=(); | ||||
|     #print Dumper($request); | ||||
|     my $nodes         = $request->{node}; | ||||
|     my $localhostname = hostname(); | ||||
| @@ -1134,6 +1135,21 @@ sub updatenode | ||||
|     #   } | ||||
|  | ||||
|     #} | ||||
|     # update the node status, this is done when -F -S -P are run | ||||
| 	 if(@::SUCCESSFULLNODES) | ||||
| 	 { | ||||
| 	      | ||||
|             my $stat="synced"; | ||||
|             xCAT::TableUtils->setUpdateStatus(\@::SUCCESSFULLNODES, $stat); | ||||
|                        | ||||
| 	 } | ||||
| 	 if(@::FAILEDNODES) | ||||
| 	 { | ||||
| 	      | ||||
|             my $stat="out-of-sync"; | ||||
|             xCAT::TableUtils->setUpdateStatus(\@::FAILEDNODES, $stat); | ||||
|                        | ||||
| 	 } | ||||
|     return 0; | ||||
| } | ||||
|  | ||||
| @@ -1312,9 +1328,10 @@ sub updatenoderunps | ||||
|             else | ||||
|             { | ||||
|                 my $rsp = {}; | ||||
|                 my $output; | ||||
|                 while (<CMD>) | ||||
|                 { | ||||
|                     my $output = $_; | ||||
|                     $output = $_; | ||||
|                     chomp($output); | ||||
|                     $output =~ s/\\cM//; | ||||
|                     if ($output =~ /returned from postscript/) | ||||
| @@ -1343,6 +1360,9 @@ sub updatenoderunps | ||||
|                     } | ||||
|                 } | ||||
|                 close(CMD); | ||||
|                # # build the list of good and bad nodes | ||||
|                # &buildnodestatus(\@$output,$callback); | ||||
|                 # return information  | ||||
|                 $callback->($rsp); | ||||
|             } | ||||
|         } | ||||
| @@ -1465,21 +1485,6 @@ sub updatenodesyncfiles | ||||
|            # build the list of good and bad nodes | ||||
|            &buildnodestatus(\@$output,$callback); | ||||
| 	     } | ||||
|        #set the nodelist.updatestatus according to the xdcp result | ||||
| 	    if(@::SUCCESSFULLNODES) | ||||
| 	    { | ||||
| 	      | ||||
|             my $stat="synced"; | ||||
|             xCAT::TableUtils->setUpdateStatus(\@::SUCCESSFULLNODES, $stat); | ||||
|                        | ||||
| 	    } | ||||
| 	    if(@::FAILEDNODES) | ||||
| 	    { | ||||
| 	      | ||||
|             my $stat="out-of-sync"; | ||||
|             xCAT::TableUtils->setUpdateStatus(\@::FAILEDNODES, $stat); | ||||
|                        | ||||
| 	    } | ||||
|    	 | ||||
|        my $rsp = {}; | ||||
|        $rsp->{data}->[0] = "File synchronization has completed."; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user