Repository: hbase Updated Branches: refs/heads/0.98 5671e7d99 -> 626d12f42
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/626d12f4 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/626d12f4 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/626d12f4 Branch: refs/heads/0.98 Commit: 626d12f4275c82a6aad5e8c5c31ebb05bd2c847f Parents: 5671e7d Author: Jimmy Xiang <[email protected]> Authored: Tue Aug 12 12:57:27 2014 -0700 Committer: Jimmy Xiang <[email protected]> Committed: Tue Aug 12 13:38:10 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/626d12f4/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 e275df0..5e3c4c8 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 @@ -2020,8 +2020,9 @@ public class AssignmentManager extends ZooKeeperListener { + 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 {
