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 E1AE91974C for ; Tue, 12 Apr 2016 23:46:54 +0000 (UTC) Received: (qmail 68731 invoked by uid 500); 12 Apr 2016 23:46:54 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 68689 invoked by uid 500); 12 Apr 2016 23:46:54 -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 68680 invoked by uid 99); 12 Apr 2016 23:46:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Apr 2016 23:46:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9D9D5DFB7A; Tue, 12 Apr 2016 23:46:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: syuanjiang@apache.org To: commits@hbase.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-15636 hard coded wait time out value in HBaseTestingUtility#waitUntilAllRegionsAssigned might cause test failure (Stephen Yuan Jiang) Date: Tue, 12 Apr 2016 23:46:54 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/master d03cdc795 -> 543e7081f HBASE-15636 hard coded wait time out value in HBaseTestingUtility#waitUntilAllRegionsAssigned might cause test failure (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/543e7081 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/543e7081 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/543e7081 Branch: refs/heads/master Commit: 543e7081f548e1379bbd36a301640ef20d06ccc2 Parents: d03cdc7 Author: Stephen Yuan Jiang Authored: Tue Apr 12 16:46:39 2016 -0700 Committer: Stephen Yuan Jiang Committed: Tue Apr 12 16:46:39 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/HBaseTestingUtility.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/543e7081/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java index 4360e1e..010e184 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java @@ -3156,14 +3156,17 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility { /** * Wait until all regions for a table in hbase:meta have a non-empty - * info:server, up to 60 seconds. This means all regions have been deployed, + * info:server, up to a configuable timeout value (default is 60 seconds) + * This means all regions have been deployed, * master has been informed and updated hbase:meta with the regions deployed * server. * @param tableName the table name * @throws IOException */ public void waitUntilAllRegionsAssigned(final TableName tableName) throws IOException { - waitUntilAllRegionsAssigned(tableName, 60000); + waitUntilAllRegionsAssigned( + tableName, + this.conf.getLong("hbase.client.sync.wait.timeout.msec", 60000)); } /**