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 1e1ec6f..6621e19 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 @@ -1030,9 +1030,11 @@ public class AssignmentManager implements ServerListener { } } } catch (UnexpectedStateException e) { - LOG.warn("Killing " + serverName + ": " + e.getMessage()); - killRegionServer(serverName); - throw (YouAreDeadException)new YouAreDeadException(e.getMessage()).initCause(e); + //See HBASE-21421, we can count on reportRegionStateTransition calls + //We only log a warming here. It could be a network lag. + LOG.warn("Failed to checkOnlineRegionsReport" + e.getMessage()); + //killRegionServer(serverName); + //throw (YouAreDeadException)new YouAreDeadException(e.getMessage()).initCause(e); } } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRogueRSAssignment.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRogueRSAssignment.java index afcf446..3149d0e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRogueRSAssignment.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRogueRSAssignment.java @@ -45,6 +45,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -137,7 +138,12 @@ public class TestRogueRSAssignment { admin.setBalancerRunning(true, false); } + /** + * Ignore this test, see HBASE-21421 + * @throws Exception + */ @Test + @Ignore public void testReportRSWithWrongRegion() throws Exception { final TableName tableName = TableName.valueOf(this.name.getMethodName());