From 7021399f4209fed2fc7b7b51236f2ae69a0189da Mon Sep 17 00:00:00 2001 From: Jan Hentschel Date: Sun, 19 Feb 2017 22:41:17 +0100 Subject: [PATCH] HBASE-17666 Removed remaining usage of SnapshotDescriptionUtils.SNAPSHOT_TIMEOUT_MILLIS_DEFAULT --- .../apache/hadoop/hbase/master/snapshot/SnapshotManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java index 1abd605f99..e53f819255 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java @@ -1124,7 +1124,7 @@ public class SnapshotManager extends MasterProcedureManager implements Stoppable Configuration conf = master.getConfiguration(); long wakeFrequency = conf.getInt(SNAPSHOT_WAKE_MILLIS_KEY, SNAPSHOT_WAKE_MILLIS_DEFAULT); long timeoutMillis = Math.max(conf.getLong(SnapshotDescriptionUtils.SNAPSHOT_TIMEOUT_MILLIS_KEY, - SnapshotDescriptionUtils.SNAPSHOT_TIMEOUT_MILLIS_DEFAULT), + SnapshotDescriptionUtils.DEFAULT_MAX_WAIT_TIME), conf.getLong(SnapshotDescriptionUtils.MASTER_SNAPSHOT_TIMEOUT_MILLIS, SnapshotDescriptionUtils.DEFAULT_MAX_WAIT_TIME)); int opThreads = conf.getInt(SNAPSHOT_POOL_THREADS_KEY, SNAPSHOT_POOL_THREADS_DEFAULT); -- 2.17.1