From 737b55b76ce97223a7ed24dd24ca859b1da9f1f1 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Thu, 7 May 2009 04:31:33 +0000 Subject: [PATCH] -Fix problem where stateless initialization phase encountering a transient error could leave a service node persistently corrupted git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3300 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/destiny.pm | 1 + xCAT-server/lib/xcat/plugins/pxe.pm | 1 + 2 files changed, 2 insertions(+) diff --git a/xCAT-server/lib/xcat/plugins/destiny.pm b/xCAT-server/lib/xcat/plugins/destiny.pm index d829122bf..e9767562a 100644 --- a/xCAT-server/lib/xcat/plugins/destiny.pm +++ b/xCAT-server/lib/xcat/plugins/destiny.pm @@ -123,6 +123,7 @@ sub setdestiny { } } elsif ($state =~ /^install$/ or $state eq "install" or $state eq "netboot" or $state eq "image" or $state eq "winshell") { chomp($state); + $errored=0; $subreq->({command=>["mk$state"], node=>$req->{node}}, \&relay_response); if ($errored) { return; } diff --git a/xCAT-server/lib/xcat/plugins/pxe.pm b/xCAT-server/lib/xcat/plugins/pxe.pm index e682f962b..3b352b784 100644 --- a/xCAT-server/lib/xcat/plugins/pxe.pm +++ b/xCAT-server/lib/xcat/plugins/pxe.pm @@ -313,6 +313,7 @@ sub process_request { } else { @args=($request->{arg}); } + $errored=0; unless ($args[0] eq 'stat') { # or $args[0] eq 'enact') { $sub_req->({command=>['setdestiny'], node=>\@nodes,