svn commit: r938258 - in /hadoop/hbase/trunk: CHANGES.txt core/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java core/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java

[stack]

Author: stack
Date: Mon Apr 26 22:13:18 2010
New Revision: 938258

URL: http://svn.apache.org/viewvc?rev=938258&view=rev
Log:
HBASE-2488 Master should warn more loudly about unexpected events

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    
hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
    
hadoop/hbase/trunk/core/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=938258&r1=938257&r2=938258&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Mon Apr 26 22:13:18 2010
@@ -531,6 +531,8 @@ Release 0.21.0 - Unreleased
    HBASE-2452  Fix our Maven dependencies (Lars Francke via Stack)
    HBASE-2490  Improve the javadoc of the client API for HTable
                (Benoit Sigoure via Stack)
+   HBASE-2488  Master should warn more loudly about unexpected events
+               (Todd Lipcon via Stack)
 
   NEW FEATURES
    HBASE-1961  HBase EC2 scripts

Modified: 
hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java?rev=938258&r1=938257&r2=938258&view=diff
==============================================================================
--- 
hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
 (original)
+++ 
hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
 Mon Apr 26 22:13:18 2010
@@ -254,6 +254,8 @@ public class ServerManager implements HC
   throws IOException {
     HServerInfo info = new HServerInfo(serverInfo);
     if (isDead(info.getServerName())) {
+      LOG.info("Received report from region server " + info.getServerName() +
+        " previously marked dead. Rejecting report.");
       throw new Leases.LeaseStillHeldException(info.getServerName());
     }
     if (msgs.length > 0) {
@@ -573,11 +575,8 @@ public class ServerManager implements HC
       }
     
       if (duplicateAssignment) {
-        if (LOG.isDebugEnabled()) {
-          LOG.debug("region server " + 
serverInfo.getServerAddress().toString() +
-            " should not have opened region " +
-            Bytes.toString(region.getRegionName()));
-        }
+        LOG.warn("region server " + serverInfo.getServerAddress().toString() +
+          " should not have opened region " + 
Bytes.toString(region.getRegionName()));
 
         // This Region should not have been opened.
         // Ask the server to shut it down, but don't report it as closed.  

Modified: 
hadoop/hbase/trunk/core/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java?rev=938258&r1=938257&r2=938258&view=diff
==============================================================================
--- 
hadoop/hbase/trunk/core/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
 (original)
+++ 
hadoop/hbase/trunk/core/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
 Mon Apr 26 22:13:18 2010
@@ -2,7 +2,7 @@ package org.apache.hadoop.hbase.client;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hbase.HBaseConfiguration;
+import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.After;
@@ -30,7 +30,7 @@ public class TestScannerTimeout {
    */
   @BeforeClass
   public static void setUpBeforeClass() throws Exception {
-    HBaseConfiguration c = TEST_UTIL.getConfiguration();
+    Configuration c = TEST_UTIL.getConfiguration();
     c.setInt("hbase.regionserver.lease.period", 1000);
     TEST_UTIL.startMiniCluster(1);
   }