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 2016/11/04 00:38:44 UTC
hbase git commit: HBASE-16978 Disable backup by default - addendum 3
(Vladimir Rodionov)
Repository: hbase
Updated Branches:
refs/heads/HBASE-7912 2d12fc2d8 -> 199c6350f
HBASE-16978 Disable backup by default - addendum 3 (Vladimir Rodionov)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/199c6350
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/199c6350
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/199c6350
Branch: refs/heads/HBASE-7912
Commit: 199c6350f1351371cf7f0ac38f502e1f0f5f509c
Parents: 2d12fc2
Author: tedyu <yu...@gmail.com>
Authored: Thu Nov 3 17:38:38 2016 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Thu Nov 3 17:38:38 2016 -0700
----------------------------------------------------------------------
.../test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/199c6350/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
index cdd1e71..f9ae79e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
@@ -59,6 +59,7 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.Waiter.ExplainingPredicate;
import org.apache.hadoop.hbase.Waiter.Predicate;
+import org.apache.hadoop.hbase.backup.impl.BackupManager;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.classification.InterfaceStability;
import org.apache.hadoop.hbase.client.Admin;
@@ -3185,7 +3186,9 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
public void waitUntilAllSystemRegionsAssigned() throws IOException {
waitUntilAllRegionsAssigned(TableName.META_TABLE_NAME);
waitUntilAllRegionsAssigned(TableName.NAMESPACE_TABLE_NAME);
- waitUntilAllRegionsAssigned(TableName.BACKUP_TABLE_NAME);
+ if (BackupManager.isBackupEnabled(conf)) {
+ waitUntilAllRegionsAssigned(TableName.BACKUP_TABLE_NAME);
+ }
}
/**