You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jm...@apache.org on 2015/07/22 21:52:37 UTC
[19/50] [abbrv] hbase git commit: HBASE-13736 Add delay for the first
execution of ExpiredMobFileCleanerChore and MobFileCompactorChore.(Jingcheng)
HBASE-13736 Add delay for the first execution of ExpiredMobFileCleanerChore and MobFileCompactorChore.(Jingcheng)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5098f365
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5098f365
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5098f365
Branch: refs/heads/master
Commit: 5098f365b4071ab860d6850df792b4200b92c197
Parents: 09a00ef
Author: anoopsjohn <an...@gmail.com>
Authored: Thu May 21 13:40:25 2015 +0530
Committer: anoopsjohn <an...@gmail.com>
Committed: Thu May 21 13:40:25 2015 +0530
----------------------------------------------------------------------
hbase-common/src/main/resources/hbase-default.xml | 8 ++++----
.../hadoop/hbase/master/ExpiredMobFileCleanerChore.java | 8 +++++---
.../apache/hadoop/hbase/master/MobFileCompactionChore.java | 9 ++++++---
.../main/java/org/apache/hadoop/hbase/mob/MobConstants.java | 4 ++--
src/main/asciidoc/_chapters/hbase_mob.adoc | 6 +++---
5 files changed, 20 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/5098f365/hbase-common/src/main/resources/hbase-default.xml
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml
index c8078b5..540dded 100644
--- a/hbase-common/src/main/resources/hbase-default.xml
+++ b/hbase-common/src/main/resources/hbase-default.xml
@@ -1598,9 +1598,9 @@ possible configurations would overwhelm and obscure the important.
</property>
<property>
<name>hbase.master.mob.ttl.cleaner.period</name>
- <value>86400000</value>
+ <value>86400</value>
<description>
- The period that ExpiredMobFileCleanerChore runs. The unit is millisecond.
+ The period that ExpiredMobFileCleanerChore runs. The unit is second.
The default value is one day.
</description>
</property>
@@ -1635,9 +1635,9 @@ possible configurations would overwhelm and obscure the important.
</property>
<property>
<name>hbase.mob.file.compaction.chore.period</name>
- <value>604800000</value>
+ <value>604800</value>
<description>
- The period that MobFileCompactionChore runs. The unit is millisecond.
+ The period that MobFileCompactionChore runs. The unit is second.
The default value is one week.
</description>
</property>
http://git-wip-us.apache.org/repos/asf/hbase/blob/5098f365/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ExpiredMobFileCleanerChore.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ExpiredMobFileCleanerChore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ExpiredMobFileCleanerChore.java
index a9e9773..7b06462 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ExpiredMobFileCleanerChore.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ExpiredMobFileCleanerChore.java
@@ -20,6 +20,7 @@ package org.apache.hadoop.hbase.master;
import java.io.IOException;
import java.util.Map;
+import java.util.concurrent.TimeUnit;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -47,9 +48,10 @@ public class ExpiredMobFileCleanerChore extends ScheduledChore {
private ExpiredMobFileCleaner cleaner;
public ExpiredMobFileCleanerChore(HMaster master) {
- super(master.getServerName() + "-ExpiredMobFileCleanerChore", master,
- master.getConfiguration().getInt(MobConstants.MOB_CLEANER_PERIOD,
- MobConstants.DEFAULT_MOB_CLEANER_PERIOD));
+ super(master.getServerName() + "-ExpiredMobFileCleanerChore", master, master.getConfiguration()
+ .getInt(MobConstants.MOB_CLEANER_PERIOD, MobConstants.DEFAULT_MOB_CLEANER_PERIOD), master
+ .getConfiguration().getInt(MobConstants.MOB_CLEANER_PERIOD,
+ MobConstants.DEFAULT_MOB_CLEANER_PERIOD), TimeUnit.SECONDS);
this.master = master;
this.tableLockManager = master.getTableLockManager();
cleaner = new ExpiredMobFileCleaner();
http://git-wip-us.apache.org/repos/asf/hbase/blob/5098f365/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MobFileCompactionChore.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MobFileCompactionChore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MobFileCompactionChore.java
index 3a12725..13c52f0 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MobFileCompactionChore.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MobFileCompactionChore.java
@@ -20,6 +20,7 @@ package org.apache.hadoop.hbase.master;
import java.util.Map;
import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -44,9 +45,11 @@ public class MobFileCompactionChore extends ScheduledChore {
private ExecutorService pool;
public MobFileCompactionChore(HMaster master) {
- super(master.getServerName() + "-MobFileCompactChore", master,
- master.getConfiguration().getInt(MobConstants.MOB_FILE_COMPACTION_CHORE_PERIOD,
- MobConstants.DEFAULT_MOB_FILE_COMPACTION_CHORE_PERIOD));
+ super(master.getServerName() + "-MobFileCompactChore", master, master.getConfiguration()
+ .getInt(MobConstants.MOB_FILE_COMPACTION_CHORE_PERIOD,
+ MobConstants.DEFAULT_MOB_FILE_COMPACTION_CHORE_PERIOD), master.getConfiguration().getInt(
+ MobConstants.MOB_FILE_COMPACTION_CHORE_PERIOD,
+ MobConstants.DEFAULT_MOB_FILE_COMPACTION_CHORE_PERIOD), TimeUnit.SECONDS);
this.master = master;
this.tableLockManager = master.getTableLockManager();
this.pool = MobUtils.createMobFileCompactorThreadPool(master.getConfiguration());
http://git-wip-us.apache.org/repos/asf/hbase/blob/5098f365/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobConstants.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobConstants.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobConstants.java
index 13c6b3c..464a0e7 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobConstants.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobConstants.java
@@ -44,7 +44,7 @@ public class MobConstants {
public static final byte[] MOB_REGION_NAME_BYTES = Bytes.toBytes(MOB_REGION_NAME);
public static final String MOB_CLEANER_PERIOD = "hbase.master.mob.ttl.cleaner.period";
- public static final int DEFAULT_MOB_CLEANER_PERIOD = 24 * 60 * 60 * 1000; // one day
+ public static final int DEFAULT_MOB_CLEANER_PERIOD = 24 * 60 * 60; // one day
public static final String MOB_SWEEP_TOOL_COMPACTION_START_DATE =
"hbase.mob.sweep.tool.compaction.start.date";
@@ -106,7 +106,7 @@ public class MobConstants {
public static final String MOB_FILE_COMPACTION_CHORE_PERIOD =
"hbase.mob.file.compaction.chore.period";
public static final int DEFAULT_MOB_FILE_COMPACTION_CHORE_PERIOD =
- 24 * 60 * 60 * 1000 * 7; // a week
+ 24 * 60 * 60 * 7; // a week
public static final String MOB_FILE_COMPACTOR_CLASS_KEY = "hbase.mob.file.compactor.class";
/**
* The max number of threads used in MobFileCompactor.
http://git-wip-us.apache.org/repos/asf/hbase/blob/5098f365/src/main/asciidoc/_chapters/hbase_mob.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/_chapters/hbase_mob.adoc b/src/main/asciidoc/_chapters/hbase_mob.adoc
index 52f20f6..5a806ad 100644
--- a/src/main/asciidoc/_chapters/hbase_mob.adoc
+++ b/src/main/asciidoc/_chapters/hbase_mob.adoc
@@ -166,10 +166,10 @@ HBase MOB currently relies on a MapReduce job called the Sweeper tool for optimi
</description>
</property>
<property>
- <name>hbase.mob.cleaner.interval</name>
- <value>86400000</value>
+ <name>hbase.master.mob.ttl.cleaner.period</name>
+ <value>86400</value>
<description>
- The period that ExpiredMobFileCleaner runs. The unit is millisecond.
+ The period that ExpiredMobFileCleanerChore runs. The unit is second.
The default value is one day.
</description>
</property>