Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-24338 [Flakey Tests] NPE in TestRaceBetweenSCPAndDTP Addendum2: make same fix for TestRaceBetweenSCPAndTRSP but in a second place (addendum 1 got first place).

This commit is contained in:
stack 2020-05-11 20:47:23 -07:00
parent cf786a2dfb
commit 5c08a8c04b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndTRSP.java
View File

@ -133,19 +133,20 @@ public class TestRaceBetweenSCPAndTRSP {
AssignmentManager am = UTIL.getMiniHBaseCluster().getMaster().getAssignmentManager(); AssignmentManager am = UTIL.getMiniHBaseCluster().getMaster().getAssignmentManager();
ServerName sn = am.getRegionStates().getRegionState(region).getServerName(); ServerName sn = am.getRegionStates().getRegionState(region).getServerName();
// Assign the CountDownLatches that get nulled in background threads else we NPE checking
// the static.
ARRIVE_REGION_OPENING = new CountDownLatch(1); ARRIVE_REGION_OPENING = new CountDownLatch(1);
CountDownLatch arriveRegionOpening = ARRIVE_REGION_OPENING;
RESUME_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); ARRIVE_GET_REGIONS_ON_SERVER = new CountDownLatch(1);
CountDownLatch cdl = ARRIVE_GET_REGIONS_ON_SERVER; CountDownLatch arriveGetRegionsOnServer = ARRIVE_GET_REGIONS_ON_SERVER;
RESUME_GET_REGIONS_ON_SERVER = new CountDownLatch(1); RESUME_GET_REGIONS_ON_SERVER = new CountDownLatch(1);
Future<byte[]> moveFuture = am.moveAsync(new RegionPlan(region, sn, sn)); Future<byte[]> moveFuture = am.moveAsync(new RegionPlan(region, sn, sn));
ARRIVE_REGION_OPENING.await(); arriveRegionOpening.await();
UTIL.getMiniHBaseCluster().killRegionServer(sn); UTIL.getMiniHBaseCluster().killRegionServer(sn);
cdl.await(); arriveGetRegionsOnServer.await();
RESUME_REGION_OPENING.countDown(); RESUME_REGION_OPENING.countDown();
moveFuture.get(); moveFuture.get();