hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject hbase git commit: HBASE-13937 Partially revert HBASE-13172
Date Tue, 23 Jun 2015 18:07:25 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.0 d550e42f4 -> d36354b6a


HBASE-13937 Partially revert HBASE-13172

Conflicts:
	hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d36354b6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d36354b6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d36354b6

Branch: refs/heads/branch-1.0
Commit: d36354b6a569a075401a1978e376e00fa633d305
Parents: d550e42
Author: Enis Soztutar <enis@apache.org>
Authored: Tue Jun 23 10:49:51 2015 -0700
Committer: Enis Soztutar <enis@apache.org>
Committed: Tue Jun 23 11:07:07 2015 -0700

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hbase/master/ServerManager.java    | 7 -------
 1 file changed, 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/d36354b6/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
index ac9938f..98a12bc 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
@@ -47,7 +47,6 @@ import org.apache.hadoop.hbase.YouAreDeadException;
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.hbase.client.ClusterConnection;
 import org.apache.hadoop.hbase.client.ConnectionFactory;
-import org.apache.hadoop.hbase.ipc.ServerNotRunningYetException;
 import org.apache.hadoop.hbase.master.balancer.BaseLoadBalancer;
 import org.apache.hadoop.hbase.master.handler.MetaServerShutdownHandler;
 import org.apache.hadoop.hbase.master.handler.ServerShutdownHandler;
@@ -62,7 +61,6 @@ import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo;
 import org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask.RecoveryMode;
 import org.apache.hadoop.hbase.regionserver.HRegionServer;
 import org.apache.hadoop.hbase.regionserver.RegionOpeningState;
-import org.apache.hadoop.hbase.regionserver.RegionServerStoppedException;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.Triple;
 import org.apache.hadoop.hbase.util.Pair;
@@ -828,11 +826,6 @@ public class ServerManager {
           return info != null && info.hasServerName()
             && server.getStartcode() == info.getServerName().getStartCode();
         }
-      } catch (RegionServerStoppedException | ServerNotRunningYetException e) {
-        if (LOG.isDebugEnabled()) {
-          LOG.debug("Couldn't reach " + server, e);
-        }
-        break;
       } catch (IOException ioe) {
         if (LOG.isDebugEnabled()) {
           LOG.debug("Couldn't reach " + server + ", try=" + retryCounter.getAttemptTimes()
+ " of "


Mime
View raw message