You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2015/06/25 23:44:39 UTC
hbase git commit: HBASE-13961 SnapshotManager#initialize should set
snapshotLayoutVersion if it allows to create snapshot with old layout format
(Cui Jianwei)
Repository: hbase
Updated Branches:
refs/heads/0.98 46e9a8ea0 -> 2ad8d6142
HBASE-13961 SnapshotManager#initialize should set snapshotLayoutVersion if it allows to create snapshot with old layout format (Cui Jianwei)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2ad8d614
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2ad8d614
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2ad8d614
Branch: refs/heads/0.98
Commit: 2ad8d61423bb2e8afd9b3b7847cf116dae76f708
Parents: 46e9a8e
Author: tedyu <yu...@gmail.com>
Authored: Thu Jun 25 14:44:39 2015 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Thu Jun 25 14:44:39 2015 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/2ad8d614/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java
----------------------------------------------------------------------
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 11621d3..3b33ec9 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
@@ -1024,7 +1024,9 @@ public class SnapshotManager extends MasterProcedureManager implements Stoppable
this.rootDir = master.getMasterFileSystem().getRootDir();
checkSnapshotSupport(master.getConfiguration(), master.getMasterFileSystem());
-
+ this.snapshotLayoutVersion = SnapshotDescriptionUtils.getDefaultSnapshotLayoutFormat(
+ master.getConfiguration());
+
// get the configuration for the coordinator
Configuration conf = master.getConfiguration();
long wakeFrequency = conf.getInt(SNAPSHOT_WAKE_MILLIS_KEY, SNAPSHOT_WAKE_MILLIS_DEFAULT);