You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2018/12/14 00:15:00 UTC
[32/50] [abbrv] hbase git commit: HBASE-20808 Wrong shutdown order
between Chores and ChoreService
HBASE-20808 Wrong shutdown order between Chores and ChoreService
Signed-off-by: Reid Chan <re...@apache.org>
Conflicts:
hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8e36761e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8e36761e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8e36761e
Branch: refs/heads/branch-1.3
Commit: 8e36761e89d0ecdd6a476f06293c5d1c8295eb06
Parents: 955264e
Author: Nihal Jain <ni...@gmail.com>
Authored: Fri Jul 6 00:42:58 2018 +0530
Committer: Andrew Purtell <ap...@apache.org>
Committed: Wed Dec 12 18:08:19 2018 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/master/HMaster.java | 34 ++++++++------------
.../hbase/regionserver/HRegionServer.java | 21 ++++++------
2 files changed, 23 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/8e36761e/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index b47fecb..aedb987 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -50,6 +50,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.ChoreService;
import org.apache.hadoop.hbase.ClusterStatus;
import org.apache.hadoop.hbase.CoordinatedStateException;
import org.apache.hadoop.hbase.CoordinatedStateManager;
@@ -1226,8 +1227,8 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
LOG.error("Failed to stop master jetty server", e);
}
}
- super.stopServiceThreads();
stopChores();
+ super.stopServiceThreads();
CleanerChore.shutDownChorePool();
// Wait for all the remaining region servers to report in IFF we were
@@ -1240,9 +1241,6 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
LOG.debug("Stopping service threads");
}
// Clean up and close up shop
- if (this.logCleaner != null) this.logCleaner.cancel(true);
- if (this.hfileCleaner != null) this.hfileCleaner.cancel(true);
- if (this.replicationZKLockCleanerChore != null) this.replicationZKLockCleanerChore.cancel(true);
if (this.quotaManager != null) this.quotaManager.stop();
if (this.activeMasterManager != null) this.activeMasterManager.stop();
if (this.serverManager != null) this.serverManager.stop();
@@ -1283,23 +1281,17 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
}
private void stopChores() {
- if (this.balancerChore != null) {
- this.balancerChore.cancel(true);
- }
- if (this.normalizerChore != null) {
- this.normalizerChore.cancel(true);
- }
- if (this.clusterStatusChore != null) {
- this.clusterStatusChore.cancel(true);
- }
- if (this.catalogJanitorChore != null) {
- this.catalogJanitorChore.cancel(true);
- }
- if (this.clusterStatusPublisherChore != null){
- clusterStatusPublisherChore.cancel(true);
- }
- if (this.periodicDoMetricsChore != null) {
- periodicDoMetricsChore.cancel();
+ ChoreService choreService = getChoreService();
+ if (choreService != null) {
+ choreService.cancelChore(this.balancerChore);
+ choreService.cancelChore(this.normalizerChore);
+ choreService.cancelChore(this.clusterStatusChore);
+ choreService.cancelChore(this.catalogJanitorChore);
+ choreService.cancelChore(this.clusterStatusPublisherChore);
+ choreService.cancelChore(this.periodicDoMetricsChore);
+ choreService.cancelChore(this.logCleaner);
+ choreService.cancelChore(this.hfileCleaner);
+ choreService.cancelChore(this.replicationZKLockCleanerChore);
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/8e36761e/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
index ec21599..545c926 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -1044,10 +1044,6 @@ public class HRegionServer extends HasThread implements
if (this.hMemManager != null) this.hMemManager.stop();
if (this.cacheFlusher != null) this.cacheFlusher.interruptIfNecessary();
if (this.compactSplitThread != null) this.compactSplitThread.interruptIfNecessary();
- if (this.compactionChecker != null) this.compactionChecker.cancel(true);
- if (this.healthCheckChore != null) this.healthCheckChore.cancel(true);
- if (this.nonceManagerChore != null) this.nonceManagerChore.cancel(true);
- if (this.storefileRefresher != null) this.storefileRefresher.cancel(true);
sendShutdownInterrupt();
// Stop the quota manager
@@ -2210,13 +2206,16 @@ public class HRegionServer extends HasThread implements
*/
protected void stopServiceThreads() {
// clean up the scheduled chores
- if (this.choreService != null) choreService.shutdown();
- if (this.nonceManagerChore != null) nonceManagerChore.cancel(true);
- if (this.compactionChecker != null) compactionChecker.cancel(true);
- if (this.periodicFlusher != null) periodicFlusher.cancel(true);
- if (this.healthCheckChore != null) healthCheckChore.cancel(true);
- if (this.storefileRefresher != null) storefileRefresher.cancel(true);
- if (this.movedRegionsCleaner != null) movedRegionsCleaner.cancel(true);
+ if (this.choreService != null) {
+ choreService.cancelChore(nonceManagerChore);
+ choreService.cancelChore(compactionChecker);
+ choreService.cancelChore(periodicFlusher);
+ choreService.cancelChore(healthCheckChore);
+ choreService.cancelChore(storefileRefresher);
+ choreService.cancelChore(movedRegionsCleaner);
+ // clean up the remaining scheduled chores (in case we missed out any)
+ choreService.shutdown();
+ }
if (this.cacheFlusher != null) {
this.cacheFlusher.join();