Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@<zookeeper.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1611516 [3/3] - in /zookeeper/trunk: ./ docs/
 src/docs/src/documentation/content/xdocs/
 src/java/main/org/apache/zookeeper/server/
 src/java/main/org/apache/zookeeper/server/admin/
 src/java/main/org/apache/zookeeper/server/quorum/ src/java/...
Date: Fri, 18 Jul 2014 00:19:03 -0000
To: commits@zookeeper.apache.org
From: phunt@apache.org
Message-Id: <20140718001905.DCA8F23889E2@eris.apache.org>

Added: zookeeper/trunk/src/java/test/org/apache/zookeeper/server/admin/JettyAdminServerTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/admin/JettyAdminServerTest.java?rev=1611516&view=auto
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/server/admin/JettyAdminServerTest.java (added)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/server/admin/JettyAdminServerTest.java Fri Jul 18 00:19:01 2014
@@ -0,0 +1,160 @@
+/**
+ * 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.server.admin;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.apache.zookeeper.PortAssignment;
+import org.apache.zookeeper.ZKTestCase;
+import org.apache.zookeeper.server.ZooKeeperServerMainTest;
+import org.apache.zookeeper.server.admin.AdminServer.AdminServerException;
+import org.apache.zookeeper.server.quorum.QuorumPeerTestBase;
+import org.apache.zookeeper.test.ClientBase;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class JettyAdminServerTest extends ZKTestCase{
+    protected static final Logger LOG = LoggerFactory.getLogger(JettyAdminServerTest.class);
+
+    private static final String URL_FORMAT = "http://localhost:%d/commands";
+
+    @Before
+    public void enableServer() {
+        // Override setting in ZKTestCase
+        System.setProperty("zookeeper.admin.enableServer", "true");
+    }
+
+    /**
+     * Tests that we can start and query a JettyAdminServer.
+     */
+    @Test
+    public void testJettyAdminServer() throws AdminServerException, IOException {
+        JettyAdminServer server = new JettyAdminServer();;
+        try {
+            server.start();
+            queryAdminServer(JettyAdminServer.DEFAULT_PORT);
+        } finally {
+            server.shutdown();
+        }
+    }
+
+    /**
+     * Starts a standalone server and tests that we can query its AdminServer.
+     */
+    @Test
+    public void testStandalone() throws Exception {
+        ClientBase.setupTestEnv();
+
+        final int CLIENT_PORT = PortAssignment.unique();
+
+        ZooKeeperServerMainTest.MainThread main = new ZooKeeperServerMainTest.MainThread(CLIENT_PORT, false, null);
+        main.start();
+
+        Assert.assertTrue("waiting for server being up",
+                ClientBase.waitForServerUp("127.0.0.1:" + CLIENT_PORT,
+                ClientBase.CONNECTION_TIMEOUT));
+
+        queryAdminServer(JettyAdminServer.DEFAULT_PORT);
+
+        main.shutdown();
+
+        Assert.assertTrue("waiting for server down",
+                ClientBase.waitForServerDown("127.0.0.1:" + CLIENT_PORT,
+                        ClientBase.CONNECTION_TIMEOUT));
+    }
+
+    /**
+     * Starts a quorum of two servers and tests that we can query both AdminServers.
+     */
+    @Test
+    public void testQuorum() throws Exception {
+        ClientBase.setupTestEnv();
+
+        final int CLIENT_PORT_QP1 = PortAssignment.unique();
+        final int CLIENT_PORT_QP2 = PortAssignment.unique();
+
+        final int ADMIN_SERVER_PORT1 = PortAssignment.unique();
+        final int ADMIN_SERVER_PORT2 = PortAssignment.unique();
+
+        String quorumCfgSection = String.format
+            ("server.1=127.0.0.1:%d:%d;%d\nserver.2=127.0.0.1:%d:%d;%d",
+             PortAssignment.unique(), PortAssignment.unique(), CLIENT_PORT_QP1,
+             PortAssignment.unique(), PortAssignment.unique(), CLIENT_PORT_QP2
+            );
+        QuorumPeerTestBase.MainThread q1 = new QuorumPeerTestBase.MainThread(
+                1, CLIENT_PORT_QP1, ADMIN_SERVER_PORT1, quorumCfgSection, null);
+        q1.start();
+
+        // Since JettyAdminServer reads a system property to determine its port,
+        // make sure it initializes itself before setting the system property
+        // again with the second port number
+        Thread.sleep(500);
+
+        QuorumPeerTestBase.MainThread q2 = new QuorumPeerTestBase.MainThread(
+                2, CLIENT_PORT_QP2, ADMIN_SERVER_PORT2, quorumCfgSection, null);
+        q2.start();
+
+        Thread.sleep(500);
+
+        Assert.assertTrue("waiting for server 1 being up",
+                ClientBase.waitForServerUp("127.0.0.1:" + CLIENT_PORT_QP1,
+                ClientBase.CONNECTION_TIMEOUT));
+        Assert.assertTrue("waiting for server 2 being up",
+                        ClientBase.waitForServerUp("127.0.0.1:" + CLIENT_PORT_QP2,
+                        ClientBase.CONNECTION_TIMEOUT));
+
+        queryAdminServer(ADMIN_SERVER_PORT1);
+        queryAdminServer(ADMIN_SERVER_PORT2);
+
+        q1.shutdown();
+        q2.shutdown();
+
+        Assert.assertTrue("waiting for server 1 down",
+                ClientBase.waitForServerDown("127.0.0.1:" + CLIENT_PORT_QP1,
+                        ClientBase.CONNECTION_TIMEOUT));
+        Assert.assertTrue("waiting for server 2 down",
+                ClientBase.waitForServerDown("127.0.0.1:" + CLIENT_PORT_QP2,
+                        ClientBase.CONNECTION_TIMEOUT));
+    }
+
+    /**
+     * Check that we can load the commands page of an AdminServer running at
+     * localhost:port. (Note that this should work even if no zk server is set.)
+     */
+    private void queryAdminServer(int port) throws MalformedURLException, IOException {
+        queryAdminServer(String.format(URL_FORMAT, port));
+    }
+
+    /**
+     * Check that loading urlStr results in a non-zero length response.
+     */
+    private void queryAdminServer(String urlStr) throws MalformedURLException, IOException {
+        URL url = new URL(urlStr);
+        BufferedReader dis = new BufferedReader(new InputStreamReader((url.openStream())));
+        String line = dis.readLine();
+        Assert.assertTrue(line.length() > 0);
+    }
+}

Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java?rev=1611516&r1=1611515&r2=1611516&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java Fri Jul 18 00:19:01 2014
@@ -28,7 +28,6 @@ import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.SocketChannel;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.regex.Pattern;
 
 import org.apache.log4j.Layout;

Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java?rev=1611516&r1=1611515&r2=1611516&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java Fri Jul 18 00:19:01 2014
@@ -30,6 +30,7 @@ import org.slf4j.LoggerFactory;
 import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.ZKTestCase;
