Repository: hbase Updated Branches: refs/heads/branch-2 0f5b0fb75 -> af2d89005
Revert "HBASE-19527 Make ExecutorService threads daemon=true" Applied prematurely. Revert. This reverts commit 5e4ed33fa2e310578ee89517ac76940a1549f70b. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/af2d8900 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/af2d8900 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/af2d8900 Branch: refs/heads/branch-2 Commit: af2d8900551f3e2163eace99845e60ceccdf5ee8 Parents: 0f5b0fb Author: Michael Stack <[email protected]> Authored: Wed Jan 17 15:08:42 2018 -0800 Committer: Michael Stack <[email protected]> Committed: Wed Jan 17 15:08:42 2018 -0800 ---------------------------------------------------------------------- .../apache/hadoop/hbase/procedure2/ProcedureExecutor.java | 2 -- .../org/apache/hadoop/hbase/executor/ExecutorService.java | 2 +- .../hbase/master/balancer/TestRegionsOnMasterOptions.java | 10 ++++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/af2d8900/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java ---------------------------------------------------------------------- diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java index 7a964a8..069bf28 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java @@ -1710,7 +1710,6 @@ public class ProcedureExecutor<TEnvironment> { public WorkerThread(final ThreadGroup group) { super(group, "ProcExecWrkr-" + workerId.incrementAndGet()); - setDaemon(true); } @Override @@ -1785,7 +1784,6 @@ public class ProcedureExecutor<TEnvironment> { public TimeoutExecutorThread(final ThreadGroup group) { super(group, "ProcExecTimeout"); - setDaemon(true); } @Override http://git-wip-us.apache.org/repos/asf/hbase/blob/af2d8900/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/ExecutorService.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/ExecutorService.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/ExecutorService.java index 342d441..d04956b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/ExecutorService.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/ExecutorService.java @@ -178,7 +178,7 @@ public class ExecutorService { // name the threads for this threadpool ThreadFactoryBuilder tfb = new ThreadFactoryBuilder(); tfb.setNameFormat(this.name + "-%d"); - tfb.setDaemon(true); + // TODO: Should these executors be daemon threads? this.threadPoolExecutor.setThreadFactory(tfb.build()); } http://git-wip-us.apache.org/repos/asf/hbase/blob/af2d8900/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestRegionsOnMasterOptions.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestRegionsOnMasterOptions.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestRegionsOnMasterOptions.java index 51649e6..8f06886 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestRegionsOnMasterOptions.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestRegionsOnMasterOptions.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.master.LoadBalancer; import org.apache.hadoop.hbase.regionserver.HRegion; +import org.apache.hadoop.hbase.regionserver.Region; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.JVMClusterUtil; import org.apache.hadoop.hbase.util.Threads; @@ -195,6 +196,15 @@ public class TestRegionsOnMasterOptions { // still only carry system regions post crash. assertEquals(masterCount, mNewActualCount); } + // Disable balancer and wait till RIT done else cluster won't go down. + TEST_UTIL.getAdmin().balancerSwitch(false, true); + while (true) { + if (!TEST_UTIL.getHBaseCluster().getMaster().getAssignmentManager(). + isMetaRegionInTransition()) { + break; + } + Threads.sleep(10); + } } finally { LOG.info("Running shutdown of cluster"); TEST_UTIL.shutdownMiniCluster();
