You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2014/02/26 05:32:12 UTC
svn commit: r1571915 - in /hbase/trunk:
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
Author: stack
Date: Wed Feb 26 04:32:12 2014
New Revision: 1571915
URL: http://svn.apache.org/r1571915
Log:
HBASE-10614 Master could not be stopped (Jingcheng Du)
Modified:
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java?rev=1571915&r1=1571914&r2=1571915&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java Wed Feb 26 04:32:12 2014
@@ -163,11 +163,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/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java?rev=1571915&r1=1571914&r2=1571915&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java Wed Feb 26 04:32:12 2014
@@ -168,8 +168,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();