Return-Path: Delivered-To: apmail-hadoop-hbase-commits-archive@minotaur.apache.org Received: (qmail 69742 invoked from network); 24 Feb 2010 22:27:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Feb 2010 22:27:06 -0000 Received: (qmail 91834 invoked by uid 500); 24 Feb 2010 22:27:06 -0000 Delivered-To: apmail-hadoop-hbase-commits-archive@hadoop.apache.org Received: (qmail 91795 invoked by uid 500); 24 Feb 2010 22:27:06 -0000 Mailing-List: contact hbase-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hbase-dev@hadoop.apache.org Delivered-To: mailing list hbase-commits@hadoop.apache.org Received: (qmail 91786 invoked by uid 99); 24 Feb 2010 22:27:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Feb 2010 22:27:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 24 Feb 2010 22:27:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 39A0923889BF; Wed, 24 Feb 2010 22:26:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r916004 - in /hadoop/hbase/trunk: CHANGES.txt core/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java Date: Wed, 24 Feb 2010 22:26:46 -0000 To: hbase-commits@hadoop.apache.org From: jdcryans@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100224222646.39A0923889BF@eris.apache.org> Author: jdcryans Date: Wed Feb 24 22:26:45 2010 New Revision: 916004 URL: http://svn.apache.org/viewvc?rev=916004&view=rev Log: HBASE-2262 ZKW.ensureExists should check for existence Modified: hadoop/hbase/trunk/CHANGES.txt hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java Modified: hadoop/hbase/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=916004&r1=916003&r2=916004&view=diff ============================================================================== --- hadoop/hbase/trunk/CHANGES.txt (original) +++ hadoop/hbase/trunk/CHANGES.txt Wed Feb 24 22:26:45 2010 @@ -382,6 +382,7 @@ HBASE-2241 Change balancer sloppyness from 0.1 to 0.3 HBASE-2250 typo in the maven pom HBASE-2254 Improvements to the Maven POMs (Lars Francke via Stack) + HBASE-2262 ZKW.ensureExists should check for existence NEW FEATURES HBASE-1961 HBase EC2 scripts Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java?rev=916004&r1=916003&r2=916004&view=diff ============================================================================== --- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java (original) +++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java Wed Feb 24 22:26:45 2010 @@ -398,6 +398,10 @@ private boolean ensureExists(final String znode) { try { + Stat stat = zooKeeper.exists(znode, false); + if (stat != null) { + return true; + } zooKeeper.create(znode, new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT); LOG.debug("Created ZNode " + znode);