From 7a82126f8b1453fd6d3450b5532793f47d3095cf Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Wed, 31 Jan 2018 15:56:26 -0800
Subject: [PATCH] Revert "HBASE-19906 TestZooKeeper Timeout"

Revert. Pushed prematurely.

This reverts commit 80af9bdef0fddfc174fa1558318df8a60f06afdf.
---
 .../org/apache/hadoop/hbase/master/HMaster.java     |  5 -----
 .../hbase/master/assignment/AssignmentManager.java  | 13 +------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index a75c9fe4d23..7bbf91f8bac 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -865,11 +865,6 @@ public class HMaster extends HRegionServer implements MasterServices {
     // Make sure meta assigned before proceeding.
     status.setStatus("Recovering  Meta Region");
 
-    // Check if master is shutting down because issue initializing regionservers or balancer.
-    if (isStopped()) {
-      return;
-    }
-
     // we recover hbase:meta region servers inside master initialization and
     // handle other failed servers in SSH in order to start up master node ASAP
     MasterMetaBootstrap metaBootstrap = createMetaBootstrap(this, status);
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java
index 83e21b66601..d6b73f44214 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java
@@ -1895,20 +1895,9 @@ public class AssignmentManager implements ServerListener {
         .getRegionInfoForReplica(RegionInfoBuilder.FIRST_META_REGIONINFO,
             RegionInfo.DEFAULT_REPLICA_ID);
     RegionState regionStateNode = getRegionStates().getRegionState(hri);
-    if (regionStateNode == null) {
-      LOG.warn("RegionStateNode is null for " + hri);
+    if (!regionStateNode.getServerName().equals(serverName)) {
       return;
     }
-    ServerName rsnServerName = regionStateNode.getServerName();
-    if (rsnServerName == null) {
-      return;
-    }
-    if (rsnServerName != null && !rsnServerName.equals(serverName)) {
-      return;
-    } else {
-      LOG.warn("Empty ServerName in RegionStateNode; proceeding regardless in case latched " +
-          "RecoverMetaProcedure procedure for clean up.");
-    }
     // meta has been assigned to crashed server.
     LOG.info("Meta assigned to crashed " + serverName + "; reassigning...");
     // Handle failure and wake event