You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by sy...@apache.org on 2016/06/17 05:01:48 UTC
[06/30] hbase git commit: HBASE-16016 Fix overflow deadline value in
AssignmentManager#waitForAssignment (Stephen Yuan Jiang)
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/e486d274
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e486d274
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e486d274
Branch: refs/heads/hbase-12439
Commit: e486d274c508bea01b93f7c3175177c35482a5f1
Parents: 56c209c
Author: Stephen Yuan Jiang <sy...@gmail.com>
Authored: Mon Jun 13 18:21:41 2016 -0700
Committer: Stephen Yuan Jiang <sy...@gmail.com>
Committed: Mon Jun 13 18:21:41 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/e486d274/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 49026ac..55a15ee 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
@@ -1444,6 +1444,9 @@ public class AssignmentManager {
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);
}