hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1571917 - in /hbase/branches/0.96: hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
Date Wed, 26 Feb 2014 04:32:55 GMT
Author: stack
Date: Wed Feb 26 04:32:55 2014
New Revision: 1571917

URL: http://svn.apache.org/r1571917
Log:
HBASE-10614 Master could not be stopped (Jingcheng Du)

Modified:
    hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java
    hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java

Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java?rev=1571917&r1=1571916&r2=1571917&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java
(original)
+++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java
Wed Feb 26 04:32:55 2014
@@ -162,11 +162,11 @@ public class MetaReader {
   private static HTable getHTable(final CatalogTracker catalogTracker,
       final TableName tableName)
   throws IOException {
-    // Passing the CatalogTracker's connection configuration ensures this
+    // Passing the CatalogTracker's connection ensures this
     // HTable instance uses the CatalogTracker's connection.
     org.apache.hadoop.hbase.client.HConnection c = catalogTracker.getConnection();
     if (c == null) throw new NullPointerException("No connection");
-    return new HTable(catalogTracker.getConnection().getConfiguration(), tableName);
+    return new HTable(tableName, c);
   }
 
   /**

Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java?rev=1571917&r1=1571916&r2=1571917&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
(original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
Wed Feb 26 04:32:55 2014
@@ -169,8 +169,11 @@ public class ServerShutdownHandler exten
       while (!this.server.isStopped()) {
         try {
           this.server.getCatalogTracker().waitForMeta();
-          hris = MetaReader.getServerUserRegions(this.server.getCatalogTracker(),
-            this.serverName);
+          // Skip getting user regions if the server is stopped.
+          if (!this.server.isStopped()) {
+            hris = MetaReader.getServerUserRegions(this.server.getCatalogTracker(),
+                this.serverName);
+          }
           break;
         } catch (InterruptedException e) {
           Thread.currentThread().interrupt();



Mime
View raw message