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/08/26 00:50:07 UTC

hbase git commit: HBASE-16255 Revert addendum because dash is not allowed

Repository: hbase
Updated Branches:
  refs/heads/HBASE-7912 63e75d2e1 -> 33bd2ccd7


HBASE-16255 Revert addendum because dash is not allowed


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

Branch: refs/heads/HBASE-7912
Commit: 33bd2ccd7b6865f1785f00fffce96f2baafee764
Parents: 63e75d2
Author: tedyu <yu...@gmail.com>
Authored: Thu Aug 25 17:50:00 2016 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Thu Aug 25 17:50:00 2016 -0700

----------------------------------------------------------------------
 .../apache/hadoop/hbase/IntegrationTestBackupRestore.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/33bd2ccd/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java
index 5e89c06..52f1c32 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java
@@ -68,13 +68,15 @@ public class IntegrationTestBackupRestore extends IntegrationTestBase {
   protected static final TableName TABLE_NAME1 = TableName.valueOf(CLASS_NAME + ".table1");
   protected static final TableName TABLE_NAME2 = TableName.valueOf(CLASS_NAME + ".table2");
   protected static final String COLUMN_NAME = "f";
-  protected static final String REGION_COUNT_KEY = "regions-per-rs";
-  protected static final String REGIONSERVER_COUNT_KEY = "region-servers";
+  protected static final String REGION_COUNT_KEY = String.format("hbase.%s.regions.perRS", CLASS_NAME);
+  protected static final String REGIONSERVER_COUNT_KEY = String.format("hbase.%s.regionServers",
+    CLASS_NAME);
   protected static final int DEFAULT_REGION_COUNT = 10;
   protected static final int DEFAULT_REGIONSERVER_COUNT = 5;
   protected static int regionsCountPerServer;
   protected static int regionServerCount;
-  protected static final String NB_ROWS_IN_BATCH_KEY = "rows-in-batch";
+  protected static final String NB_ROWS_IN_BATCH_KEY =
+      String.format("hbase.%s.rows-in-batch", CLASS_NAME);
   protected static final int DEFAULT_NB_ROWS_IN_BATCH = 20000;
   private static int rowsInBatch;
   private static String BACKUP_ROOT_DIR = "backupIT";