Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 10CB6112FD for ; Tue, 12 Aug 2014 20:34:12 +0000 (UTC) Received: (qmail 9024 invoked by uid 500); 12 Aug 2014 20:34:11 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 8979 invoked by uid 500); 12 Aug 2014 20:34:11 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 8970 invoked by uid 99); 12 Aug 2014 20:34:11 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Aug 2014 20:34:11 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 03127921F84; Tue, 12 Aug 2014 20:34:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jxiang@apache.org To: commits@hbase.apache.org Message-Id: <57ede7960d6f4d089ec7c2e4f716c1b6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: HBASE-11727 Assignment wait time error in case of ServerNotRunningYetException Date: Tue, 12 Aug 2014 20:34:10 +0000 (UTC) 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 Authored: Tue Aug 12 12:57:27 2014 -0700 Committer: Jimmy Xiang 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 {