From 731a83e959acec4e1ec57e85be8605f37c4b153f Mon Sep 17 00:00:00 2001 From: wanghuaz Date: Tue, 7 Sep 2010 06:11:34 +0000 Subject: [PATCH] Fix bug 3054182 and 3054178 git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7367 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/share/xcat/ib/scripts/healthCheck | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/xCAT-server/share/xcat/ib/scripts/healthCheck b/xCAT-server/share/xcat/ib/scripts/healthCheck index daaf48dbe..e71975c1e 100644 --- a/xCAT-server/share/xcat/ib/scripts/healthCheck +++ b/xCAT-server/share/xcat/ib/scripts/healthCheck @@ -583,7 +583,6 @@ sub procsrCheckLinux() { print "Command failed: $checkCmd.\n"; print $::LOG_FILE_HANDLE "Command failed: $checkCmd.\n"; - return $::NOK; } my $host; @@ -662,7 +661,6 @@ sub procsrCheckAIX() { print "Command failed: $checkCmd.\n"; print $::LOG_FILE_HANDLE "Command failed: $checkCmd.\n"; - return $::NOK; } my $host; @@ -762,7 +760,6 @@ sub ifCheck() { print "Command failed: $checkCmd.\n"; print $::LOG_FILE_HANDLE "Command failed: $checkCmd.\n"; - return $::NOK; } #Record whether the next line is the beginning of a new section @@ -835,7 +832,6 @@ sub ifCheck() { print "Command failed: $checkCmd.\n"; print $::LOG_FILE_HANDLE "Command failed: $checkCmd.\n"; - return $::NOK; } my $host; my $prevhost; @@ -931,7 +927,6 @@ sub memCheckLinux() { print "Command failed: $checkCmd.\n"; print $::LOG_FILE_HANDLE "Command failed: $checkCmd.\n"; - return $::NOK; } my $host; @@ -1014,7 +1009,6 @@ sub memCheckAIX() { print "Command failed: $checkCmd.\n"; print $::LOG_FILE_HANDLE "Command failed: $checkCmd.\n"; - return $::NOK; } my $host; @@ -1047,7 +1041,7 @@ sub memCheckAIX() print $::LOG_FILE_HANDLE "$host Free large page is $freelp. UNEXPECTED small size\n"; } } - elsif ($line =~ /(\S*):.*lcpu=(\d+)\s+mem=(\d+)MB/ && defined($::MIN_MEMORY) && $abnormalmem != 1) + elsif ($line =~ /(\S*):.*lcpu=(\d+)\s+mem=(\d+)MB/ && defined($::MIN_MEMORY)) { # Get node hostname and memory size $host = $1; @@ -1106,7 +1100,6 @@ sub HCACheckAIX() { print "Command failed: $checkCmd.\n"; print $::LOG_FILE_HANDLE "Command failed: $checkCmd.\n"; - return $::NOK; } my $host; @@ -1278,7 +1271,6 @@ sub HCACheckLinux() { print "Command failed: $checkCmd.\n"; print $::LOG_FILE_HANDLE "Command failed: $checkCmd.\n"; - return $::NOK; } my $host;