hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jxi...@apache.org
Subject git commit: HBASE-11727 Assignment wait time error in case of ServerNotRunningYetException
Date Tue, 12 Aug 2014 20:34:10 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 60fcc2ea8 -> dc1d743ce


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/dc1d743c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/dc1d743c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/dc1d743c

Branch: refs/heads/branch-1
Commit: dc1d743ce6dffe85be9af021021acc2a77389640
Parents: 60fcc2e
Author: Jimmy Xiang <jxiang@cloudera.com>
Authored: Tue Aug 12 12:57:27 2014 -0700
Committer: Jimmy Xiang <jxiang@cloudera.com>
Committed: Tue Aug 12 13:33:19 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/dc1d743c/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 06bb336..a568a29 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
@@ -2104,8 +2104,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 {


Mime
View raw message