HBASE-22733 TestSplitTransactionOnCluster.testMasterRestartAtRegionSplitPendingCatalogJanitor is flakey (#408)

sunhelly · saintstack · commit 747d000808bc · 2019-07-25T11:09:07.000-07:00
Signed-off-by: stack &lt;stack@apache.org&gt;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
@@ -541,6 +541,7 @@ public void testMasterRestartAtRegionSplitPendingCatalogJanitor()
         rst.getRegionServer().compactedFileDischarger.setUseExecutor(oldSetting);
       }
       cluster.getMaster().setCatalogJanitorEnabled(true);
+      ProcedureTestingUtility.waitAllProcedures(cluster.getMaster().getMasterProcedureExecutor());
       LOG.info("Starting run of CatalogJanitor");
       cluster.getMaster().getCatalogJanitor().run();
       ProcedureTestingUtility.waitAllProcedures(cluster.getMaster().getMasterProcedureExecutor());

Original file line number	Diff line number	Diff line change
`@@ -541,6 +541,7 @@ public void testMasterRestartAtRegionSplitPendingCatalogJanitor()`
`541`	`541`	`rst.getRegionServer().compactedFileDischarger.setUseExecutor(oldSetting);`
`542`	`542`	`}`
`543`	`543`	`cluster.getMaster().setCatalogJanitorEnabled(true);`
	`544`	`+ ProcedureTestingUtility.waitAllProcedures(cluster.getMaster().getMasterProcedureExecutor());`
`544`	`545`	`LOG.info("Starting run of CatalogJanitor");`
`545`	`546`	`cluster.getMaster().getCatalogJanitor().run();`
`546`	`547`	`ProcedureTestingUtility.waitAllProcedures(cluster.getMaster().getMasterProcedureExecutor());`