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<Object> 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<ACL> list = new ArrayList<ACL>();
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<ACL> list = new ArrayList<ACL>();
list.add(acl);
|