Repository: hbase Updated Branches: refs/heads/branch-1 256fc6300 -> 316e02e3d refs/heads/branch-2 16a5a9db3 -> 6af3ee44c refs/heads/master 58b377751 -> 50e28d62a
HBASE-18219 Fix typo in constant HConstants.HBASE_CLIENT_MEAT_REPLICA_SCAN_TIMEOUT Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/50e28d62 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/50e28d62 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/50e28d62 Branch: refs/heads/master Commit: 50e28d62a6f21997cb6ff929d84e497d7ccb204c Parents: 58b3777 Author: Andrew Purtell <[email protected]> Authored: Wed Jun 14 16:02:38 2017 -0700 Committer: Andrew Purtell <[email protected]> Committed: Wed Jun 14 16:02:38 2017 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hbase/client/ConnectionConfiguration.java | 6 +++--- .../src/main/java/org/apache/hadoop/hbase/HConstants.java | 4 ++-- .../org/apache/hadoop/hbase/client/TestReplicaWithCluster.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/50e28d62/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionConfiguration.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionConfiguration.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionConfiguration.java index 7109b26..4547e78 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionConfiguration.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionConfiguration.java @@ -76,8 +76,8 @@ public class ConnectionConfiguration { conf.getInt("hbase.client.replicaCallTimeout.scan", 1000000); // 1000 ms this.metaReplicaCallTimeoutMicroSecondScan = - conf.getInt(HConstants.HBASE_CLIENT_MEAT_REPLICA_SCAN_TIMEOUT, - HConstants.HBASE_CLIENT_MEAT_REPLICA_SCAN_TIMEOUT_DEFAULT); + conf.getInt(HConstants.HBASE_CLIENT_META_REPLICA_SCAN_TIMEOUT, + HConstants.HBASE_CLIENT_META_REPLICA_SCAN_TIMEOUT_DEFAULT); this.retries = conf.getInt( HConstants.HBASE_CLIENT_RETRIES_NUMBER, HConstants.DEFAULT_HBASE_CLIENT_RETRIES_NUMBER); @@ -112,7 +112,7 @@ public class ConnectionConfiguration { this.primaryCallTimeoutMicroSecond = 10000; this.replicaCallTimeoutMicroSecondScan = 1000000; this.metaReplicaCallTimeoutMicroSecondScan = - HConstants.HBASE_CLIENT_MEAT_REPLICA_SCAN_TIMEOUT_DEFAULT; + HConstants.HBASE_CLIENT_META_REPLICA_SCAN_TIMEOUT_DEFAULT; this.retries = HConstants.DEFAULT_HBASE_CLIENT_RETRIES_NUMBER; this.clientScannerAsyncPrefetch = Scan.DEFAULT_HBASE_CLIENT_SCANNER_ASYNC_PREFETCH; this.maxKeyValueSize = MAX_KEYVALUE_SIZE_DEFAULT; http://git-wip-us.apache.org/repos/asf/hbase/blob/50e28d62/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java index d67cb55..dfc140b 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java @@ -308,11 +308,11 @@ public final class HConstants { public static final int DEFAULT_HBASE_CLIENT_OPERATION_TIMEOUT = 1200000; /** Parameter name for HBase client meta replica scan call timeout. */ - public static final String HBASE_CLIENT_MEAT_REPLICA_SCAN_TIMEOUT = + public static final String HBASE_CLIENT_META_REPLICA_SCAN_TIMEOUT = "hbase.client.meta.replica.scan.timeout"; /** Default HBase client meta replica scan call timeout, 1 second */ - public static final int HBASE_CLIENT_MEAT_REPLICA_SCAN_TIMEOUT_DEFAULT = 1000000; + public static final int HBASE_CLIENT_META_REPLICA_SCAN_TIMEOUT_DEFAULT = 1000000; /** Used to construct the name of the log directory for a region server */ public static final String HREGION_LOGDIR_NAME = "WALs"; http://git-wip-us.apache.org/repos/asf/hbase/blob/50e28d62/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java index 41c5a24..148da52 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java @@ -253,7 +253,7 @@ public class TestReplicaWithCluster { HTU.getConfiguration().set("hbase.coprocessor.region.classes", RegionServerHostingPrimayMetaRegionSlowOrStopCopro.class.getName()); - HTU.getConfiguration().setInt(HConstants.HBASE_CLIENT_MEAT_REPLICA_SCAN_TIMEOUT, + HTU.getConfiguration().setInt(HConstants.HBASE_CLIENT_META_REPLICA_SCAN_TIMEOUT, META_SCAN_TIMEOUT_IN_MILLISEC * 1000); HTU.startMiniCluster(NB_SERVERS);
