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 A73E79ABB for ; Thu, 17 Nov 2011 02:17:25 +0000 (UTC) Received: (qmail 38597 invoked by uid 500); 17 Nov 2011 02:17:25 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 38577 invoked by uid 500); 17 Nov 2011 02:17:25 -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 38570 invoked by uid 99); 17 Nov 2011 02:17:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Nov 2011 02:17:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Nov 2011 02:17:24 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 67F102388A64 for ; Thu, 17 Nov 2011 02:17:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1203016 - /hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Date: Thu, 17 Nov 2011 02:17:04 -0000 To: commits@hbase.apache.org From: nspiegelberg@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111117021704.67F102388A64@eris.apache.org> Author: nspiegelberg Date: Thu Nov 17 02:17:03 2011 New Revision: 1203016 URL: http://svn.apache.org/viewvc?rev=1203016&view=rev Log: Fix master startup when running on a single machine Summary: As part of master failover unit test changes I removed public access from HMaster.LocalHMaster, which broke local HBase startup (a pseudo-distributed configuration). This is a quick fix. A more thorough fix would ideally add a unit test. Test Plan: ./start-hbase.sh Go to localhost:60010 and verify that the master is up. Reviewers: kannan Reviewed By: kannan CC: hbase-eng@lists, kannan Differential Revision: 362257 Revert Plan: OK Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/master/HMaster.java URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1203016&r1=1203015&r2=1203016&view=diff ============================================================================== --- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original) +++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Thu Nov 17 02:17:03 2011 @@ -1777,7 +1777,7 @@ public class HMaster extends Thread impl /* * Version of master that will shutdown the passed zk cluster on its way out. */ - static class LocalHMaster extends HMaster { + public static class LocalHMaster extends HMaster { private MiniZooKeeperCluster zkcluster = null; public LocalHMaster(Configuration conf) throws IOException {