hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zhang...@apache.org
Subject hbase git commit: HBASE-16209 addendum fix region move delay
Date Mon, 01 Aug 2016 03:32:48 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 d54bcfb1e -> c46f56b38


HBASE-16209 addendum fix region move delay


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

Branch: refs/heads/branch-1
Commit: c46f56b382ca1023c097326acda275e615b6c4e0
Parents: d54bcfb
Author: zhangduo <zhangduo@apache.org>
Authored: Mon Aug 1 11:29:18 2016 +0800
Committer: zhangduo <zhangduo@apache.org>
Committed: Mon Aug 1 11:29:50 2016 +0800

----------------------------------------------------------------------
 .../apache/hadoop/hbase/master/AssignmentManager.java | 14 +++++---------
 .../hbase/master/handler/ClosedRegionHandler.java     |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/c46f56b3/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
----------------------------------------------------------------------
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;
     }
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/c46f56b3/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java
----------------------------------------------------------------------
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);
   }
 }


Mime
View raw message