Repository: hbase Updated Branches: refs/heads/master 1262f1e2d -> 71d3f6896
HBASE-11727 Assignment wait time error in case of ServerNotRunningYetException Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/71d3f689 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/71d3f689 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/71d3f689 Branch: refs/heads/master Commit: 71d3f6896bff87923036e873a3bee5ac90125501 Parents: 1262f1e Author: Jimmy Xiang <[email protected]> Authored: Tue Aug 12 12:57:27 2014 -0700 Committer: Jimmy Xiang <[email protected]> Committed: Tue Aug 12 12:57:27 2014 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/master/AssignmentManager.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/71d3f689/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 0503c5c..3d8be89 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 @@ -1096,8 +1096,9 @@ public class AssignmentManager { + this.server.getConfiguration().getLong(ALREADY_IN_TRANSITION_WAITTIME, DEFAULT_ALREADY_IN_TRANSITION_WAITTIME); } else { - maxWaitTime = this.server.getConfiguration(). - getLong("hbase.regionserver.rpc.startup.waittime", 60000); + maxWaitTime = EnvironmentEdgeManager.currentTimeMillis() + + this.server.getConfiguration().getLong( + "hbase.regionserver.rpc.startup.waittime", 60000); } } try {
