http://git-wip-us.apache.org/repos/asf/zookeeper/blob/43d71c2e/zookeeper-common/src/test/java/org/apache/zookeeper/test/ReconfigMisconfigTest.java ---------------------------------------------------------------------- diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ReconfigMisconfigTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/ReconfigMisconfigTest.java deleted file mode 100644 index 1694fcf..0000000 --- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ReconfigMisconfigTest.java +++ /dev/null @@ -1,129 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.zookeeper.test; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.TimeoutException; - -import org.apache.zookeeper.ZKTestCase; -import org.apache.zookeeper.KeeperException; -import org.apache.zookeeper.PortAssignment; -import org.apache.zookeeper.admin.ZooKeeperAdmin; -import org.apache.zookeeper.data.Stat; -import org.apache.zookeeper.server.quorum.QuorumPeerConfig; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class ReconfigMisconfigTest extends ZKTestCase { - private static final Logger LOG = LoggerFactory.getLogger(ReconfigMisconfigTest.class); - private QuorumUtil qu; - private ZooKeeperAdmin zkAdmin; - private static String errorMsg = "Reconfig should fail without configuring the super " + - "user's password on server side first."; - - @Before - public void setup() throws InterruptedException { - QuorumPeerConfig.setReconfigEnabled(true); - // Get a three server quorum. - qu = new QuorumUtil(1); - qu.disableJMXTest = true; - try { - qu.startAll(); - } catch (IOException e) { - Assert.fail("Fail to start quorum servers."); - } - - instantiateZKAdmin(); - } - - @After - public void tearDown() throws Exception { - try { - if (qu != null) { - qu.tearDown(); - } - if (zkAdmin != null) { - zkAdmin.close(); - } - } catch (Exception e) { - // Ignore. - } - } - - @Test(timeout = 10000) - public void testReconfigFailWithoutSuperuserPasswordConfiguredOnServer() throws InterruptedException { - // This tests the case where ZK ensemble does not have the super user's password configured. - // Reconfig should fail as the super user has to be explicitly configured via - // zookeeper.DigestAuthenticationProvider.superDigest. - try { - reconfigPort(); - Assert.fail(errorMsg); - } catch (KeeperException e) { - Assert.assertTrue(e.getCode() == KeeperException.Code.NoAuth); - } - - try { - zkAdmin.addAuthInfo("digest", "super:".getBytes()); - reconfigPort(); - Assert.fail(errorMsg); - } catch (KeeperException e) { - Assert.assertTrue(e.getCode() == KeeperException.Code.NoAuth); - } - } - - private void instantiateZKAdmin() throws InterruptedException { - String cnxString; - ClientBase.CountdownWatcher watcher = new ClientBase.CountdownWatcher(); - try { - cnxString = "127.0.0.1:" + qu.getPeer(1).peer.getClientPort(); - zkAdmin = new ZooKeeperAdmin(cnxString, - ClientBase.CONNECTION_TIMEOUT, watcher); - } catch (IOException e) { - Assert.fail("Fail to create ZooKeeperAdmin handle."); - return; - } - - try { - watcher.waitForConnected(ClientBase.CONNECTION_TIMEOUT); - } catch (InterruptedException | TimeoutException e) { - Assert.fail("ZooKeeper admin client can not connect to " + cnxString); - } - } - - private boolean reconfigPort() throws KeeperException, InterruptedException { - List<String> joiningServers = new ArrayList<String>(); - int leaderId = 1; - while (qu.getPeer(leaderId).peer.leader == null) - leaderId++; - int followerId = leaderId == 1 ? 2 : 1; - joiningServers.add("server." + followerId + "=localhost:" - + qu.getPeer(followerId).peer.getQuorumAddress().getPort() /*quorum port*/ - + ":" + qu.getPeer(followerId).peer.getElectionAddress().getPort() /*election port*/ - + ":participant;localhost:" + PortAssignment.unique()/* new client port */); - zkAdmin.reconfigure(joiningServers, null, null, -1, new Stat()); - return true; - } -} -
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/43d71c2e/zookeeper-common/src/test/java/org/apache/zookeeper/test/ReconfigTest.java ---------------------------------------------------------------------- diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ReconfigTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/ReconfigTest.java deleted file mode 100644 index a050f7a..0000000 --- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ReconfigTest.java +++ /dev/null @@ -1,1114 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.zookeeper.test; - -import static java.net.InetAddress.getLoopbackAddress; - -import java.io.IOException; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.net.ServerSocket; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -import org.apache.zookeeper.KeeperException; -import org.apache.zookeeper.ZKTestCase; -import org.apache.zookeeper.AsyncCallback.DataCallback; -import org.apache.zookeeper.data.Stat; -import org.apache.zookeeper.jmx.CommonNames; -import org.apache.zookeeper.server.quorum.QuorumPeer; -import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer; -import org.apache.zookeeper.server.quorum.QuorumPeer.ServerState; -import org.apache.zookeeper.server.quorum.QuorumPeerConfig; -import org.apache.zookeeper.server.quorum.flexible.QuorumHierarchical; -import org.apache.zookeeper.server.quorum.flexible.QuorumMaj; -import org.apache.zookeeper.server.quorum.flexible.QuorumVerifier; -import org.apache.zookeeper.ZooKeeper; -import org.apache.zookeeper.admin.ZooKeeperAdmin; -import org.apache.zookeeper.Watcher; -import org.apache.zookeeper.WatchedEvent; -import org.apache.zookeeper.ZooDefs; -import org.apache.zookeeper.CreateMode; -import org.apache.zookeeper.PortAssignment; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class ReconfigTest extends ZKTestCase implements DataCallback{ - private static final Logger LOG = LoggerFactory - .getLogger(ReconfigTest.class); - - private QuorumUtil qu; - - @Before - public void setup() { - System.setProperty("zookeeper.DigestAuthenticationProvider.superDigest", - "super:D/InIHSb7yEEbrWz8b9l71RjZJU="/* password is 'test'*/); - QuorumPeerConfig.setReconfigEnabled(true); - } - - @After - public void tearDown() throws Exception { - if (qu != null) { - qu.tearDown(); - } - } - - public static String reconfig(ZooKeeperAdmin zkAdmin, List<String> joiningServers, - List<String> leavingServers, List<String> newMembers, long fromConfig) - throws KeeperException, InterruptedException { - byte[] config = null; - for (int j = 0; j < 30; j++) { - try { - config = zkAdmin.reconfigure(joiningServers, leavingServers, - newMembers, fromConfig, new Stat()); - break; - } catch (KeeperException.ConnectionLossException e) { - if (j < 29) { - Thread.sleep(1000); - } else { - // test fails if we still can't connect to the quorum after - // 30 seconds. - Assert.fail("client could not connect to reestablished quorum: giving up after 30+ seconds."); - } - } - } - - String configStr = new String(config); - if (joiningServers != null) { - for (String joiner : joiningServers) - Assert.assertTrue(configStr.contains(joiner)); - } - if (leavingServers != null) { - for (String leaving : leavingServers) - Assert.assertFalse(configStr.contains("server.".concat(leaving))); - } - - return configStr; - } - - public static String testServerHasConfig(ZooKeeper zk, - List<String> joiningServers, List<String> leavingServers) - throws KeeperException, InterruptedException { - boolean testNodeExists = false; - byte[] config = null; - for (int j = 0; j < 30; j++) { - try { - if (!testNodeExists) { - createZNode(zk, "/dummy", "dummy"); - testNodeExists = true; - } - // Use setData instead of sync API to force a view update. - // Check ZOOKEEPER-2137 for details. - zk.setData("/dummy", "dummy".getBytes(), -1); - config = zk.getConfig(false, new Stat()); - break; - } catch (KeeperException.ConnectionLossException e) { - if (j < 29) { - Thread.sleep(1000); - } else { - // test fails if we still can't connect to the quorum after - // 30 seconds. - Assert.fail("client could not connect to reestablished quorum: giving up after 30+ seconds."); - } - } - } - - String configStr = new String(config); - if (joiningServers != null) { - for (String joiner : joiningServers) { - Assert.assertTrue(configStr.contains(joiner)); - } - } - if (leavingServers != null) { - for (String leaving : leavingServers) - Assert.assertFalse(configStr.contains("server.".concat(leaving))); - } - - return configStr; - } - - public static void testNormalOperation(ZooKeeper writer, ZooKeeper reader) - throws KeeperException, InterruptedException { - boolean testReaderNodeExists = false; - boolean testWriterNodeExists = false; - - for (int j = 0; j < 30; j++) { - try { - if (!testWriterNodeExists) { - createZNode(writer, "/test", "test"); - testWriterNodeExists = true; - } - - if (!testReaderNodeExists) { - createZNode(reader, "/dummy", "dummy"); - testReaderNodeExists = true; - } - - String data = "test" + j; - writer.setData("/test", data.getBytes(), -1); - // Use setData instead of sync API to force a view update. - // Check ZOOKEEPER-2137 for details. - reader.setData("/dummy", "dummy".getBytes(), -1); - byte[] res = reader.getData("/test", null, new Stat()); - Assert.assertEquals(data, new String(res)); - break; - } catch (KeeperException.ConnectionLossException e) { - if (j < 29) { - Thread.sleep(1000); - } else { - // test fails if we still can't connect to the quorum after - // 30 seconds. - Assert.fail("client could not connect to reestablished quorum: giving up after 30+ seconds."); - } - } - } - } - - private static void createZNode(ZooKeeper zk, String path, String data) - throws KeeperException, InterruptedException { - try{ - zk.create(path, data.getBytes(), - ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT); - } catch (KeeperException.NodeExistsException e) { - } - } - - private int getLeaderId(QuorumUtil qu) { - int leaderId = 1; - while (qu.getPeer(leaderId).peer.leader == null) - leaderId++; - return leaderId; - } - - public static ZooKeeper[] createHandles(QuorumUtil qu) throws IOException { - // create an extra handle, so we can index the handles from 1 to qu.ALL - // using the server id. - ZooKeeper[] zkArr = new ZooKeeper[qu.ALL + 1]; - zkArr[0] = null; // not used. - for (int i = 1; i <= qu.ALL; i++) { - // server ids are 1, 2 and 3 - zkArr[i] = new ZooKeeper("127.0.0.1:" - + qu.getPeer(i).peer.getClientPort(), - ClientBase.CONNECTION_TIMEOUT, new Watcher() { - public void process(WatchedEvent event) { - }}); - } - return zkArr; - } - - public static ZooKeeperAdmin[] createAdminHandles(QuorumUtil qu) throws IOException { - // create an extra handle, so we can index the handles from 1 to qu.ALL - // using the server id. - ZooKeeperAdmin[] zkAdminArr = new ZooKeeperAdmin[qu.ALL + 1]; - zkAdminArr[0] = null; // not used. - for (int i = 1; i <= qu.ALL; i++) { - // server ids are 1, 2 and 3 - zkAdminArr[i] = new ZooKeeperAdmin("127.0.0.1:" - + qu.getPeer(i).peer.getClientPort(), - ClientBase.CONNECTION_TIMEOUT, new Watcher() { - public void process(WatchedEvent event) { - }}); - zkAdminArr[i].addAuthInfo("digest", "super:test".getBytes()); - } - - return zkAdminArr; - } - - public static void closeAllHandles(ZooKeeper[] zkArr, ZooKeeperAdmin[] zkAdminArr) throws InterruptedException { - for (ZooKeeper zk : zkArr) - if (zk != null) - zk.close(); - for (ZooKeeperAdmin zkAdmin : zkAdminArr) - if (zkAdmin != null) - zkAdmin.close(); - } - - @Test - public void testRemoveAddOne() throws Exception { - qu = new QuorumUtil(1); // create 3 servers - qu.disableJMXTest = true; - qu.startAll(); - ZooKeeper[] zkArr = createHandles(qu); - ZooKeeperAdmin[] zkAdminArr = createAdminHandles(qu); - - List<String> leavingServers = new ArrayList<String>(); - List<String> joiningServers = new ArrayList<String>(); - - int leaderIndex = getLeaderId(qu); - - // during first iteration, leavingIndex will correspond to a follower - // during second iteration leavingIndex will be the index of the leader - int leavingIndex = (leaderIndex == 1) ? 2 : 1; - - for (int i = 0; i < 2; i++) { - // some of the operations will be executed by a client connected to - // the removed server - // while others are invoked by a client connected to some other - // server. - // when we're removing the leader, zk1 will be the client connected - // to removed server - ZooKeeper zk1 = (leavingIndex == leaderIndex) ? zkArr[leaderIndex] - : zkArr[(leaderIndex % qu.ALL) + 1]; - ZooKeeper zk2 = (leavingIndex == leaderIndex) ? zkArr[(leaderIndex % qu.ALL) + 1] - : zkArr[leaderIndex]; - ZooKeeperAdmin zkAdmin1 = (leavingIndex == leaderIndex) ? zkAdminArr[leaderIndex] - : zkAdminArr[(leaderIndex % qu.ALL) + 1]; - ZooKeeperAdmin zkAdmin2 = (leavingIndex == leaderIndex) ? zkAdminArr[(leaderIndex % qu.ALL) + 1] - : zkAdminArr[leaderIndex]; - - leavingServers.add(Integer.toString(leavingIndex)); - - // remember this server so we can add it back later - joiningServers.add("server." - + leavingIndex - + "=localhost:" - + qu.getPeer(leavingIndex).peer.getQuorumAddress() - .getPort() - + ":" - + qu.getPeer(leavingIndex).peer.getElectionAddress() - .getPort() + ":participant;localhost:" - + qu.getPeer(leavingIndex).peer.getClientPort()); - - String configStr = reconfig(zkAdmin1, null, leavingServers, null, -1); - testServerHasConfig(zk2, null, leavingServers); - testNormalOperation(zk2, zk1); - - QuorumVerifier qv = qu.getPeer(1).peer.configFromString(configStr); - long version = qv.getVersion(); - - // checks that conditioning on version works properly - try { - reconfig(zkAdmin2, joiningServers, null, null, version + 1); - Assert.fail("reconfig succeeded even though version condition was incorrect!"); - } catch (KeeperException.BadVersionException e) { - - } - - reconfig(zkAdmin2, joiningServers, null, null, version); - - testNormalOperation(zk1, zk2); - testServerHasConfig(zk1, joiningServers, null); - - // second iteration of the loop will remove the leader - // and add it back (as follower) - leavingIndex = leaderIndex = getLeaderId(qu); - leavingServers.clear(); - joiningServers.clear(); - } - - closeAllHandles(zkArr, zkAdminArr); - } - - /** - * 1. removes and adds back two servers (incl leader). One of the servers is added back as observer - * 2. tests that reconfig fails if quorum of new config is not up - * 3. tests that a server that's not up during reconfig learns the new config when it comes up - * @throws Exception - */ - @Test - public void testRemoveAddTwo() throws Exception { - qu = new QuorumUtil(2); // create 5 servers - qu.disableJMXTest = true; - qu.startAll(); - ZooKeeper[] zkArr = createHandles(qu); - ZooKeeperAdmin[] zkAdminArr = createAdminHandles(qu); - - List<String> leavingServers = new ArrayList<String>(); - List<String> joiningServers = new ArrayList<String>(); - - int leaderIndex = getLeaderId(qu); - - // lets remove the leader and some other server - int leavingIndex1 = leaderIndex; - int leavingIndex2 = (leaderIndex == 1) ? 2 : 1; - - // find some server that's staying - int stayingIndex1 = 1, stayingIndex2 = 1, stayingIndex3 = 1; - while (stayingIndex1 == leavingIndex1 || stayingIndex1 == leavingIndex2) - stayingIndex1++; - - while (stayingIndex2 == leavingIndex1 || stayingIndex2 == leavingIndex2 - || stayingIndex2 == stayingIndex1) - stayingIndex2++; - - while (stayingIndex3 == leavingIndex1 || stayingIndex3 == leavingIndex2 - || stayingIndex3 == stayingIndex1 - || stayingIndex3 == stayingIndex2) - stayingIndex3++; - - leavingServers.add(Integer.toString(leavingIndex1)); - leavingServers.add(Integer.toString(leavingIndex2)); - - // remember these servers so we can add them back later - joiningServers.add("server." + leavingIndex1 + "=localhost:" - + qu.getPeer(leavingIndex1).peer.getQuorumAddress().getPort() - + ":" - + qu.getPeer(leavingIndex1).peer.getElectionAddress().getPort() - + ":participant;localhost:" - + qu.getPeer(leavingIndex1).peer.getClientPort()); - - // this server will be added back as an observer - joiningServers.add("server." + leavingIndex2 + "=localhost:" - + qu.getPeer(leavingIndex2).peer.getQuorumAddress().getPort() - + ":" - + qu.getPeer(leavingIndex2).peer.getElectionAddress().getPort() - + ":observer;localhost:" - + qu.getPeer(leavingIndex2).peer.getClientPort()); - - qu.shutdown(leavingIndex1); - qu.shutdown(leavingIndex2); - - // 3 servers still up so this should work - reconfig(zkAdminArr[stayingIndex2], null, leavingServers, null, -1); - - qu.shutdown(stayingIndex2); - - // the following commands would not work in the original - // cluster of 5, but now that we've removed 2 servers - // we have a cluster of 3 servers and one of them is allowed to fail - - testServerHasConfig(zkArr[stayingIndex1], null, leavingServers); - testServerHasConfig(zkArr[stayingIndex3], null, leavingServers); - testNormalOperation(zkArr[stayingIndex1], zkArr[stayingIndex3]); - - // this is a test that a reconfig will only succeed - // if there is a quorum up in new config. Below there is no - // quorum so it should fail - - // the sleep is necessary so that the leader figures out - // that the switched off servers are down - Thread.sleep(10000); - - try { - reconfig(zkAdminArr[stayingIndex1], joiningServers, null, null, -1); - Assert.fail("reconfig completed successfully even though there is no quorum up in new config!"); - } catch (KeeperException.NewConfigNoQuorum e) { - - } - - // now start the third server so that new config has quorum - qu.restart(stayingIndex2); - - reconfig(zkAdminArr[stayingIndex1], joiningServers, null, null, -1); - testNormalOperation(zkArr[stayingIndex2], zkArr[stayingIndex3]); - testServerHasConfig(zkArr[stayingIndex2], joiningServers, null); - - // this server wasn't around during the configuration change - // we should check that it is able to connect, finds out - // about the change and becomes an observer. - - qu.restart(leavingIndex2); - Assert.assertTrue(qu.getPeer(leavingIndex2).peer.getPeerState() == ServerState.OBSERVING); - testNormalOperation(zkArr[stayingIndex2], zkArr[leavingIndex2]); - testServerHasConfig(zkArr[leavingIndex2], joiningServers, null); - - closeAllHandles(zkArr, zkAdminArr); - } - - @Test - public void testBulkReconfig() throws Exception { - qu = new QuorumUtil(3); // create 7 servers - qu.disableJMXTest = true; - qu.startAll(); - ZooKeeper[] zkArr = createHandles(qu); - ZooKeeperAdmin[] zkAdminArr = createAdminHandles(qu); - - // new config will have three of the servers as followers - // two of the servers as observers, and all ports different - ArrayList<String> newServers = new ArrayList<String>(); - for (int i = 1; i <= 5; i++) { - String server = "server." + i + "=localhost:" + PortAssignment.unique() - + ":" + PortAssignment.unique() + ":" - + ((i == 4 || i == 5) ? "observer" : "participant") - + ";localhost:" + qu.getPeer(i).peer.getClientPort(); - newServers.add(server); - } - - qu.shutdown(3); - qu.shutdown(6); - qu.shutdown(7); - - reconfig(zkAdminArr[1], null, null, newServers, -1); - testNormalOperation(zkArr[1], zkArr[2]); - - testServerHasConfig(zkArr[1], newServers, null); - testServerHasConfig(zkArr[2], newServers, null); - testServerHasConfig(zkArr[4], newServers, null); - testServerHasConfig(zkArr[5], newServers, null); - - qu.shutdown(5); - qu.shutdown(4); - - testNormalOperation(zkArr[1], zkArr[2]); - - closeAllHandles(zkArr, zkAdminArr); - } - - @Test - public void testRemoveOneAsynchronous() throws Exception { - qu = new QuorumUtil(2); - qu.disableJMXTest = true; - qu.startAll(); - ZooKeeper[] zkArr = createHandles(qu); - ZooKeeperAdmin[] zkAdminArr = createAdminHandles(qu); - - List<String> leavingServers = new ArrayList<String>(); - - // lets remove someone who's not the leader - leavingServers.add(getLeaderId(qu) == 5 ? "4": "5"); - - LinkedList<Integer> results = new LinkedList<Integer>(); - - zkAdminArr[1].reconfigure(null, leavingServers, null, -1, this, results); - - synchronized (results) { - while (results.size() < 1) { - results.wait(); - } - } - Assert.assertEquals(0, (int) results.get(0)); - - testNormalOperation(zkArr[1], zkArr[2]); - for (int i=1; i<=5; i++) - testServerHasConfig(zkArr[i], null, leavingServers); - - closeAllHandles(zkArr, zkAdminArr); - } - - @SuppressWarnings("unchecked") - public void processResult(int rc, String path, Object ctx, byte[] data, - Stat stat) { - synchronized(ctx) { - ((LinkedList<Integer>)ctx).add(rc); - ctx.notifyAll(); - } - } - - - @Test - public void testRoleChange() throws Exception { - qu = new QuorumUtil(1); // create 3 servers - qu.disableJMXTest = true; - qu.startAll(); - ZooKeeper[] zkArr = createHandles(qu); - ZooKeeperAdmin[] zkAdminArr = createAdminHandles(qu); - - // changing a server's role / port is done by "adding" it with the same - // id but different role / port - List<String> joiningServers = new ArrayList<String>(); - - int leaderIndex = getLeaderId(qu); - - // during first and second iteration, leavingIndex will correspond to a - // follower - // during third and fouth iteration leavingIndex will be the index of - // the leader - int changingIndex = (leaderIndex == 1) ? 2 : 1; - - // first convert participant to observer, then observer to participant, - // and so on - String newRole = "observer"; - - for (int i = 0; i < 4; i++) { - // some of the operations will be executed by a client connected to - // the removed server - // while others are invoked by a client connected to some other - // server. - // when we're removing the leader, zk1 will be the client connected - // to removed server - ZooKeeper zk1 = (changingIndex == leaderIndex) ? zkArr[leaderIndex] - : zkArr[(leaderIndex % qu.ALL) + 1]; - ZooKeeperAdmin zkAdmin1 = (changingIndex == leaderIndex) ? zkAdminArr[leaderIndex] - : zkAdminArr[(leaderIndex % qu.ALL) + 1]; - - // exactly as it is now, except for role change - joiningServers.add("server." - + changingIndex - + "=localhost:" - + qu.getPeer(changingIndex).peer.getQuorumAddress() - .getPort() - + ":" - + qu.getPeer(changingIndex).peer.getElectionAddress() - .getPort() + ":" + newRole + ";localhost:" - + qu.getPeer(changingIndex).peer.getClientPort()); - - reconfig(zkAdmin1, joiningServers, null, null, -1); - testNormalOperation(zkArr[changingIndex], zk1); - - if (newRole.equals("observer")) { - Assert.assertTrue(qu.getPeer(changingIndex).peer.observer != null - && qu.getPeer(changingIndex).peer.follower == null - && qu.getPeer(changingIndex).peer.leader == null); - Assert.assertTrue(qu.getPeer(changingIndex).peer.getPeerState() == ServerState.OBSERVING); - } else { - Assert.assertTrue(qu.getPeer(changingIndex).peer.observer == null - && (qu.getPeer(changingIndex).peer.follower != null || qu - .getPeer(changingIndex).peer.leader != null)); - Assert.assertTrue(qu.getPeer(changingIndex).peer.getPeerState() == ServerState.FOLLOWING - || qu.getPeer(changingIndex).peer.getPeerState() == ServerState.LEADING); - } - - joiningServers.clear(); - - if (newRole.equals("observer")) { - newRole = "participant"; - } else { - // lets change leader to observer - newRole = "observer"; - leaderIndex = getLeaderId(qu); - changingIndex = leaderIndex; - } - } - closeAllHandles(zkArr, zkAdminArr); - } - - @Test - public void testPortChange() throws Exception { - qu = new QuorumUtil(1); // create 3 servers - qu.disableJMXTest = true; - qu.startAll(); - ZooKeeper[] zkArr = createHandles(qu); - ZooKeeperAdmin[] zkAdminArr = createAdminHandles(qu); - - List<String> joiningServers = new ArrayList<String>(); - - int leaderIndex = getLeaderId(qu); - int followerIndex = leaderIndex == 1 ? 2 : 1; - - // modify follower's client port - - int quorumPort = qu.getPeer(followerIndex).peer.getQuorumAddress().getPort(); - int electionPort = qu.getPeer(followerIndex).peer.getElectionAddress().getPort(); - int oldClientPort = qu.getPeer(followerIndex).peer.getClientPort(); - int newClientPort = PortAssignment.unique(); - joiningServers.add("server." + followerIndex + "=localhost:" + quorumPort - + ":" + electionPort + ":participant;localhost:" + newClientPort); - - // create a /test znode and check that read/write works before - // any reconfig is invoked - testNormalOperation(zkArr[followerIndex], zkArr[leaderIndex]); - - reconfig(zkAdminArr[followerIndex], joiningServers, null, null, -1); - - try { - for (int i=0; i < 20; i++) { - Thread.sleep(1000); - zkArr[followerIndex].setData("/test", "teststr".getBytes(), -1); - } - } catch (KeeperException.ConnectionLossException e) { - Assert.fail("Existing client disconnected when client port changed!"); - } - - zkArr[followerIndex].close(); - zkArr[followerIndex] = new ZooKeeper("127.0.0.1:" - + oldClientPort, - ClientBase.CONNECTION_TIMEOUT, new Watcher() { - public void process(WatchedEvent event) {}}); - - zkAdminArr[followerIndex].close(); - zkAdminArr[followerIndex] = new ZooKeeperAdmin("127.0.0.1:" - + oldClientPort, - ClientBase.CONNECTION_TIMEOUT, new Watcher() { - public void process(WatchedEvent event) {}}); - zkAdminArr[followerIndex].addAuthInfo("digest", "super:test".getBytes()); - - for (int i = 0; i < 10; i++) { - try { - Thread.sleep(1000); - zkArr[followerIndex].setData("/test", "teststr".getBytes(), -1); - Assert.fail("New client connected to old client port!"); - } catch (KeeperException.ConnectionLossException e) { - } - } - - zkArr[followerIndex].close(); - zkArr[followerIndex] = new ZooKeeper("127.0.0.1:" - + newClientPort, - ClientBase.CONNECTION_TIMEOUT, new Watcher() { - public void process(WatchedEvent event) {}}); - - zkAdminArr[followerIndex].close(); - zkAdminArr[followerIndex] = new ZooKeeperAdmin("127.0.0.1:" - + newClientPort, - ClientBase.CONNECTION_TIMEOUT, new Watcher() { - public void process(WatchedEvent event) {}}); - zkAdminArr[followerIndex].addAuthInfo("digest", "super:test".getBytes()); - - testNormalOperation(zkArr[followerIndex], zkArr[leaderIndex]); - testServerHasConfig(zkArr[followerIndex], joiningServers, null); - Assert.assertEquals(newClientPort, qu.getPeer(followerIndex).peer.getClientPort()); - - joiningServers.clear(); - - // change leader's leading port - should renounce leadership - - int newQuorumPort = PortAssignment.unique(); - joiningServers.add("server." + leaderIndex + "=localhost:" - + newQuorumPort - + ":" - + qu.getPeer(leaderIndex).peer.getElectionAddress().getPort() - + ":participant;localhost:" - + qu.getPeer(leaderIndex).peer.getClientPort()); - - reconfig(zkAdminArr[leaderIndex], joiningServers, null, null, -1); - - testNormalOperation(zkArr[followerIndex], zkArr[leaderIndex]); - - Assert.assertTrue(qu.getPeer(leaderIndex).peer.getQuorumAddress() - .getPort() == newQuorumPort); - - joiningServers.clear(); - - // change everyone's leader election port - - for (int i = 1; i <= 3; i++) { - joiningServers.add("server." + i + "=localhost:" - + qu.getPeer(i).peer.getQuorumAddress().getPort() + ":" - + PortAssignment.unique() + ":participant;localhost:" - + qu.getPeer(i).peer.getClientPort()); - } - - reconfig(zkAdminArr[1], joiningServers, null, null, -1); - - leaderIndex = getLeaderId(qu); - int follower1 = leaderIndex == 1 ? 2 : 1; - int follower2 = 1; - while (follower2 == leaderIndex || follower2 == follower1) - follower2++; - - // lets kill the leader and see if a new one is elected - - qu.shutdown(getLeaderId(qu)); - - testNormalOperation(zkArr[follower2], zkArr[follower1]); - testServerHasConfig(zkArr[follower1], joiningServers, null); - testServerHasConfig(zkArr[follower2], joiningServers, null); - - closeAllHandles(zkArr, zkAdminArr); - } - - @Test - public void testPortChangeToBlockedPortFollower() throws Exception { - testPortChangeToBlockedPort(false); - } - @Test - public void testPortChangeToBlockedPortLeader() throws Exception { - testPortChangeToBlockedPort(true); - } - - private void testPortChangeToBlockedPort(boolean testLeader) throws Exception { - qu = new QuorumUtil(1); // create 3 servers - qu.disableJMXTest = true; - qu.startAll(); - ZooKeeper[] zkArr = createHandles(qu); - ZooKeeperAdmin[] zkAdminArr = createAdminHandles(qu); - - List<String> joiningServers = new ArrayList<String>(); - - int leaderIndex = getLeaderId(qu); - int followerIndex = leaderIndex == 1 ? 2 : 1; - int serverIndex = testLeader ? leaderIndex : followerIndex; - int reconfigIndex = testLeader ? followerIndex : leaderIndex; - - // modify server's client port - int quorumPort = qu.getPeer(serverIndex).peer.getQuorumAddress().getPort(); - int electionPort = qu.getPeer(serverIndex).peer.getElectionAddress().getPort(); - int oldClientPort = qu.getPeer(serverIndex).peer.getClientPort(); - int newClientPort = PortAssignment.unique(); - - try(ServerSocket ss = new ServerSocket()) { - ss.bind(new InetSocketAddress(getLoopbackAddress(), newClientPort)); - - joiningServers.add("server." + serverIndex + "=localhost:" + quorumPort - + ":" + electionPort + ":participant;localhost:" + newClientPort); - - // create a /test znode and check that read/write works before - // any reconfig is invoked - testNormalOperation(zkArr[followerIndex], zkArr[leaderIndex]); - - // Reconfigure - reconfig(zkAdminArr[reconfigIndex], joiningServers, null, null, -1); - Thread.sleep(1000); - - // The follower reconfiguration will have failed - zkArr[serverIndex].close(); - zkArr[serverIndex] = new ZooKeeper("127.0.0.1:" - + newClientPort, - ClientBase.CONNECTION_TIMEOUT, new Watcher() { - public void process(WatchedEvent event) {}}); - - zkAdminArr[serverIndex].close(); - zkAdminArr[serverIndex] = new ZooKeeperAdmin("127.0.0.1:" - + newClientPort, - ClientBase.CONNECTION_TIMEOUT, new Watcher() { - public void process(WatchedEvent event) {}}); - - try { - Thread.sleep(1000); - zkArr[serverIndex].setData("/test", "teststr".getBytes(), -1); - Assert.fail("New client connected to new client port!"); - } catch (KeeperException.ConnectionLossException e) { - // Exception is expected - } - - //The old port should be clear at this stage - - try (ServerSocket ss2 = new ServerSocket()) { - ss2.bind(new InetSocketAddress(getLoopbackAddress(), oldClientPort)); - } - - // Move back to the old port - joiningServers.clear(); - joiningServers.add("server." + serverIndex + "=localhost:" + quorumPort - + ":" + electionPort + ":participant;localhost:" + oldClientPort); - - reconfig(zkAdminArr[reconfigIndex], joiningServers, null, null, -1); - - zkArr[serverIndex].close(); - zkArr[serverIndex] = new ZooKeeper("127.0.0.1:" - + oldClientPort, - ClientBase.CONNECTION_TIMEOUT, new Watcher() { - public void process(WatchedEvent event) {}}); - - testNormalOperation(zkArr[followerIndex], zkArr[leaderIndex]); - testServerHasConfig(zkArr[serverIndex], joiningServers, null); - Assert.assertEquals(oldClientPort, qu.getPeer(serverIndex).peer.getClientPort()); - } - closeAllHandles(zkArr, zkAdminArr); - } - - @Test - public void testUnspecifiedClientAddress() throws Exception { - int[] ports = { - PortAssignment.unique(), - PortAssignment.unique(), - PortAssignment.unique() - }; - - String server = "server.0=localhost:" + ports[0] + ":" + ports[1] + ";" + ports[2]; - QuorumServer qs = new QuorumServer(0, server); - Assert.assertEquals(qs.clientAddr.getHostString(), "0.0.0.0"); - Assert.assertEquals(qs.clientAddr.getPort(), ports[2]); - } - - @Test - public void testQuorumSystemChange() throws Exception { - qu = new QuorumUtil(3); // create 7 servers - qu.disableJMXTest = true; - qu.startAll(); - ZooKeeper[] zkArr = createHandles(qu); - ZooKeeperAdmin[] zkAdminArr = createAdminHandles(qu); - - ArrayList<String> members = new ArrayList<String>(); - members.add("group.1=3:4:5"); - members.add("group.2=1:2"); - members.add("weight.1=0"); - members.add("weight.2=0"); - members.add("weight.3=1"); - members.add("weight.4=1"); - members.add("weight.5=1"); - - for (int i = 1; i <= 5; i++) { - members.add("server." + i + "=127.0.0.1:" - + qu.getPeer(i).peer.getQuorumAddress().getPort() + ":" - + qu.getPeer(i).peer.getElectionAddress().getPort() + ";" - + "127.0.0.1:" + qu.getPeer(i).peer.getClientPort()); - } - - reconfig(zkAdminArr[1], null, null, members, -1); - - // this should flush the config to servers 2, 3, 4 and 5 - testNormalOperation(zkArr[2], zkArr[3]); - testNormalOperation(zkArr[4], zkArr[5]); - - for (int i = 1; i <= 5; i++) { - if (!(qu.getPeer(i).peer.quorumVerifier instanceof QuorumHierarchical)) - Assert.fail("peer " + i - + " doesn't think the quorum system is Hieararchical!"); - } - - qu.shutdown(1); - qu.shutdown(2); - qu.shutdown(3); - qu.shutdown(7); - qu.shutdown(6); - - // servers 4 and 5 should be able to work independently - testNormalOperation(zkArr[4], zkArr[5]); - - qu.restart(1); - qu.restart(2); - - members.clear(); - for (int i = 1; i <= 3; i++) { - members.add("server." + i + "=127.0.0.1:" - + qu.getPeer(i).peer.getQuorumAddress().getPort() + ":" - + qu.getPeer(i).peer.getElectionAddress().getPort() + ";" - + "127.0.0.1:" + qu.getPeer(i).peer.getClientPort()); - } - - reconfig(zkAdminArr[1], null, null, members, -1); - - // flush the config to server 2 - testNormalOperation(zkArr[1], zkArr[2]); - - qu.shutdown(4); - qu.shutdown(5); - - // servers 1 and 2 should be able to work independently - testNormalOperation(zkArr[1], zkArr[2]); - - for (int i = 1; i <= 2; i++) { - if (!(qu.getPeer(i).peer.quorumVerifier instanceof QuorumMaj)) - Assert.fail("peer " - + i - + " doesn't think the quorum system is a majority quorum system!"); - } - - closeAllHandles(zkArr, zkAdminArr); - } - - @Test - public void testInitialConfigHasPositiveVersion() throws Exception { - qu = new QuorumUtil(1); // create 3 servers - qu.disableJMXTest = true; - qu.startAll(); - ZooKeeper[] zkArr = createHandles(qu); - testNormalOperation(zkArr[1], zkArr[2]); - for (int i=1; i<4; i++) { - String configStr = testServerHasConfig(zkArr[i], null, null); - QuorumVerifier qv = qu.getPeer(i).peer.configFromString(configStr); - long version = qv.getVersion(); - Assert.assertTrue(version == 0x100000000L); - } - } - - /** - * Tests verifies the jmx attributes of local and remote peer bean - remove - * one quorum peer and again adding it back - */ - @Test - public void testJMXBeanAfterRemoveAddOne() throws Exception { - qu = new QuorumUtil(1); // create 3 servers - qu.disableJMXTest = true; - qu.startAll(); - ZooKeeper[] zkArr = createHandles(qu); - ZooKeeperAdmin[] zkAdminArr = createAdminHandles(qu); - - List<String> leavingServers = new ArrayList<String>(); - List<String> joiningServers = new ArrayList<String>(); - - // assert remotePeerBean.1 of ReplicatedServer_2 - int leavingIndex = 1; - int replica2 = 2; - QuorumPeer peer2 = qu.getPeer(replica2).peer; - QuorumServer leavingQS2 = peer2.getView().get(new Long(leavingIndex)); - String remotePeerBean2 = CommonNames.DOMAIN - + ":name0=ReplicatedServer_id" + replica2 + ",name1=replica." - + leavingIndex; - assertRemotePeerMXBeanAttributes(leavingQS2, remotePeerBean2); - - // assert remotePeerBean.1 of ReplicatedServer_3 - int replica3 = 3; - QuorumPeer peer3 = qu.getPeer(replica3).peer; - QuorumServer leavingQS3 = peer3.getView().get(new Long(leavingIndex)); - String remotePeerBean3 = CommonNames.DOMAIN - + ":name0=ReplicatedServer_id" + replica3 + ",name1=replica." - + leavingIndex; - assertRemotePeerMXBeanAttributes(leavingQS3, remotePeerBean3); - - ZooKeeper zk = zkArr[leavingIndex]; - ZooKeeperAdmin zkAdmin = zkAdminArr[leavingIndex]; - - leavingServers.add(Integer.toString(leavingIndex)); - - // remember this server so we can add it back later - joiningServers.add("server." + leavingIndex + "=127.0.0.1:" - + qu.getPeer(leavingIndex).peer.getQuorumAddress().getPort() - + ":" - + qu.getPeer(leavingIndex).peer.getElectionAddress().getPort() - + ":participant;127.0.0.1:" - + qu.getPeer(leavingIndex).peer.getClientPort()); - - // Remove ReplicatedServer_1 from the ensemble - reconfig(zkAdmin, null, leavingServers, null, -1); - - // localPeerBean.1 of ReplicatedServer_1 - QuorumPeer removedPeer = qu.getPeer(leavingIndex).peer; - String localPeerBean = CommonNames.DOMAIN - + ":name0=ReplicatedServer_id" + leavingIndex - + ",name1=replica." + leavingIndex; - assertLocalPeerMXBeanAttributes(removedPeer, localPeerBean, false); - - // remotePeerBean.1 shouldn't exists in ReplicatedServer_2 - JMXEnv.ensureNone(remotePeerBean2); - // remotePeerBean.1 shouldn't exists in ReplicatedServer_3 - JMXEnv.ensureNone(remotePeerBean3); - - // Add ReplicatedServer_1 back to the ensemble - reconfig(zkAdmin, joiningServers, null, null, -1); - - // localPeerBean.1 of ReplicatedServer_1 - assertLocalPeerMXBeanAttributes(removedPeer, localPeerBean, true); - - // assert remotePeerBean.1 of ReplicatedServer_2 - leavingQS2 = peer2.getView().get(new Long(leavingIndex)); - assertRemotePeerMXBeanAttributes(leavingQS2, remotePeerBean2); - - // assert remotePeerBean.1 of ReplicatedServer_3 - leavingQS3 = peer3.getView().get(new Long(leavingIndex)); - assertRemotePeerMXBeanAttributes(leavingQS3, remotePeerBean3); - - closeAllHandles(zkArr, zkAdminArr); - } - - /** - * Tests verifies the jmx attributes of local and remote peer bean - change - * participant to observer role - */ - @Test - public void testJMXBeanAfterRoleChange() throws Exception { - qu = new QuorumUtil(1); // create 3 servers - qu.disableJMXTest = true; - qu.startAll(); - ZooKeeper[] zkArr = createHandles(qu); - ZooKeeperAdmin[] zkAdminArr = createAdminHandles(qu); - - // changing a server's role / port is done by "adding" it with the same - // id but different role / port - List<String> joiningServers = new ArrayList<String>(); - - // assert remotePeerBean.1 of ReplicatedServer_2 - int changingIndex = 1; - int replica2 = 2; - QuorumPeer peer2 = qu.getPeer(replica2).peer; - QuorumServer changingQS2 = peer2.getView().get(new Long(changingIndex)); - String remotePeerBean2 = CommonNames.DOMAIN - + ":name0=ReplicatedServer_id" + replica2 + ",name1=replica." - + changingIndex; - assertRemotePeerMXBeanAttributes(changingQS2, remotePeerBean2); - - // assert remotePeerBean.1 of ReplicatedServer_3 - int replica3 = 3; - QuorumPeer peer3 = qu.getPeer(replica3).peer; - QuorumServer changingQS3 = peer3.getView().get(new Long(changingIndex)); - String remotePeerBean3 = CommonNames.DOMAIN - + ":name0=ReplicatedServer_id" + replica3 + ",name1=replica." - + changingIndex; - assertRemotePeerMXBeanAttributes(changingQS3, remotePeerBean3); - - String newRole = "observer"; - - ZooKeeper zk = zkArr[changingIndex]; - ZooKeeperAdmin zkAdmin = zkAdminArr[changingIndex]; - - // exactly as it is now, except for role change - joiningServers.add("server." + changingIndex + "=127.0.0.1:" - + qu.getPeer(changingIndex).peer.getQuorumAddress().getPort() - + ":" - + qu.getPeer(changingIndex).peer.getElectionAddress().getPort() - + ":" + newRole + ";127.0.0.1:" - + qu.getPeer(changingIndex).peer.getClientPort()); - - reconfig(zkAdmin, joiningServers, null, null, -1); - testNormalOperation(zkArr[changingIndex], zk); - - Assert.assertTrue(qu.getPeer(changingIndex).peer.observer != null - && qu.getPeer(changingIndex).peer.follower == null - && qu.getPeer(changingIndex).peer.leader == null); - Assert.assertTrue(qu.getPeer(changingIndex).peer.getPeerState() == ServerState.OBSERVING); - - QuorumPeer qp = qu.getPeer(changingIndex).peer; - String localPeerBeanName = CommonNames.DOMAIN - + ":name0=ReplicatedServer_id" + changingIndex - + ",name1=replica." + changingIndex; - - // localPeerBean.1 of ReplicatedServer_1 - assertLocalPeerMXBeanAttributes(qp, localPeerBeanName, true); - - // assert remotePeerBean.1 of ReplicatedServer_2 - changingQS2 = peer2.getView().get(new Long(changingIndex)); - assertRemotePeerMXBeanAttributes(changingQS2, remotePeerBean2); - - // assert remotePeerBean.1 of ReplicatedServer_3 - changingQS3 = peer3.getView().get(new Long(changingIndex)); - assertRemotePeerMXBeanAttributes(changingQS3, remotePeerBean3); - - closeAllHandles(zkArr, zkAdminArr); - } - - private void assertLocalPeerMXBeanAttributes(QuorumPeer qp, - String beanName, Boolean isPartOfEnsemble) throws Exception { - Assert.assertEquals("Mismatches LearnerType!", qp.getLearnerType() - .name(), JMXEnv.ensureBeanAttribute(beanName, "LearnerType")); - Assert.assertEquals("Mismatches ClientAddress!", - qp.getClientAddress().getHostString() + ":" + qp.getClientAddress().getPort(), - JMXEnv.ensureBeanAttribute(beanName, "ClientAddress")); - Assert.assertEquals("Mismatches LearnerType!", - qp.getElectionAddress().getHostString() + ":" + qp.getElectionAddress().getPort(), - JMXEnv.ensureBeanAttribute(beanName, "ElectionAddress")); - Assert.assertEquals("Mismatches PartOfEnsemble!", isPartOfEnsemble, - JMXEnv.ensureBeanAttribute(beanName, "PartOfEnsemble")); - Assert.assertEquals("Mismatches ConfigVersion!", qp.getQuorumVerifier() - .getVersion(), JMXEnv.ensureBeanAttribute(beanName, - "ConfigVersion")); - Assert.assertEquals("Mismatches QuorumSystemInfo!", qp - .getQuorumVerifier().toString(), JMXEnv.ensureBeanAttribute( - beanName, "QuorumSystemInfo")); - } - - String getAddrPortFromBean(String beanName, String attribute) throws Exception { - String name = (String) JMXEnv.ensureBeanAttribute( - beanName, attribute); - - if ( ! name.contains(":") ) { - return name; - } - - return getNumericalAddrPort(name); - } - - String getNumericalAddrPort(String name) throws UnknownHostException { - String port = name.split(":")[1]; - String addr = name.split(":")[0]; - addr = InetAddress.getByName(addr).getHostAddress(); - return addr + ":" + port; - } - - private void assertRemotePeerMXBeanAttributes(QuorumServer qs, - String beanName) throws Exception { - Assert.assertEquals("Mismatches LearnerType!", qs.type.name(), - JMXEnv.ensureBeanAttribute(beanName, "LearnerType")); - Assert.assertEquals("Mismatches ClientAddress!", - getNumericalAddrPort(qs.clientAddr.getHostString() + ":" + qs.clientAddr.getPort()), - getAddrPortFromBean(beanName, "ClientAddress") ); - Assert.assertEquals("Mismatches ElectionAddress!", - getNumericalAddrPort(qs.electionAddr.getHostString() + ":" + qs.electionAddr.getPort()), - getAddrPortFromBean(beanName, "ElectionAddress") ); - Assert.assertEquals("Mismatches QuorumAddress!", - getNumericalAddrPort(qs.addr.getHostString() + ":" + qs.addr.getPort()), - getAddrPortFromBean(beanName, "QuorumAddress") ); - } -} http://git-wip-us.apache.org/repos/asf/zookeeper/blob/43d71c2e/zookeeper-common/src/test/java/org/apache/zookeeper/test/RecoveryTest.java ---------------------------------------------------------------------- diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/RecoveryTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/RecoveryTest.java deleted file mode 100644 index c084a68..0000000 --- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/RecoveryTest.java +++ /dev/null @@ -1,209 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.zookeeper.test; - -import static org.apache.zookeeper.test.ClientBase.CONNECTION_TIMEOUT; - -import java.io.File; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.zookeeper.CreateMode; -import org.apache.zookeeper.PortAssignment; -import org.apache.zookeeper.WatchedEvent; -import org.apache.zookeeper.Watcher; -import org.apache.zookeeper.ZKTestCase; -import org.apache.zookeeper.ZooKeeper; -import org.apache.zookeeper.Watcher.Event.KeeperState; -import org.apache.zookeeper.ZooDefs.Ids; -import org.apache.zookeeper.data.Stat; -import org.apache.zookeeper.server.ServerCnxnFactory; -import org.apache.zookeeper.server.SyncRequestProcessor; -import org.apache.zookeeper.server.ZooKeeperServer; -import org.junit.Assert; -import org.junit.Test; - -public class RecoveryTest extends ZKTestCase implements Watcher { - protected static final Logger LOG = LoggerFactory.getLogger(RecoveryTest.class); - - private static final String HOSTPORT = - "127.0.0.1:" + PortAssignment.unique(); - - private volatile CountDownLatch startSignal; - - /** - * Verify that if a server goes down that clients will reconnect - * automatically after the server is restarted. Note that this requires the - * server to restart within the connection timeout period. - * - * Also note that the client latches are used to eliminate any chance - * of spurrious connectionloss exceptions on the read ops. Specifically - * a sync operation will throw this exception if the server goes down - * (as recognized by the client) during the operation. If the operation - * occurs after the server is down, but before the client recognizes - * that the server is down (ping) then the op will throw connectionloss. - */ - @Test - public void testRecovery() throws Exception { - File tmpDir = ClientBase.createTmpDir(); - - ClientBase.setupTestEnv(); - ZooKeeperServer zks = new ZooKeeperServer(tmpDir, tmpDir, 3000); - - int oldSnapCount = SyncRequestProcessor.getSnapCount(); - SyncRequestProcessor.setSnapCount(1000); - try { - final int PORT = Integer.parseInt(HOSTPORT.split(":")[1]); - ServerCnxnFactory f = ServerCnxnFactory.createFactory(PORT, -1); - f.startup(zks); - LOG.info("starting up the the server, waiting"); - - Assert.assertTrue("waiting for server up", - ClientBase.waitForServerUp(HOSTPORT, - CONNECTION_TIMEOUT)); - - startSignal = new CountDownLatch(1); - ZooKeeper zk = new ZooKeeper(HOSTPORT, CONNECTION_TIMEOUT, this); - startSignal.await(CONNECTION_TIMEOUT, - TimeUnit.MILLISECONDS); - Assert.assertTrue("count == 0", startSignal.getCount() == 0); - String path; - LOG.info("starting creating nodes"); - for (int i = 0; i < 10; i++) { - path = "/" + i; - zk.create(path, - (path + "!").getBytes(), - Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT); - for (int j = 0; j < 10; j++) { - String subpath = path + "/" + j; - zk.create(subpath, (subpath + "!").getBytes(), - Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT); - for (int k = 0; k < 20; k++) { - String subsubpath = subpath + "/" + k; - zk.create(subsubpath, (subsubpath + "!").getBytes(), - Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT); - } - } - } - - f.shutdown(); - zks.shutdown(); - Assert.assertTrue("waiting for server down", - ClientBase.waitForServerDown(HOSTPORT, - CONNECTION_TIMEOUT)); - - zks = new ZooKeeperServer(tmpDir, tmpDir, 3000); - f = ServerCnxnFactory.createFactory(PORT, -1); - - startSignal = new CountDownLatch(1); - - f.startup(zks); - - Assert.assertTrue("waiting for server up", - ClientBase.waitForServerUp(HOSTPORT, - CONNECTION_TIMEOUT)); - - startSignal.await(CONNECTION_TIMEOUT, - TimeUnit.MILLISECONDS); - Assert.assertTrue("count == 0", startSignal.getCount() == 0); - - Stat stat = new Stat(); - for (int i = 0; i < 10; i++) { - path = "/" + i; - LOG.info("Checking " + path); - Assert.assertEquals(new String(zk.getData(path, false, stat)), path - + "!"); - for (int j = 0; j < 10; j++) { - String subpath = path + "/" + j; - Assert.assertEquals(new String(zk.getData(subpath, false, stat)), - subpath + "!"); - for (int k = 0; k < 20; k++) { - String subsubpath = subpath + "/" + k; - Assert.assertEquals(new String(zk.getData(subsubpath, false, - stat)), subsubpath + "!"); - } - } - } - f.shutdown(); - zks.shutdown(); - - Assert.assertTrue("waiting for server down", - ClientBase.waitForServerDown(HOSTPORT, - ClientBase.CONNECTION_TIMEOUT)); - - zks = new ZooKeeperServer(tmpDir, tmpDir, 3000); - f = ServerCnxnFactory.createFactory(PORT, -1); - - startSignal = new CountDownLatch(1); - - f.startup(zks); - - Assert.assertTrue("waiting for server up", - ClientBase.waitForServerUp(HOSTPORT, - CONNECTION_TIMEOUT)); - - startSignal.await(CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS); - Assert.assertTrue("count == 0", startSignal.getCount() == 0); - - stat = new Stat(); - LOG.info("Check 2"); - for (int i = 0; i < 10; i++) { - path = "/" + i; - Assert.assertEquals(new String(zk.getData(path, false, stat)), - path + "!"); - for (int j = 0; j < 10; j++) { - String subpath = path + "/" + j; - Assert.assertEquals(new String(zk.getData(subpath, false, stat)), - subpath + "!"); - for (int k = 0; k < 20; k++) { - String subsubpath = subpath + "/" + k; - Assert.assertEquals(new String(zk.getData(subsubpath, false, - stat)), subsubpath + "!"); - } - } - } - zk.close(); - - f.shutdown(); - zks.shutdown(); - - Assert.assertTrue("waiting for server down", - ClientBase.waitForServerDown(HOSTPORT, - CONNECTION_TIMEOUT)); - } finally { - SyncRequestProcessor.setSnapCount(oldSnapCount); - } - } - - /* - * (non-Javadoc) - * - * @see org.apache.zookeeper.Watcher#process(org.apache.zookeeper.WatcherEvent) - */ - public void process(WatchedEvent event) { - LOG.info("Event:" + event.getState() + " " + event.getType() + " " + event.getPath()); - if (event.getState() == KeeperState.SyncConnected - && startSignal != null && startSignal.getCount() > 0) - { - startSignal.countDown(); - } - } -} http://git-wip-us.apache.org/repos/asf/zookeeper/blob/43d71c2e/zookeeper-common/src/test/java/org/apache/zookeeper/test/RepeatStartupTest.java ---------------------------------------------------------------------- diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/RepeatStartupTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/RepeatStartupTest.java deleted file mode 100644 index 419cfe9..0000000 --- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/RepeatStartupTest.java +++ /dev/null @@ -1,69 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.zookeeper.test; - -import org.apache.zookeeper.CreateMode; -import org.apache.zookeeper.ZKTestCase; -import org.apache.zookeeper.ZooKeeper; -import org.apache.zookeeper.ZooDefs.Ids; -import org.apache.zookeeper.server.ServerCnxnFactory; -import org.apache.zookeeper.server.ZooKeeperServer; -import org.junit.Assert; -import org.junit.Test; - -public class RepeatStartupTest extends ZKTestCase { - - /** bring up 5 quorum peers and then shut them down - * and then bring one of the nodes as server - * - * @throws Exception might be thrown here - */ - @Test - public void testFail() throws Exception { - QuorumBase qb = new QuorumBase(); - qb.setUp(); - - System.out.println("Comment: the servers are at " + qb.hostPort); - ZooKeeper zk = qb.createClient(); - zk.create("/test", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT); - zk.close(); - QuorumBase.shutdown(qb.s1); - QuorumBase.shutdown(qb.s2); - QuorumBase.shutdown(qb.s3); - QuorumBase.shutdown(qb.s4); - QuorumBase.shutdown(qb.s5); - String hp = qb.hostPort.split(",")[0]; - ZooKeeperServer zks = new ZooKeeperServer(qb.s1.getTxnFactory().getSnapDir(), - qb.s1.getTxnFactory().getDataDir(), 3000); - final int PORT = Integer.parseInt(hp.split(":")[1]); - ServerCnxnFactory factory = ServerCnxnFactory.createFactory(PORT, -1); - - factory.startup(zks); - System.out.println("Comment: starting factory"); - Assert.assertTrue("waiting for server up", - ClientBase.waitForServerUp("127.0.0.1:" + PORT, - QuorumTest.CONNECTION_TIMEOUT)); - factory.shutdown(); - zks.shutdown(); - Assert.assertTrue("waiting for server down", - ClientBase.waitForServerDown("127.0.0.1:" + PORT, - QuorumTest.CONNECTION_TIMEOUT)); - System.out.println("Comment: shutting down standalone"); - } -} http://git-wip-us.apache.org/repos/asf/zookeeper/blob/43d71c2e/zookeeper-common/src/test/java/org/apache/zookeeper/test/RestoreCommittedLogTest.java ---------------------------------------------------------------------- diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/RestoreCommittedLogTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/RestoreCommittedLogTest.java deleted file mode 100644 index 1cd0337..0000000 --- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/RestoreCommittedLogTest.java +++ /dev/null @@ -1,83 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.zookeeper.test; - -import java.io.File; -import java.util.List; - -import org.apache.zookeeper.CreateMode; -import org.apache.zookeeper.PortAssignment; -import org.apache.zookeeper.ZKTestCase; -import org.apache.zookeeper.ZooKeeper; -import org.apache.zookeeper.ZooDefs.Ids; -import org.apache.zookeeper.server.quorum.Leader.Proposal; -import org.apache.zookeeper.server.ServerCnxnFactory; -import org.apache.zookeeper.server.SyncRequestProcessor; -import org.apache.zookeeper.server.ZooKeeperServer; -import org.junit.Assert; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** After a replica starts, it should load commits in its committedLog list. - * This test checks if committedLog != 0 after replica restarted. - */ -public class RestoreCommittedLogTest extends ZKTestCase{ - private static final Logger LOG = LoggerFactory.getLogger(RestoreCommittedLogTest.class); - private static final String HOSTPORT = "127.0.0.1:" + PortAssignment.unique(); - private static final int CONNECTION_TIMEOUT = 3000; - /** - * test the purge - * @throws Exception an exception might be thrown here - */ - @Test - public void testRestoreCommittedLog() throws Exception { - File tmpDir = ClientBase.createTmpDir(); - ClientBase.setupTestEnv(); - ZooKeeperServer zks = new ZooKeeperServer(tmpDir, tmpDir, 3000); - SyncRequestProcessor.setSnapCount(100); - final int PORT = Integer.parseInt(HOSTPORT.split(":")[1]); - ServerCnxnFactory f = ServerCnxnFactory.createFactory(PORT, -1); - f.startup(zks); - Assert.assertTrue("waiting for server being up ", - ClientBase.waitForServerUp(HOSTPORT,CONNECTION_TIMEOUT)); - ZooKeeper zk = ClientBase.createZKClient(HOSTPORT); - try { - for (int i = 0; i< 2000; i++) { - zk.create("/invalidsnap-" + i, new byte[0], Ids.OPEN_ACL_UNSAFE, - CreateMode.PERSISTENT); - } - } finally { - zk.close(); - } - f.shutdown(); - zks.shutdown(); - Assert.assertTrue("waiting for server to shutdown", - ClientBase.waitForServerDown(HOSTPORT, CONNECTION_TIMEOUT)); - - // start server again - zks = new ZooKeeperServer(tmpDir, tmpDir, 3000); - zks.startdata(); - List<Proposal> committedLog = zks.getZKDatabase().getCommittedLog(); - int logsize = committedLog.size(); - LOG.info("committedLog size = {}", logsize); - Assert.assertTrue("log size != 0", (logsize != 0)); - zks.shutdown(); - } -} http://git-wip-us.apache.org/repos/asf/zookeeper/blob/43d71c2e/zookeeper-common/src/test/java/org/apache/zookeeper/test/SSLAuthTest.java ---------------------------------------------------------------------- diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SSLAuthTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/SSLAuthTest.java deleted file mode 100644 index 8fd35bc..0000000 --- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SSLAuthTest.java +++ /dev/null @@ -1,105 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * <p/> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p/> - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.zookeeper.test; - -import java.net.InetSocketAddress; -import java.util.concurrent.TimeUnit; - -import org.apache.zookeeper.PortAssignment; -import org.apache.zookeeper.TestableZooKeeper; -import org.apache.zookeeper.client.ZKClientConfig; -import org.apache.zookeeper.common.ClientX509Util; -import org.apache.zookeeper.common.X509Util; -import org.apache.zookeeper.server.ServerCnxnFactory; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -public class SSLAuthTest extends ClientBase { - - private ClientX509Util clientX509Util = new ClientX509Util(); - - @Before - public void setUp() throws Exception { - String testDataPath = System.getProperty("test.data.dir", "build/test/data"); - System.setProperty(ServerCnxnFactory.ZOOKEEPER_SERVER_CNXN_FACTORY, "org.apache.zookeeper.server.NettyServerCnxnFactory"); - System.setProperty(ZKClientConfig.ZOOKEEPER_CLIENT_CNXN_SOCKET, "org.apache.zookeeper.ClientCnxnSocketNetty"); - System.setProperty(ZKClientConfig.SECURE_CLIENT, "true"); - System.setProperty(clientX509Util.getSslAuthProviderProperty(), "x509"); - System.setProperty(clientX509Util.getSslKeystoreLocationProperty(), testDataPath + "/ssl/testKeyStore.jks"); - System.setProperty(clientX509Util.getSslKeystorePasswdProperty(), "testpass"); - System.setProperty(clientX509Util.getSslTruststoreLocationProperty(), testDataPath + "/ssl/testTrustStore.jks"); - System.setProperty(clientX509Util.getSslTruststorePasswdProperty(), "testpass"); - System.setProperty("javax.net.debug", "ssl"); - System.setProperty("zookeeper.authProvider.x509", "org.apache.zookeeper.server.auth.X509AuthenticationProvider"); - - String host = "localhost"; - int port = PortAssignment.unique(); - hostPort = host + ":" + port; - - serverFactory = ServerCnxnFactory.createFactory(); - serverFactory.configure(new InetSocketAddress(host, port), maxCnxns, true); - - super.setUp(); - } - - @After - public void teardown() throws Exception { - System.clearProperty(ServerCnxnFactory.ZOOKEEPER_SERVER_CNXN_FACTORY); - System.clearProperty(ZKClientConfig.ZOOKEEPER_CLIENT_CNXN_SOCKET); - System.clearProperty(ZKClientConfig.SECURE_CLIENT); - System.clearProperty(clientX509Util.getSslAuthProviderProperty()); - System.clearProperty(clientX509Util.getSslKeystoreLocationProperty()); - System.clearProperty(clientX509Util.getSslKeystorePasswdProperty()); - System.clearProperty(clientX509Util.getSslTruststoreLocationProperty()); - System.clearProperty(clientX509Util.getSslTruststorePasswdProperty()); - System.clearProperty("javax.net.debug"); - System.clearProperty("zookeeper.authProvider.x509"); - } - - @Test - public void testRejection() throws Exception { - String testDataPath = System.getProperty("test.data.dir", "build/test/data"); - - // Replace trusted keys with a valid key that is not trusted by the server - System.setProperty(clientX509Util.getSslKeystoreLocationProperty(), testDataPath + "/ssl/testUntrustedKeyStore.jks"); - System.setProperty(clientX509Util.getSslKeystorePasswdProperty(), "testpass"); - - CountdownWatcher watcher = new CountdownWatcher(); - - // Handshake will take place, and then X509AuthenticationProvider should reject the untrusted cert - new TestableZooKeeper(hostPort, CONNECTION_TIMEOUT, watcher); - Assert.assertFalse("Untrusted certificate should not result in successful connection", - watcher.clientConnected.await(1000, TimeUnit.MILLISECONDS)); - } - - @Test - public void testMisconfiguration() throws Exception { - System.clearProperty(clientX509Util.getSslAuthProviderProperty()); - System.clearProperty(clientX509Util.getSslKeystoreLocationProperty()); - System.clearProperty(clientX509Util.getSslKeystorePasswdProperty()); - System.clearProperty(clientX509Util.getSslTruststoreLocationProperty()); - System.clearProperty(clientX509Util.getSslTruststorePasswdProperty()); - - CountdownWatcher watcher = new CountdownWatcher(); - new TestableZooKeeper(hostPort, CONNECTION_TIMEOUT, watcher); - Assert.assertFalse("Missing SSL configuration should not result in successful connection", - watcher.clientConnected.await(1000, TimeUnit.MILLISECONDS)); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zookeeper/blob/43d71c2e/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthDesignatedClientTest.java ---------------------------------------------------------------------- diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthDesignatedClientTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthDesignatedClientTest.java deleted file mode 100644 index c007022..0000000 --- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthDesignatedClientTest.java +++ /dev/null @@ -1,166 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.zookeeper.test; - -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import org.apache.zookeeper.CreateMode; -import org.apache.zookeeper.KeeperException; -import org.apache.zookeeper.ZooKeeper; -import org.apache.zookeeper.ZooDefs.Ids; -import org.apache.zookeeper.ZooDefs.Perms; -import org.apache.zookeeper.client.ZKClientConfig; -import org.apache.zookeeper.client.ZooKeeperSaslClient; -import org.apache.zookeeper.data.ACL; -import org.apache.zookeeper.data.Id; -import org.junit.Assert; -import org.junit.Test; - -public class SaslAuthDesignatedClientTest extends ClientBase { - static { - System.setProperty("zookeeper.authProvider.1","org.apache.zookeeper.server.auth.SASLAuthenticationProvider"); - System.setProperty(ZKClientConfig.LOGIN_CONTEXT_NAME_KEY, - "MyZookeeperClient"); - - try { - File tmpDir = createTmpDir(); - File saslConfFile = new File(tmpDir, "jaas.conf"); - FileWriter fwriter = new FileWriter(saslConfFile); - - fwriter.write("" + - "Server {\n" + - " org.apache.zookeeper.server.auth.DigestLoginModule required\n" + - " user_myuser=\"mypassword\";\n" + - "};\n" + - "Client {\n" + /* this 'Client' section has an incorrect password, but we're not configured - to use it (we're configured by the above System.setProperty(...LOGIN_CONTEXT_NAME_KEY...) to - use the 'MyZookeeperClient' section below, which has the correct password).*/ - " org.apache.zookeeper.server.auth.DigestLoginModule required\n" + - " username=\"myuser\"\n" + - " password=\"wrongpassword\";\n" + - "};" + - "MyZookeeperClient {\n" + - " org.apache.zookeeper.server.auth.DigestLoginModule required\n" + - " username=\"myuser\"\n" + - " password=\"mypassword\";\n" + - "};" + "\n"); - fwriter.close(); - System.setProperty("java.security.auth.login.config",saslConfFile.getAbsolutePath()); - } - catch (IOException e) { - // could not create tmp directory to hold JAAS conf file : test will fail now. - } - } - - @Test - public void testAuth() throws Exception { - ZooKeeper zk = createClient(); - try { - zk.create("/path1", null, Ids.CREATOR_ALL_ACL, CreateMode.PERSISTENT); - Thread.sleep(1000); - } catch (KeeperException e) { - Assert.fail("test failed :" + e); - } - finally { - zk.close(); - } - } - - @Test - public void testSaslConfig() throws Exception { - ZooKeeper zk = createClient(); - try { - zk.getChildren("/", false); - Assert.assertFalse(zk.getSaslClient(). - clientTunneledAuthenticationInProgress()); - Assert.assertEquals(zk.getSaslClient().getSaslState(), - ZooKeeperSaslClient.SaslState.COMPLETE); - Assert.assertNotNull( - javax.security.auth.login.Configuration.getConfiguration(). - getAppConfigurationEntry("MyZookeeperClient")); - Assert.assertSame(zk.getSaslClient().getLoginContext(), - "MyZookeeperClient"); - } catch (KeeperException e) { - Assert.fail("test failed :" + e); - } finally { - zk.close(); - } - } - - @Test - public void testReadAccessUser() throws Exception { - System.setProperty("zookeeper.letAnySaslUserDoX","anyone"); - ZooKeeper zk = createClient(); - List<ACL> aclList = new ArrayList<ACL>(); - ACL acl = new ACL(Perms.ADMIN | Perms.CREATE | Perms.WRITE | Perms.DELETE, new Id("sasl", "fakeuser")); - ACL acl1 = new ACL(Perms.READ, new Id("sasl", "anyone")); - aclList.add(acl); - aclList.add(acl1); - try { - zk.create("/abc", "testData".getBytes(), aclList, CreateMode.PERSISTENT); - } catch (KeeperException e) { - Assert.fail("Unable to create znode"); - } - zk.close(); - Thread.sleep(100); - - // try to access it with different user (myuser) - zk = createClient(); - - try { - zk.setData("/abc", "testData1".getBytes(), -1); - Assert.fail("Should not be able to set data"); - } catch (KeeperException.NoAuthException e) { - // success - } - - try { - byte [] bytedata = zk.getData("/abc", null, null); - String data = new String(bytedata); - Assert.assertTrue("testData".equals(data)); - } catch (KeeperException e) { - Assert.fail("failed to get data"); - } - - zk.close(); - Thread.sleep(100); - - // disable Client Sasl - System.setProperty(ZKClientConfig.ENABLE_CLIENT_SASL_KEY, "false"); - - try { - zk = createClient(); - try { - zk.getData("/abc", null, null); - Assert.fail("Should not be able to read data when not authenticated"); - } catch (KeeperException.NoAuthException e) { - // success - } - zk.close(); - } finally { - // enable Client Sasl - System.setProperty(ZKClientConfig.ENABLE_CLIENT_SASL_KEY, - "true"); - } - } -} http://git-wip-us.apache.org/repos/asf/zookeeper/blob/43d71c2e/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthDesignatedServerTest.java ---------------------------------------------------------------------- diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthDesignatedServerTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthDesignatedServerTest.java deleted file mode 100644 index aa30870..0000000 --- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthDesignatedServerTest.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.zookeeper.test; - -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - -import org.apache.zookeeper.CreateMode; -import org.apache.zookeeper.KeeperException; -import org.apache.zookeeper.WatchedEvent; -import org.apache.zookeeper.ZooKeeper; -import org.apache.zookeeper.Watcher.Event.KeeperState; -import org.apache.zookeeper.ZooDefs.Ids; -import org.apache.zookeeper.server.ZooKeeperSaslServer; -import org.apache.zookeeper.JaasConfiguration; -import org.junit.Assert; -import org.junit.Test; - -public class SaslAuthDesignatedServerTest extends ClientBase { - public static int AUTHENTICATION_TIMEOUT = 30000; - - static { - System.setProperty("zookeeper.authProvider.1","org.apache.zookeeper.server.auth.SASLAuthenticationProvider"); - System.setProperty(ZooKeeperSaslServer.LOGIN_CONTEXT_NAME_KEY, "MyZookeeperServer"); - - JaasConfiguration conf = new JaasConfiguration(); - - /* this 'Server' section has an incorrect password, but we're not configured - * to use it (we're configured by the above System.setProperty(...LOGIN_CONTEXT_NAME_KEY...) - * to use the 'MyZookeeperServer' section below, which has the correct password). - */ - conf.addSection("Server", "org.apache.zookeeper.server.auth.DigestLoginModule", - "user_myuser", "wrongpassword"); - - conf.addSection("MyZookeeperServer", "org.apache.zookeeper.server.auth.DigestLoginModule", - "user_myuser", "mypassword"); - - conf.addSection("Client", "org.apache.zookeeper.server.auth.DigestLoginModule", - "username", "myuser", "password", "mypassword"); - - javax.security.auth.login.Configuration.setConfiguration(conf); - } - - private AtomicInteger authFailed = new AtomicInteger(0); - - private class MyWatcher extends CountdownWatcher { - volatile CountDownLatch authCompleted; - - @Override - synchronized public void reset() { - authCompleted = new CountDownLatch(1); - super.reset(); - } - - @Override - public synchronized void process(WatchedEvent event) { - if (event.getState() == KeeperState.AuthFailed) { - authFailed.incrementAndGet(); - authCompleted.countDown(); - } else if (event.getState() == KeeperState.SaslAuthenticated) { - authCompleted.countDown(); - } else { - super.process(event); - } - } - } - - @Test - public void testAuth() throws Exception { - MyWatcher watcher = new MyWatcher(); - ZooKeeper zk = createClient(watcher); - watcher.authCompleted.await(AUTHENTICATION_TIMEOUT, TimeUnit.MILLISECONDS); - Assert.assertEquals(authFailed.get(), 0); - - try { - zk.create("/path1", null, Ids.CREATOR_ALL_ACL, CreateMode.PERSISTENT); - } catch (KeeperException e) { - Assert.fail("test failed :" + e); - } - finally { - zk.close(); - } - } -}
