[hbase] branch branch-2 updated: HBASE-22207 Fix flakey TestAssignmentManager.testAssignSocketTimeout

[zhangduo]

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new df255f6  HBASE-22207 Fix flakey 
TestAssignmentManager.testAssignSocketTimeout
df255f6 is described below

commit df255f639d183e5cf3465f9fe595c6877881416c
Author: Duo Zhang <zhang...@apache.org>
AuthorDate: Thu Apr 11 16:09:49 2019 +0800

    HBASE-22207 Fix flakey TestAssignmentManager.testAssignSocketTimeout
---
 .../apache/hadoop/hbase/master/assignment/TestAssignmentManager.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestAssignmentManager.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestAssignmentManager.java
index 6a08070..30a5732 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestAssignmentManager.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestAssignmentManager.java
@@ -92,7 +92,9 @@ public class TestAssignmentManager extends 
TestAssignmentManagerBase {
     rsDispatcher.setMockRsExecutor(new SocketTimeoutRsExecutor(20));
     waitOnFuture(submitProcedure(createAssignProcedure(hri)));
 
-    assertEquals(assignSubmittedCount + 1, 
assignProcMetrics.getSubmittedCounter().getCount());
+    // we crashed a rs, so it is possible that there are other regions on the 
rs which will also be
+    // reassigned, so here we just assert greater than, not the exact number.
+    assertTrue(assignProcMetrics.getSubmittedCounter().getCount() > 
assignSubmittedCount);
     assertEquals(assignFailedCount, 
assignProcMetrics.getFailedCounter().getCount());
   }