You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2014/08/02 01:35:42 UTC

git commit: HBASE-11651 Add conf which disables MetaMigrationConvertingToPB check (for experts only)

Repository: hbase
Updated Branches:
  refs/heads/branch-1 9db8ecba7 -> 4d272fa5e


HBASE-11651 Add conf which disables MetaMigrationConvertingToPB check (for experts only)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4d272fa5
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4d272fa5
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4d272fa5

Branch: refs/heads/branch-1
Commit: 4d272fa5ee6c18e0be62b3b0e8adbfa7ddc9c210
Parents: 9db8ecb
Author: stack <st...@apache.org>
Authored: Fri Aug 1 16:35:33 2014 -0700
Committer: stack <st...@apache.org>
Committed: Fri Aug 1 16:35:33 2014 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/4d272fa5/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
----------------------------------------------------------------------
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 f8e99f1..221e266 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
@@ -577,7 +577,9 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
     // Update meta with new PB serialization if required. i.e migrate all HRI to PB serialization
     // in meta. This must happen before we assign all user regions or else the assignment will
     // fail.
-    MetaMigrationConvertingToPB.updateMetaIfNecessary(this);
+    if (this.conf.getBoolean("hbase.MetaMigrationConvertingToPB", true)) {
+      MetaMigrationConvertingToPB.updateMetaIfNecessary(this);
+    }
 
     // Fix up assignment manager status
     status.setStatus("Starting assignment manager");