[ 
https://issues.apache.org/jira/browse/HBASE-24338?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Stack resolved HBASE-24338.
-----------------------------------
    Resolution: Fixed

Pushed addendum to branch-2.3+ (Thanks [~binlijin] for noticing).

diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndTRSP.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndTRSP.java
index 62861045d8..e1ba68c35a 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndTRSP.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndTRSP.java
@@ -135,14 +135,17 @@ public class TestRaceBetweenSCPAndTRSP {

     ARRIVE_REGION_OPENING = new CountDownLatch(1);
     RESUME_REGION_OPENING = new CountDownLatch(1);
+    // Assign to local variable because this static gets set to null in above 
running thread and
+    // so can NPE when we check await later below.
     ARRIVE_GET_REGIONS_ON_SERVER = new CountDownLatch(1);
+    CountDownLatch cdl = ARRIVE_GET_REGIONS_ON_SERVER;
     RESUME_GET_REGIONS_ON_SERVER = new CountDownLatch(1);

     Future<byte[]> moveFuture = am.moveAsync(new RegionPlan(region, sn, sn));
     ARRIVE_REGION_OPENING.await();

     UTIL.getMiniHBaseCluster().killRegionServer(sn);
-    ARRIVE_GET_REGIONS_ON_SERVER.await();
+    cdl.await();
     RESUME_REGION_OPENING.countDown();

> [Flakey Tests] NPE in TestRaceBetweenSCPAndDTP
> ----------------------------------------------
>
>                 Key: HBASE-24338
>                 URL: https://issues.apache.org/jira/browse/HBASE-24338
>             Project: HBase
>          Issue Type: Bug
>          Components: flakies, test
>            Reporter: Michael Stack
>            Assignee: Michael Stack
>            Priority: Major
>             Fix For: 3.0.0-alpha-1, 2.3.0
>
>
> Seen in local runs....



--
This message was sent by Atlassian Jira
(v8.3.4#803005)

Reply via email to