From 0053ed30905dfb34583d30525cbc1debb92ed173 Mon Sep 17 00:00:00 2001 From: chenheng Date: Mon, 12 Sep 2016 21:34:18 +0800 Subject: [PATCH] HBASE-16611 Flakey org.apache.hadoop.hbase.client.TestReplicasClient.testCancelOfMultiGet --- .../src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java | 4 ++-- .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) 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 c5745e9..f67f534 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() { - MultiResponse res; + MultiResponse res = null; CancellableRegionServerCallable callable = currentCallable; try { // setup the callable based on the actions, if we don't have one already from the request @@ -795,7 +795,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); } } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index 0e07ae0..3f8cc8c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -630,7 +630,6 @@ public class HMaster extends HRegionServer implements MasterServices { this.maintenanceModeTracker = new MasterMaintenanceModeTracker(zooKeeper); this.maintenanceModeTracker.start(); - // Set the cluster as up. If new RSs, they'll be waiting on this before // going ahead with their startup. boolean wasUp = this.clusterStatusTracker.isClusterUp(); -- 2.5.4 (Apple Git-61)