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 9595711BD5 for ; Tue, 15 Jul 2014 00:00:58 +0000 (UTC) Received: (qmail 53709 invoked by uid 500); 15 Jul 2014 00:00:58 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 53669 invoked by uid 500); 15 Jul 2014 00:00:58 -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 53660 invoked by uid 99); 15 Jul 2014 00:00:58 -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, 15 Jul 2014 00:00:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D935694B648; Tue, 15 Jul 2014 00:00:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: enis@apache.org To: commits@hbase.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: HBASE-4495 CatalogTracker has an identity crisis; needs to be cut-back in scope (ADDENDUM patch to fix flaky unit test) Date: Tue, 15 Jul 2014 00:00:57 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/branch-1 ecde6a4c4 -> 11fccd94c HBASE-4495 CatalogTracker has an identity crisis; needs to be cut-back in scope (ADDENDUM patch to fix flaky unit test) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/11fccd94 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/11fccd94 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/11fccd94 Branch: refs/heads/branch-1 Commit: 11fccd94c0d6fce523c5e0eab55968b4ed5864b6 Parents: ecde6a4 Author: Enis Soztutar Authored: Mon Jul 14 17:00:14 2014 -0700 Committer: Enis Soztutar Committed: Mon Jul 14 17:00:46 2014 -0700 ---------------------------------------------------------------------- .../test/java/org/apache/hadoop/hbase/TestMetaTableLocator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/11fccd94/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableLocator.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableLocator.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableLocator.java index d2448b3..dccd7ca 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableLocator.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableLocator.java @@ -326,7 +326,7 @@ public class TestMetaTableLocator { void doWaiting() throws InterruptedException { try { - while (new MetaTableLocator().waitMetaRegionLocation(watcher, 100) == null); + while (new MetaTableLocator().waitMetaRegionLocation(watcher, 10000) == null); } catch (NotAllMetaRegionsOnlineException e) { //Ignore }