From 1f01e4c2d764fcd9e249e1f1e1ffc7b31b982448 Mon Sep 17 00:00:00 2001 From: zhangduo Date: Mon, 1 Aug 2016 11:29:18 +0800 Subject: [PATCH] HBASE-16209 addendum fix region move delay --- .../org/apache/hadoop/hbase/master/AssignmentManager.java | 14 +++++--------- .../hadoop/hbase/master/handler/ClosedRegionHandler.java | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java index c21844a..6225897 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java @@ -3408,7 +3408,7 @@ public class AssignmentManager extends ZooKeeperListener { return true; } - void invokeAssign(HRegionInfo regionInfo) { + public void invokeAssign(HRegionInfo regionInfo) { invokeAssign(regionInfo, true); } @@ -3421,12 +3421,6 @@ public class AssignmentManager extends ZooKeeperListener { new AssignCallable(this, regionInfo, true)), sleepMillis, TimeUnit.MILLISECONDS); } - public void invokeAssignLaterOnFailure(HRegionInfo regionInfo) { - long sleepTime = backoffPolicy.getBackoffTime(retryConfig, - failedOpenTracker.get(regionInfo.getEncodedName()).get()); - invokeAssignLater(regionInfo, sleepTime); - } - void invokeUnAssign(HRegionInfo regionInfo) { threadPoolExecutorService.submit(new UnAssignCallable(this, regionInfo)); } @@ -4498,8 +4492,10 @@ public class AssignmentManager extends ZooKeeperListener { } private class DelayedAssignCallable implements Runnable { - Callable callable; - public DelayedAssignCallable(Callable callable) { + + private final Callable callable; + + public DelayedAssignCallable(Callable callable) { this.callable = callable; } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java index 04106d8..448d483 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java @@ -103,6 +103,6 @@ public class ClosedRegionHandler extends EventHandler implements TotesHRegionInf regionInfo, RegionState.State.CLOSED); // This below has to do w/ online enable/disable of a table assignmentManager.removeClosedRegion(regionInfo); - assignmentManager.invokeAssignLaterOnFailure(regionInfo); + assignmentManager.invokeAssign(regionInfo); } } -- 2.7.4