[2/2] hbase git commit: HBASE-16611 Flakey org.apache.hadoop.hbase.client.TestReplicasClient.testCancelOfMultiGet

[apurtell]

HBASE-16611 Flakey 
org.apache.hadoop.hbase.client.TestReplicasClient.testCancelOfMultiGet

Branch-1 port of HBASE-16611.v2.patch


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

Branch: refs/heads/branch-1.4
Commit: d12abb1ad8001bd84ce7175313cb41e33dea1c10
Parents: b55ae2d
Author: Andrew Purtell 
Authored: Wed Sep 13 18:08:54 2017 -0700
Committer: Andrew Purtell 
Committed: Wed Sep 13 18:09:30 2017 -0700

--
 .../main/java/org/apache/hadoop/hbase/client/AsyncProcess.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/d12abb1a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
index 10d4f38..097206c 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
@@ -789,7 +789,7 @@ class AsyncProcess {
 
   @Override
   public void run() {
-MultiResponse res;
+MultiResponse res = null;
 PayloadCarryingServerCallable callable = currentCallable;
 try {
   // setup the callable based on the actions, if we don't have one 
already from the request
@@ -828,7 +828,7 @@ class AsyncProcess {
   throw new RuntimeException(t);
 } finally {
   decTaskCounters(multiAction.getRegions(), server);
-  if (callsInProgress != null && callable != null) {
+  if (callsInProgress != null && callable != null && res != null) {
 callsInProgress.remove(callable);
   }
 }

[1/2] hbase git commit: HBASE-16611 Flakey org.apache.hadoop.hbase.client.TestReplicasClient.testCancelOfMultiGet

[apurtell]

Repository: hbase
Updated Branches:
  refs/heads/branch-1 42b797aa2 -> d2e6f55cc
  refs/heads/branch-1.4 b55ae2d4a -> d12abb1ad


HBASE-16611 Flakey 
org.apache.hadoop.hbase.client.TestReplicasClient.testCancelOfMultiGet

Branch-1 port of HBASE-16611.v2.patch


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

Branch: refs/heads/branch-1
Commit: d2e6f55cc5f095f1e32cb97f27b03a4c8a6f0d44
Parents: 42b797a
Author: Andrew Purtell 
Authored: Wed Sep 13 18:08:54 2017 -0700
Committer: Andrew Purtell 
Committed: Wed Sep 13 18:08:54 2017 -0700

--
 .../main/java/org/apache/hadoop/hbase/client/AsyncProcess.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/d2e6f55c/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
index 10d4f38..097206c 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
@@ -789,7 +789,7 @@ class AsyncProcess {
 
   @Override
   public void run() {
-MultiResponse res;
+MultiResponse res = null;
 PayloadCarryingServerCallable callable = currentCallable;
 try {
   // setup the callable based on the actions, if we don't have one 
already from the request
@@ -828,7 +828,7 @@ class AsyncProcess {
   throw new RuntimeException(t);
 } finally {
   decTaskCounters(multiAction.getRegions(), server);
-  if (callsInProgress != null && callable != null) {
+  if (callsInProgress != null && callable != null && res != null) {
 callsInProgress.remove(callable);
   }
 }

[25/50] [abbrv] hbase git commit: HBASE-16611 Flakey org.apache.hadoop.hbase.client.TestReplicasClient.testCancelOfMultiGet

[syuanjiang]

HBASE-16611 Flakey 
org.apache.hadoop.hbase.client.TestReplicasClient.testCancelOfMultiGet


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

Branch: refs/heads/hbase-12439
Commit: cd9f42237344756a7db395bd8241f41b00e359a2
Parents: 422734e
Author: chenheng 
Authored: Tue Sep 13 14:52:50 2016 +0800
Committer: chenheng 
Committed: Tue Sep 13 14:52:50 2016 +0800

--
 .../main/java/org/apache/hadoop/hbase/client/AsyncProcess.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/cd9f4223/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
index 1531201..93b17bc 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
@@ -756,7 +756,7 @@ class AsyncProcess {
 
   @Override
   public void run() {
-AbstractResponse res;
+AbstractResponse res = null;
 CancellableRegionServerCallable callable = currentCallable;
 try {
   // setup the callable based on the actions, if we don't have one 
already from the request
@@ -802,7 +802,7 @@ class AsyncProcess {
   throw new RuntimeException(t);
 } finally {
   decTaskCounters(multiAction.getRegions(), server);
-  if (callsInProgress != null && callable != null) {
+  if (callsInProgress != null && callable != null && res != null) {
 callsInProgress.remove(callable);
   }
 }

hbase git commit: HBASE-16611 Flakey org.apache.hadoop.hbase.client.TestReplicasClient.testCancelOfMultiGet

[chenheng]

Repository: hbase
Updated Branches:
  refs/heads/master 422734e73 -> cd9f42237


HBASE-16611 Flakey 
org.apache.hadoop.hbase.client.TestReplicasClient.testCancelOfMultiGet


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

Branch: refs/heads/master
Commit: cd9f42237344756a7db395bd8241f41b00e359a2
Parents: 422734e
Author: chenheng 
Authored: Tue Sep 13 14:52:50 2016 +0800
Committer: chenheng 
Committed: Tue Sep 13 14:52:50 2016 +0800

--
 .../main/java/org/apache/hadoop/hbase/client/AsyncProcess.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/cd9f4223/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
index 1531201..93b17bc 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
@@ -756,7 +756,7 @@ class AsyncProcess {
 
   @Override
   public void run() {
-AbstractResponse res;
+AbstractResponse res = null;
 CancellableRegionServerCallable callable = currentCallable;
 try {
   // setup the callable based on the actions, if we don't have one 
already from the request
@@ -802,7 +802,7 @@ class AsyncProcess {
   throw new RuntimeException(t);
 } finally {
   decTaskCounters(multiAction.getRegions(), server);
-  if (callsInProgress != null && callable != null) {
+  if (callsInProgress != null && callable != null && res != null) {
 callsInProgress.remove(callable);
   }
 }