hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From syuanji...@apache.org
Subject hbase git commit: HBASE-16016 Fix overflow deadline value in AssignmentManager#waitForAssignment (Stephen Yuan Jiang)
Date Tue, 14 Jun 2016 03:39:54 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.1 737b1d6de -> 3b925fc3f


HBASE-16016 Fix overflow deadline value in AssignmentManager#waitForAssignment (Stephen Yuan
Jiang)


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

Branch: refs/heads/branch-1.1
Commit: 3b925fc3f3ea4b13eb6f71a75346fd3d9fdd626b
Parents: 737b1d6
Author: Stephen Yuan Jiang <syuanjiangdev@gmail.com>
Authored: Mon Jun 13 18:21:41 2016 -0700
Committer: Stephen Yuan Jiang <syuanjiangdev@gmail.com>
Committed: Mon Jun 13 20:36:57 2016 -0700

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hbase/master/AssignmentManager.java    | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/3b925fc3/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 3f96ae1..9c57ba8 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
@@ -2694,6 +2694,9 @@ public class AssignmentManager extends ZooKeeperListener {
       final boolean waitTillAllAssigned, final int reassigningRegions,
       final long minEndTime) throws InterruptedException {
     long deadline = minEndTime + bulkPerRegionOpenTimeGuesstimate * (reassigningRegions +
1);
+    if (deadline < 0) { // Overflow
+      deadline = Long.MAX_VALUE; // wait forever
+    }
     return waitForAssignment(regionSet, waitTillAllAssigned, deadline);
   }
 


Mime
View raw message