Return-Path: Delivered-To: apmail-hadoop-zookeeper-commits-archive@minotaur.apache.org Received: (qmail 97950 invoked from network); 22 Jun 2009 20:53:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 22 Jun 2009 20:53:19 -0000 Received: (qmail 6137 invoked by uid 500); 22 Jun 2009 20:53:30 -0000 Delivered-To: apmail-hadoop-zookeeper-commits-archive@hadoop.apache.org Received: (qmail 6110 invoked by uid 500); 22 Jun 2009 20:53:30 -0000 Mailing-List: contact zookeeper-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: zookeeper-dev@ Delivered-To: mailing list zookeeper-commits@hadoop.apache.org Received: (qmail 6100 invoked by uid 99); 22 Jun 2009 20:53:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Jun 2009 20:53:30 +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; Mon, 22 Jun 2009 20:53:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0CDA923888A0; Mon, 22 Jun 2009 20:53:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r787395 - in /hadoop/zookeeper/trunk: ./ src/java/main/org/apache/zookeeper/server/ src/java/main/org/apache/zookeeper/server/auth/ src/java/test/org/apache/zookeeper/test/ Date: Mon, 22 Jun 2009 20:53:05 -0000 To: zookeeper-commits@hadoop.apache.org From: mahadev@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090622205306.0CDA923888A0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mahadev Date: Mon Jun 22 20:53:05 2009 New Revision: 787395 URL: http://svn.apache.org/viewvc?rev=787395&view=rev Log: ZOOKEEPER-446. some traces of the host auth scheme left (breed via mahadev) Removed: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/HostAuthenticationProvider.java Modified: hadoop/zookeeper/trunk/CHANGES.txt hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ACLTest.java Modified: hadoop/zookeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=787395&r1=787394&r2=787395&view=diff ============================================================================== --- hadoop/zookeeper/trunk/CHANGES.txt (original) +++ hadoop/zookeeper/trunk/CHANGES.txt Mon Jun 22 20:53:05 2009 @@ -126,6 +126,8 @@ ZOOKEEPER-427. ZooKeeper server unexpectedly high CPU utilisation (Sergey Zhuravlev via breed) + ZOOKEEPER-446. some traces of the host auth scheme left (breed via mahadev) + IMPROVEMENTS: ZOOKEEPER-308. improve the atomic broadcast performance 3x. (breed via mahadev) Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java?rev=787395&r1=787394&r2=787395&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java Mon Jun 22 20:53:05 2009 @@ -780,7 +780,6 @@ InetAddress addr = ((InetSocketAddress) sock.socket() .getRemoteSocketAddress()).getAddress(); authInfo.add(new Id("ip", addr.getHostAddress())); - authInfo.add(new Id("host", addr.getCanonicalHostName())); sk.interestOps(SelectionKey.OP_READ); } Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java?rev=787395&r1=787394&r2=787395&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java Mon Jun 22 20:53:05 2009 @@ -37,10 +37,8 @@ if (initialized) return; IPAuthenticationProvider ipp = new IPAuthenticationProvider(); - HostAuthenticationProvider hostp = new HostAuthenticationProvider(); DigestAuthenticationProvider digp = new DigestAuthenticationProvider(); authenticationProviders.put(ipp.getScheme(), ipp); - authenticationProviders.put(hostp.getScheme(), hostp); authenticationProviders.put(digp.getScheme(), digp); Enumeration en = System.getProperties().keys(); while (en.hasMoreElements()) { Modified: hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ACLTest.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ACLTest.java?rev=787395&r1=787394&r2=787395&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ACLTest.java (original) +++ hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ACLTest.java Mon Jun 22 20:53:05 2009 @@ -80,13 +80,13 @@ CreateMode.PERSISTENT); } assertTrue("size of the acl map ", (1 == zks.dataTree.longKeyMap.size())); - for (int j =100; j < 200; j++) { + for (int j = 100; j < 200; j++) { path = "/" + j; ACL acl = new ACL(); acl.setPerms(0); Id id = new Id(); - id.setId(j + ""); - id.setScheme("host"); + id.setId("1.1.1."+j); + id.setScheme("ip"); acl.setId(id); ArrayList list = new ArrayList(); list.add(acl); @@ -119,8 +119,8 @@ ACL acl = new ACL(); acl.setPerms(0); Id id = new Id(); - id.setId(j + ""); - id.setScheme("host"); + id.setId("1.1.1."+j); + id.setScheme("ip"); acl.setId(id); ArrayList list = new ArrayList(); list.add(acl);