hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1003919 - in /hbase/trunk/src/main/java/org/apache/hadoop/hbase: HRegionLocation.java catalog/CatalogTracker.java client/HConnectionManager.java master/handler/ServerShutdownHandler.java regionserver/HRegionServer.java
Date Sat, 02 Oct 2010 23:48:00 GMT
Author: stack
Date: Sat Oct  2 23:48:00 2010
New Revision: 1003919

URL: http://svn.apache.org/viewvc?rev=1003919&view=rev
Log:
HBASE-3074 Zookeeper test failing on hudson; xtra debugging to help figure whats happening
up on hudson

Modified:
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/HRegionLocation.java
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/HRegionLocation.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/HRegionLocation.java?rev=1003919&r1=1003918&r2=1003919&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/HRegionLocation.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/HRegionLocation.java Sat Oct  2 23:48:00
2010
@@ -45,7 +45,7 @@ public class HRegionLocation implements 
   @Override
   public String toString() {
     return "address: " + this.serverAddress.toString() + ", regioninfo: " +
-      this.regionInfo;
+      this.regionInfo.getRegionNameAsString();
   }
 
   /**

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java?rev=1003919&r1=1003918&r2=1003919&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java Sat Oct
 2 23:48:00 2010
@@ -382,8 +382,7 @@ public class CatalogTracker {
         throw e;
       }
     }
-    LOG.info("Failed verification of " + Bytes.toString(regionName) +
-      ", assigning anew: " + t);
+    LOG.info("Failed verification of " + Bytes.toString(regionName) + "; " + t);
     return false;
   }
 

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=1003919&r1=1003918&r2=1003919&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java Sat Oct
 2 23:48:00 2010
@@ -594,7 +594,7 @@ public class HConnectionManager {
         MetaScanner.metaScan(conf, visitor, tableName, row,
             this.prefetchRegionLimit);
       } catch (IOException e) {
-        LOG.warn("Encounted problems when prefetch META table: ", e);
+        LOG.warn("Encountered problems when prefetch META table: ", e);
       }
     }
 
@@ -627,9 +627,10 @@ public class HConnectionManager {
             + Bytes.toStringBinary(row) + " after " + numRetries + " tries.");
         }
 
+        HRegionLocation metaLocation = null;
         try {
           // locate the root or meta region
-          HRegionLocation metaLocation = locateRegion(parentTable, metaKey);
+          metaLocation = locateRegion(parentTable, metaKey);
           HRegionInterface server =
             getHRegionConnection(metaLocation.getServerAddress());
 
@@ -714,7 +715,10 @@ public class HConnectionManager {
           }
           if (tries < numRetries - 1) {
             if (LOG.isDebugEnabled()) {
-              LOG.debug("locateRegionInMeta attempt " + tries + " of " +
+              LOG.debug("locateRegionInMeta parentTable=" +
+                Bytes.toString(parentTable) + ", metaLocation=" +
+                ((metaLocation == null)? "null": metaLocation) + ", attempt=" +
+                tries + " of " +
                 this.numRetries + " failed; retrying after sleep of " +
                 getPauseTime(tries) + " because: " + e.getMessage());
             }
@@ -731,7 +735,8 @@ public class HConnectionManager {
           Thread.sleep(getPauseTime(tries));
         } catch (InterruptedException e) {
           Thread.currentThread().interrupt();
-          throw new IOException("Giving up trying to location region in meta: thread is interrupted.");
+          throw new IOException("Giving up trying to location region in " +
+            "meta: thread is interrupted.");
         }
       }
     }

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java?rev=1003919&r1=1003918&r2=1003919&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
Sat Oct  2 23:48:00 2010
@@ -60,7 +60,7 @@ public class ServerShutdownHandler exten
     this.server = server;
     this.services = services;
     this.deadServers = deadServers;
-    if (this.deadServers.contains(hsi.getServerName())) {
+    if (!this.deadServers.contains(hsi.getServerName())) {
       LOG.warn(hsi.getServerName() + " is NOT in deadservers; it should be!");
     }
   }

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1003919&r1=1003918&r2=1003919&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Sat
Oct  2 23:48:00 2010
@@ -539,7 +539,7 @@ public class HRegionServer implements HR
       } // for
     } catch (Throwable t) {
       if (!checkOOME(t)) {
-        abort("Unhandled exception", t);
+        abort("Unhandled exception: " + t.getMessage(), t);
       }
     }
     this.leases.closeAfterLeasesExpire();
@@ -1247,9 +1247,9 @@ public class HRegionServer implements HR
    */
   public void abort(String reason, Throwable cause) {
     if (cause != null) {
-      LOG.fatal("Aborting region server " + this + ": " + reason, cause);
+      LOG.fatal("ABORTING region server " + this + ": " + reason, cause);
     } else {
-      LOG.fatal("Aborting region server " + this + ": " + reason);
+      LOG.fatal("ABORTING region server " + this + ": " + reason);
     }
     this.abortRequested = true;
     this.reservedSpace.clear();
@@ -1358,9 +1358,9 @@ public class HRegionServer implements HR
       try {
         this.requestCount.set(0);
         lastMsg = System.currentTimeMillis();
-        ZKUtil.setAddressAndWatch(zooKeeper, ZKUtil.joinZNode(
-            zooKeeper.rsZNode, ZKUtil.getNodeName(serverInfo)),
-            this.serverInfo.getServerAddress());
+        ZKUtil.setAddressAndWatch(zooKeeper,
+          ZKUtil.joinZNode(zooKeeper.rsZNode, ZKUtil.getNodeName(serverInfo)),
+          this.serverInfo.getServerAddress());
         this.serverInfo.setLoad(buildServerLoad());
         result = this.hbaseMaster.regionServerStartup(this.serverInfo);
         break;



Mime
View raw message