You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2019/09/28 01:32:05 UTC
[hbase] branch branch-2 updated: HBASE-23038 Provide consistent and
clear logging about disabling chores
This is an automated email from the ASF dual-hosted git repository.
busbey pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 6def152 HBASE-23038 Provide consistent and clear logging about disabling chores
6def152 is described below
commit 6def1528191f2c3584cb0863d0725b1913ba174e
Author: Sanjeet Nishad <sa...@gmail.com>
AuthorDate: Thu Sep 26 09:38:37 2019 +0530
HBASE-23038 Provide consistent and clear logging about disabling chores
Signed-off-by: Viraj Jasani <vi...@gmail.com>
Signed-off-by: Sean Busbey <bu...@apache.org>
(cherry picked from commit b45c0d0efa261509ac101748587051ba1c9184bb)
---
.../src/main/java/org/apache/hadoop/hbase/ChoreService.java | 4 ++++
.../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 9 ++-------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/ChoreService.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/ChoreService.java
index 85d6131..5e83ef3 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/ChoreService.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/ChoreService.java
@@ -150,6 +150,10 @@ public class ChoreService implements ChoreServicer {
}
try {
+ if (chore.getPeriod() <= 0) {
+ LOG.info("The period is {} seconds, {} is disabled", chore.getPeriod(), chore.getName());
+ return false;
+ }
chore.setChoreServicer(this);
ScheduledFuture<?> future =
scheduler.scheduleAtFixedRate(chore, chore.getInitialDelay(), chore.getPeriod(),
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 1f76a03..882e178 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
@@ -1281,13 +1281,8 @@ public class HMaster extends HRegionServer implements MasterServices {
int mobCompactionPeriod = conf.getInt(MobConstants.MOB_COMPACTION_CHORE_PERIOD,
MobConstants.DEFAULT_MOB_COMPACTION_CHORE_PERIOD);
- if (mobCompactionPeriod > 0) {
- this.mobCompactChore = new MobCompactionChore(this, mobCompactionPeriod);
- getChoreService().scheduleChore(mobCompactChore);
- } else {
- LOG
- .info("The period is " + mobCompactionPeriod + " seconds, MobCompactionChore is disabled");
- }
+ this.mobCompactChore = new MobCompactionChore(this, mobCompactionPeriod);
+ getChoreService().scheduleChore(mobCompactChore);
this.mobCompactThread = new MasterMobCompactionThread(this);
}