From a8da5e811e87cff4e9b08a7d2c846f941270bf6e Mon Sep 17 00:00:00 2001 From: Esteban Gutierrez Date: Fri, 3 Apr 2015 12:20:43 -0700 Subject: [PATCH] HBASE-13403 Make waitOnSafeMode configurable in MasterFileSystem --- hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java | 3 +++ .../src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java index 19e251a..5e2d605 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java @@ -150,6 +150,9 @@ public final class HConstants { /** Parameter name for the master type being backup (waits for primary to go inactive). */ public static final String MASTER_TYPE_BACKUP = "hbase.master.backup"; + /** Parameter name for how long we will wait until the NN leaves the safe mode*/ + public static final String MASTER_WAIT_ON_SAFE_MODE = "hbase.master.waitonsafemode"; + /** * by default every master is a possible primary master unless the conf explicitly overrides it */ diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java index 78e4c11..a0317fb 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java @@ -415,7 +415,8 @@ public class MasterFileSystem { final FileSystem fs) throws IOException { // If FS is in safe mode wait till out of it. - FSUtils.waitOnSafeMode(c, c.getInt(HConstants.THREAD_WAKE_FREQUENCY, 10 * 1000)); + FSUtils.waitOnSafeMode(c, c.getInt(HConstants.MASTER_WAIT_ON_SAFE_MODE, + c.getInt(HConstants.THREAD_WAKE_FREQUENCY, 10 * 1000))); // Filesystem is good. Go ahead and check for hbase.rootdir. try { if (!fs.exists(rd)) { -- 2.3.3