svn commit: r1454111 - in /hbase/branches/0.95/hbase-server/src: main/java/org/apache/hadoop/hbase/HealthChecker.java test/java/org/apache/hadoop/hbase/TestNodeHealthCheckChore.java

[stack]

Author: stack
Date: Thu Mar  7 21:42:20 2013
New Revision: 1454111

URL: http://svn.apache.org/r1454111
Log:
HBASE-8032 TestNodeHealthCheckChore.testHealthChecker failed 0.95 build #36

Modified:
    
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthChecker.java
    
hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNodeHealthCheckChore.java

Modified: 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthChecker.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthChecker.java?rev=1454111&r1=1454110&r2=1454111&view=diff
==============================================================================
--- 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthChecker.java
 (original)
+++ 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthChecker.java
 Thu Mar  7 21:42:20 2013
@@ -65,7 +65,8 @@ class HealthChecker {
     execScript.add(healthCheckScript);
     this.shexec = new ShellCommandExecutor(execScript.toArray(new 
String[execScript.size()]), null,
         null, scriptTimeout);
-    LOG.info("HealthChecker initialized with script at " + 
this.healthCheckScript);
+    LOG.info("HealthChecker initialized with script at " + 
this.healthCheckScript +
+      ", timeout=" + timeout);
   }
 
   public HealthReport checkHealth() {

Modified: 
hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNodeHealthCheckChore.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNodeHealthCheckChore.java?rev=1454111&r1=1454110&r2=1454111&view=diff
==============================================================================
--- 
hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNodeHealthCheckChore.java
 (original)
+++ 
hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNodeHealthCheckChore.java
 Thu Mar  7 21:42:20 2013
@@ -136,7 +136,7 @@ public class TestNodeHealthCheckChore {
     healthScriptFile = new File(tempDir.getAbsolutePath(), "HealthScript.sh");
     conf.set(HConstants.HEALTH_SCRIPT_LOC, healthScriptFile.getAbsolutePath());
     conf.setLong(HConstants.HEALTH_FAILURE_THRESHOLD, 3);
-    conf.setLong(HConstants.HEALTH_SCRIPT_TIMEOUT, 200);
+    conf.setLong(HConstants.HEALTH_SCRIPT_TIMEOUT, 2000);
     return conf;
   }