hbase git commit: HBASE-16132 Scan does not return all the result when regionserver is busy (binlijin)

2016-07-07 Thread liyu 
Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 78ef0513b -> 8f8736d17


HBASE-16132 Scan does not return all the result when regionserver is busy 
(binlijin)


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

Branch: refs/heads/branch-1.2
Commit: 8f8736d177e6bf6ac0c45672121827abc1f09d73
Parents: 78ef051
Author: Yu Li 
Authored: Mon Jul 4 21:43:29 2016 +0800
Committer: Yu Li 
Committed: Thu Jul 7 22:42:18 2016 +0800

--
 .../hadoop/hbase/client/ScannerCallableWithReplicas.java   | 6 +-
 .../org/apache/hadoop/hbase/master/HMasterCommandLine.java | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/8f8736d1/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
index f8feca1..4d5bb0f 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
@@ -202,6 +202,9 @@ class ScannerCallableWithReplicas implements 
RetryingCallable {
   updateCurrentlyServingReplica(r.getSecond(), r.getFirst(), done, 
pool);
 }
 return r == null ? null : r.getFirst(); // great we got an answer
+  } else {
+throw new IOException("Failed to get result within timeout, timeout="
++ timeout + "ms");
   }
 } catch (ExecutionException e) {
   RpcRetryingCallerWithReadReplicas.throwEnrichedException(e, retries);
@@ -216,7 +219,8 @@ class ScannerCallableWithReplicas implements 
RetryingCallable {
   // calls succeeded or failed. In all case, we stop all our tasks.
   cs.cancelAll();
 }
-return null; // unreachable
+LOG.error("Imposible? Arrive at an unreachable line..."); // unreachable
+throw new IOException("Imposible? Arrive at an unreachable line...");
   }
 
   private void updateCurrentlyServingReplica(ScannerCallable scanner, Result[] 
result,

http://git-wip-us.apache.org/repos/asf/hbase/blob/8f8736d1/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
index 706dc23..d2957c7 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
@@ -101,8 +101,7 @@ public class HMasterCommandLine extends ServerCommandLine {
 // minRegionServers used to be minServers.  Support it too.
 if (cmd.hasOption("minServers")) {
   String val = cmd.getOptionValue("minServers");
-  getConf().setInt("hbase.regions.server.count.min",
-  Integer.parseInt(val));
+  getConf().setInt("hbase.regions.server.count.min", 
Integer.parseInt(val));
   LOG.debug("minServers set to " + val);
 }

hbase git commit: HBASE-16132 Scan does not return all the result when regionserver is busy (binlijin)

2016-07-07 Thread liyu 
Repository: hbase
Updated Branches:
  refs/heads/branch-1.1 11c59d9dd -> dcc1243f6


HBASE-16132 Scan does not return all the result when regionserver is busy 
(binlijin)


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

Branch: refs/heads/branch-1.1
Commit: dcc1243f61332b696e1df193d553249b469c0e63
Parents: 11c59d9
Author: Yu Li 
Authored: Mon Jul 4 21:43:29 2016 +0800
Committer: Yu Li 
Committed: Thu Jul 7 22:43:37 2016 +0800

--
 .../hadoop/hbase/client/ScannerCallableWithReplicas.java   | 6 +-
 .../org/apache/hadoop/hbase/master/HMasterCommandLine.java | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/dcc1243f/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
index 5675aa0..c02b438 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
@@ -202,6 +202,9 @@ class ScannerCallableWithReplicas implements 
RetryingCallable {
   updateCurrentlyServingReplica(r.getSecond(), r.getFirst(), done, 
pool);
 }
 return r == null ? null : r.getFirst(); // great we got an answer
+  } else {
+throw new IOException("Failed to get result within timeout, timeout="
++ timeout + "ms");
   }
 } catch (ExecutionException e) {
   RpcRetryingCallerWithReadReplicas.throwEnrichedException(e, retries);
@@ -216,7 +219,8 @@ class ScannerCallableWithReplicas implements 
RetryingCallable {
   // calls succeeded or failed. In all case, we stop all our tasks.
   cs.cancelAll();
 }
-return null; // unreachable
+LOG.error("Imposible? Arrive at an unreachable line..."); // unreachable
+throw new IOException("Imposible? Arrive at an unreachable line...");
   }
 
   private void updateCurrentlyServingReplica(ScannerCallable scanner, Result[] 
result,

http://git-wip-us.apache.org/repos/asf/hbase/blob/dcc1243f/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
index beea81b..4d750c3 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
@@ -102,8 +102,7 @@ public class HMasterCommandLine extends ServerCommandLine {
 // minRegionServers used to be minServers.  Support it too.
 if (cmd.hasOption("minServers")) {
   String val = cmd.getOptionValue("minServers");
-  getConf().setInt("hbase.regions.server.count.min",
-  Integer.valueOf(val));
+  getConf().setInt("hbase.regions.server.count.min", 
Integer.parseInt(val));
   LOG.debug("minServers set to " + val);
 }

hbase git commit: HBASE-16132 Scan does not return all the result when regionserver is busy (binlijin)

2016-07-04 Thread liyu 
Repository: hbase
Updated Branches:
  refs/heads/branch-1.3 a9b7f3f02 -> b3834d7f7


HBASE-16132 Scan does not return all the result when regionserver is busy 
(binlijin)


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

Branch: refs/heads/branch-1.3
Commit: b3834d7f72af4b689bc49f799b9f64671af8be44
Parents: a9b7f3f
Author: Yu Li 
Authored: Mon Jul 4 21:43:29 2016 +0800
Committer: Yu Li 
Committed: Mon Jul 4 21:47:01 2016 +0800

--
 .../hadoop/hbase/client/ScannerCallableWithReplicas.java   | 6 +-
 .../org/apache/hadoop/hbase/master/HMasterCommandLine.java | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/b3834d7f/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
index f8feca1..4d5bb0f 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
@@ -202,6 +202,9 @@ class ScannerCallableWithReplicas implements 
RetryingCallable {
   updateCurrentlyServingReplica(r.getSecond(), r.getFirst(), done, 
pool);
 }
 return r == null ? null : r.getFirst(); // great we got an answer
+  } else {
+throw new IOException("Failed to get result within timeout, timeout="
++ timeout + "ms");
   }
 } catch (ExecutionException e) {
   RpcRetryingCallerWithReadReplicas.throwEnrichedException(e, retries);
@@ -216,7 +219,8 @@ class ScannerCallableWithReplicas implements 
RetryingCallable {
   // calls succeeded or failed. In all case, we stop all our tasks.
   cs.cancelAll();
 }
-return null; // unreachable
+LOG.error("Imposible? Arrive at an unreachable line..."); // unreachable
+throw new IOException("Imposible? Arrive at an unreachable line...");
   }
 
   private void updateCurrentlyServingReplica(ScannerCallable scanner, Result[] 
result,

http://git-wip-us.apache.org/repos/asf/hbase/blob/b3834d7f/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
index 706dc23..d2957c7 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
@@ -101,8 +101,7 @@ public class HMasterCommandLine extends ServerCommandLine {
 // minRegionServers used to be minServers.  Support it too.
 if (cmd.hasOption("minServers")) {
   String val = cmd.getOptionValue("minServers");
-  getConf().setInt("hbase.regions.server.count.min",
-  Integer.parseInt(val));
+  getConf().setInt("hbase.regions.server.count.min", 
Integer.parseInt(val));
   LOG.debug("minServers set to " + val);
 }

hbase git commit: HBASE-16132 Scan does not return all the result when regionserver is busy (binlijin)

2016-07-04 Thread liyu 
Repository: hbase
Updated Branches:
  refs/heads/branch-1 480783630 -> 84dd9cbcb


HBASE-16132 Scan does not return all the result when regionserver is busy 
(binlijin)


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

Branch: refs/heads/branch-1
Commit: 84dd9cbcb64933a9511c34a433c28b423e5cc266
Parents: 4807836
Author: Yu Li 
Authored: Mon Jul 4 21:43:29 2016 +0800
Committer: Yu Li 
Committed: Mon Jul 4 21:46:19 2016 +0800

--
 .../hadoop/hbase/client/ScannerCallableWithReplicas.java   | 6 +-
 .../org/apache/hadoop/hbase/master/HMasterCommandLine.java | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/84dd9cbc/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
index f8feca1..4d5bb0f 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
@@ -202,6 +202,9 @@ class ScannerCallableWithReplicas implements 
RetryingCallable {
   updateCurrentlyServingReplica(r.getSecond(), r.getFirst(), done, 
pool);
 }
 return r == null ? null : r.getFirst(); // great we got an answer
+  } else {
+throw new IOException("Failed to get result within timeout, timeout="
++ timeout + "ms");
   }
 } catch (ExecutionException e) {
   RpcRetryingCallerWithReadReplicas.throwEnrichedException(e, retries);
@@ -216,7 +219,8 @@ class ScannerCallableWithReplicas implements 
RetryingCallable {
   // calls succeeded or failed. In all case, we stop all our tasks.
   cs.cancelAll();
 }
-return null; // unreachable
+LOG.error("Imposible? Arrive at an unreachable line..."); // unreachable
+throw new IOException("Imposible? Arrive at an unreachable line...");
   }
 
   private void updateCurrentlyServingReplica(ScannerCallable scanner, Result[] 
result,

http://git-wip-us.apache.org/repos/asf/hbase/blob/84dd9cbc/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
index 706dc23..d2957c7 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
@@ -101,8 +101,7 @@ public class HMasterCommandLine extends ServerCommandLine {
 // minRegionServers used to be minServers.  Support it too.
 if (cmd.hasOption("minServers")) {
   String val = cmd.getOptionValue("minServers");
-  getConf().setInt("hbase.regions.server.count.min",
-  Integer.parseInt(val));
+  getConf().setInt("hbase.regions.server.count.min", 
Integer.parseInt(val));
   LOG.debug("minServers set to " + val);
 }

hbase git commit: HBASE-16132 Scan does not return all the result when regionserver is busy (binlijin)

2016-07-04 Thread liyu 
Repository: hbase
Updated Branches:
  refs/heads/master 6944a17ad -> 7f44dfd85


HBASE-16132 Scan does not return all the result when regionserver is busy 
(binlijin)


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

Branch: refs/heads/master
Commit: 7f44dfd85fc1aacd451cb8514fbce6dafd3443ca
Parents: 6944a17
Author: Yu Li 
Authored: Mon Jul 4 21:43:29 2016 +0800
Committer: Yu Li 
Committed: Mon Jul 4 21:45:04 2016 +0800

--
 .../hadoop/hbase/client/ScannerCallableWithReplicas.java   | 6 +-
 .../org/apache/hadoop/hbase/master/HMasterCommandLine.java | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/7f44dfd8/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
index a197e90..0fbb2e7 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
@@ -202,6 +202,9 @@ class ScannerCallableWithReplicas implements 
RetryingCallable {
   updateCurrentlyServingReplica(r.getSecond(), r.getFirst(), done, 
pool);
 }
 return r == null ? null : r.getFirst(); // great we got an answer
+  } else {
+throw new IOException("Failed to get result within timeout, timeout="
++ timeout + "ms");
   }
 } catch (ExecutionException e) {
   RpcRetryingCallerWithReadReplicas.throwEnrichedException(e, retries);
@@ -216,7 +219,8 @@ class ScannerCallableWithReplicas implements 
RetryingCallable {
   // calls succeeded or failed. In all case, we stop all our tasks.
   cs.cancelAll();
 }
-return null; // unreachable
+LOG.error("Imposible? Arrive at an unreachable line..."); // unreachable
+throw new IOException("Imposible? Arrive at an unreachable line...");
   }
 
   private void updateCurrentlyServingReplica(ScannerCallable scanner, Result[] 
result,

http://git-wip-us.apache.org/repos/asf/hbase/blob/7f44dfd8/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
index 0b94d24..e53a781 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
@@ -103,8 +103,7 @@ public class HMasterCommandLine extends ServerCommandLine {
 // minRegionServers used to be minServers.  Support it too.
 if (cmd.hasOption("minServers")) {
   String val = cmd.getOptionValue("minServers");
-  getConf().setInt("hbase.regions.server.count.min",
-  Integer.parseInt(val));
+  getConf().setInt("hbase.regions.server.count.min", 
Integer.parseInt(val));
   LOG.debug("minServers set to " + val);
 }