+import org.apache.zookeeper.server.admin.JettyAdminServer;
 import org.apache.zookeeper.test.ClientBase;
 import org.apache.zookeeper.test.QuorumBase;
 
@@ -78,15 +79,20 @@ public class QuorumPeerTestBase extends 
 
         public MainThread(int myid, int clientPort, String quorumCfgSection)
                 throws IOException {
-            this(myid, clientPort, quorumCfgSection, null);
+            this(myid, clientPort, JettyAdminServer.DEFAULT_PORT, quorumCfgSection, null);
         }
 
-        public MainThread(int myid, int clientPort, String quorumCfgSection,
+        public MainThread(int myid, int clientPort, String quorumCfgSection, String configs)
+                throws IOException {
+            this(myid, clientPort, JettyAdminServer.DEFAULT_PORT, quorumCfgSection, configs);
+        }
+
+        public MainThread(int myid, int clientPort, int adminServerPort, String quorumCfgSection,
                 String configs)
                 throws IOException {
             tmpDir = ClientBase.createTmpDir();
             LOG.info("id = " + myid + " tmpDir = " + tmpDir + " clientPort = "
-                    + clientPort);
+                    + clientPort + " adminServerPort = " + adminServerPort);
 
             File dataDir = new File(tmpDir, "data");
             if (!dataDir.mkdir()) {
@@ -117,6 +123,8 @@ public class QuorumPeerTestBase extends 
 
             fwriter.write("clientPort=" + clientPort + "\n");
 
+            fwriter.write("admin.serverPort=" + adminServerPort + "\n");
+
             fwriter.write("dynamicConfigFile=" + dynamicConfigFilename + "\n");
 
             fwriter.flush();

Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/Zab1_0Test.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/Zab1_0Test.java?rev=1611516&r1=1611515&r2=1611516&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/Zab1_0Test.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/Zab1_0Test.java Fri Jul 18 00:19:01 2014
@@ -35,6 +35,7 @@ import java.net.ServerSocket;
 import java.net.Socket;
 import java.nio.ByteBuffer;
 import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.jute.BinaryInputArchive;
 import org.apache.jute.BinaryOutputArchive;
@@ -311,6 +312,13 @@ public class Zab1_0Test {
 		@Override
 		public void reconfigure(InetSocketAddress addr) {			
 		}
+        @Override
+        public void resetAllConnectionStats() {
+        }
+        @Override
+        public Iterable<Map<String, Object>> getAllConnectionInfo(boolean brief) {
+            return null;
+        }
     }
     static Socket[] getSocketPair() throws IOException {
         ServerSocket ss =