hbase git commit: HBASE-18035 Meta replica does not give any primaryOperationTimeout to primary meta region (huaxiang sun)

2017-05-21 Thread tedyu 
Repository: hbase
Updated Branches:
  refs/heads/branch-1 300c5388f -> c03f003f4


HBASE-18035 Meta replica does not give any primaryOperationTimeout to primary 
meta region (huaxiang sun)


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

Branch: refs/heads/branch-1
Commit: c03f003f4f0301091fdcb1753691bcf7d46bd38c
Parents: 300c538
Author: tedyu 
Authored: Sun May 21 06:39:33 2017 -0700
Committer: tedyu 
Committed: Sun May 21 06:39:33 2017 -0700

--
 .../hbase/client/ConnectionConfiguration.java   | 18 +++--
 .../hadoop/hbase/client/ConnectionManager.java  | 17 -
 .../org/apache/hadoop/hbase/HConstants.java |  7 ++
 .../hbase/client/TestReplicaWithCluster.java| 76 
 4 files changed, 112 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/c03f003f/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 de760d4..76dcdfa 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
@@ -40,6 +40,7 @@ public class ConnectionConfiguration {
   private final long scannerMaxResultSize;
   private final int primaryCallTimeoutMicroSecond;
   private final int replicaCallTimeoutMicroSecondScan;
+  private final int metaReplicaCallTimeoutMicroSecondScan;
   private final int retries;
   private final int maxKeyValueSize;
 
@@ -50,9 +51,8 @@ public class ConnectionConfiguration {
   ConnectionConfiguration(Configuration conf) {
 this.writeBufferSize = conf.getLong(WRITE_BUFFER_SIZE_KEY, 
WRITE_BUFFER_SIZE_DEFAULT);
 
-this.metaOperationTimeout = conf.getInt(
-  HConstants.HBASE_CLIENT_META_OPERATION_TIMEOUT,
-  HConstants.DEFAULT_HBASE_CLIENT_OPERATION_TIMEOUT);
+this.metaOperationTimeout = 
conf.getInt(HConstants.HBASE_CLIENT_META_OPERATION_TIMEOUT,
+HConstants.DEFAULT_HBASE_CLIENT_OPERATION_TIMEOUT);
 
 this.operationTimeout = conf.getInt(
   HConstants.HBASE_CLIENT_OPERATION_TIMEOUT, 
HConstants.DEFAULT_HBASE_CLIENT_OPERATION_TIMEOUT);
@@ -62,7 +62,7 @@ public class ConnectionConfiguration {
 
 this.scannerMaxResultSize =
 conf.getLong(HConstants.HBASE_CLIENT_SCANNER_MAX_RESULT_SIZE_KEY,
-  HConstants.DEFAULT_HBASE_CLIENT_SCANNER_MAX_RESULT_SIZE);
+HConstants.DEFAULT_HBASE_CLIENT_SCANNER_MAX_RESULT_SIZE);
 
 this.primaryCallTimeoutMicroSecond =
 conf.getInt("hbase.client.primaryCallTimeout.get", 1); // 10ms
@@ -70,6 +70,10 @@ public class ConnectionConfiguration {
 this.replicaCallTimeoutMicroSecondScan =
 conf.getInt("hbase.client.replicaCallTimeout.scan", 100); // 1000 
ms
 
+this.metaReplicaCallTimeoutMicroSecondScan =
+conf.getInt(HConstants.HBASE_CLIENT_MEAT_REPLICA_SCAN_TIMEOUT,
+HConstants.HBASE_CLIENT_MEAT_REPLICA_SCAN_TIMEOUT_DEFAULT);
+
 this.retries = conf.getInt(
HConstants.HBASE_CLIENT_RETRIES_NUMBER, 
HConstants.DEFAULT_HBASE_CLIENT_RETRIES_NUMBER);
 
@@ -90,6 +94,8 @@ public class ConnectionConfiguration {
 this.scannerMaxResultSize = 
HConstants.DEFAULT_HBASE_CLIENT_SCANNER_MAX_RESULT_SIZE;
 this.primaryCallTimeoutMicroSecond = 1;
 this.replicaCallTimeoutMicroSecondScan = 100;
+this.metaReplicaCallTimeoutMicroSecondScan =
+HConstants.HBASE_CLIENT_MEAT_REPLICA_SCAN_TIMEOUT_DEFAULT;
 this.retries = HConstants.DEFAULT_HBASE_CLIENT_RETRIES_NUMBER;
 this.maxKeyValueSize = MAX_KEYVALUE_SIZE_DEFAULT;
   }
@@ -118,6 +124,10 @@ public class ConnectionConfiguration {
 return replicaCallTimeoutMicroSecondScan;
   }
 
+  public int getMetaReplicaCallTimeoutMicroSecondScan() {
+return metaReplicaCallTimeoutMicroSecondScan;
+  }
+
   public int getRetriesNumber() {
 return retries;
   }

http://git-wip-us.apache.org/repos/asf/hbase/blob/c03f003f/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java
index 60d4217..aa44070 100644
---

hbase git commit: HBASE-18035 Meta replica does not give any primaryOperationTimeout to primary meta region (huaxiang sun)

2017-05-18 Thread tedyu 
Repository: hbase
Updated Branches:
  refs/heads/master d137991cc -> 958cd2d1b


HBASE-18035 Meta replica does not give any primaryOperationTimeout to primary 
meta region (huaxiang sun)


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

Branch: refs/heads/master
Commit: 958cd2d1b7b1239925912ce148589eeb8a8dd2bc
Parents: d137991
Author: tedyu 
Authored: Thu May 18 15:56:41 2017 -0700
Committer: tedyu 
Committed: Thu May 18 15:56:41 2017 -0700

--
 .../hbase/client/ConnectionConfiguration.java   | 18 +++--
 .../hbase/client/ConnectionImplementation.java  | 16 -
 .../org/apache/hadoop/hbase/HConstants.java |  7 ++
 .../hbase/client/TestReplicaWithCluster.java| 74 
 4 files changed, 109 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/958cd2d1/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 bea91da..7109b26 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
@@ -40,6 +40,7 @@ public class ConnectionConfiguration {
   private final long scannerMaxResultSize;
   private final int primaryCallTimeoutMicroSecond;
   private final int replicaCallTimeoutMicroSecondScan;
+  private final int metaReplicaCallTimeoutMicroSecondScan;
   private final int retries;
   private final int maxKeyValueSize;
   private final int rpcTimeout;
@@ -55,9 +56,8 @@ public class ConnectionConfiguration {
   ConnectionConfiguration(Configuration conf) {
 this.writeBufferSize = conf.getLong(WRITE_BUFFER_SIZE_KEY, 
WRITE_BUFFER_SIZE_DEFAULT);
 
-this.metaOperationTimeout = conf.getInt(
-  HConstants.HBASE_CLIENT_META_OPERATION_TIMEOUT,
-  HConstants.DEFAULT_HBASE_CLIENT_OPERATION_TIMEOUT);
+this.metaOperationTimeout = 
conf.getInt(HConstants.HBASE_CLIENT_META_OPERATION_TIMEOUT,
+HConstants.DEFAULT_HBASE_CLIENT_OPERATION_TIMEOUT);
 
 this.operationTimeout = conf.getInt(
   HConstants.HBASE_CLIENT_OPERATION_TIMEOUT, 
HConstants.DEFAULT_HBASE_CLIENT_OPERATION_TIMEOUT);
@@ -67,7 +67,7 @@ public class ConnectionConfiguration {
 
 this.scannerMaxResultSize =
 conf.getLong(HConstants.HBASE_CLIENT_SCANNER_MAX_RESULT_SIZE_KEY,
-  HConstants.DEFAULT_HBASE_CLIENT_SCANNER_MAX_RESULT_SIZE);
+HConstants.DEFAULT_HBASE_CLIENT_SCANNER_MAX_RESULT_SIZE);
 
 this.primaryCallTimeoutMicroSecond =
 conf.getInt("hbase.client.primaryCallTimeout.get", 1); // 10ms
@@ -75,6 +75,10 @@ public class ConnectionConfiguration {
 this.replicaCallTimeoutMicroSecondScan =
 conf.getInt("hbase.client.replicaCallTimeout.scan", 100); // 1000 
ms
 
+this.metaReplicaCallTimeoutMicroSecondScan =
+conf.getInt(HConstants.HBASE_CLIENT_MEAT_REPLICA_SCAN_TIMEOUT,
+HConstants.HBASE_CLIENT_MEAT_REPLICA_SCAN_TIMEOUT_DEFAULT);
+
 this.retries = conf.getInt(
HConstants.HBASE_CLIENT_RETRIES_NUMBER, 
HConstants.DEFAULT_HBASE_CLIENT_RETRIES_NUMBER);
 
@@ -107,6 +111,8 @@ public class ConnectionConfiguration {
 this.scannerMaxResultSize = 
HConstants.DEFAULT_HBASE_CLIENT_SCANNER_MAX_RESULT_SIZE;
 this.primaryCallTimeoutMicroSecond = 1;
 this.replicaCallTimeoutMicroSecondScan = 100;
+this.metaReplicaCallTimeoutMicroSecondScan =
+HConstants.HBASE_CLIENT_MEAT_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;
@@ -147,6 +153,10 @@ public class ConnectionConfiguration {
 return replicaCallTimeoutMicroSecondScan;
   }
 
+  public int getMetaReplicaCallTimeoutMicroSecondScan() {
+return metaReplicaCallTimeoutMicroSecondScan;
+  }
+
   public int getRetriesNumber() {
 return retries;
   }

http://git-wip-us.apache.org/repos/asf/hbase/blob/958cd2d1/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java