ZOOKEEPER-2008. Missing leader election port in system test. (Kfir Lev-Ari via Alex Shraer).

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1617892 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -43,6 +43,7 @@ NEW FEATURES:
   (Skye Wanderman-Milne, Bill Havanki via phunt)
 
 BUGFIXES:
+  ZOOKEEPER-2008. Missing leader election port in system test. (Kfir Lev-Ari via Alex Shraer).
 
   ZOOKEEPER-1992. Backward compatibility of the static configuration file (Hongchao Deng via Alex Shraer).
 

src/java/systest/org/apache/zookeeper/test/system/BaseSysTest.java

@@ -126,8 +126,9 @@ public class BaseSysTest extends TestCase {
                     sbClient.append(',');
                     sbServer.append(',');
                 }
-                sbClient.append(r[0]);
-                sbServer.append(r[1]);
+                sbClient.append(r[0]); // r[0] == "host:clientPort"
+                sbServer.append(r[1]); // r[1] == "host:leaderPort:leaderElectionPort"
+                sbServer.append(";"+(r[0].split(":"))[1]); // Appending ";clientPort"
             }
             serverHostPort = sbClient.toString();
             quorumHostPort = sbServer.toString();

src/java/systest/org/apache/zookeeper/test/system/GenerateLoad.java

@@ -603,8 +603,9 @@ public class GenerateLoad {
                         quorumHostPort.append(',');
                         zkHostPort.append(',');
                     }
-                    zkHostPort.append(r[0]);
-                    quorumHostPort.append(r[1]);
+                    zkHostPort.append(r[0]);     // r[0] == "host:clientPort"
+                    quorumHostPort.append(r[1]); // r[1] == "host:leaderPort:leaderElectionPort"
+                    quorumHostPort.append(";"+(r[0].split(":"))[1]); // Appending ";clientPort"
                 }
                 for (int i = 0; i < serverCount; i++) {
                     QuorumPeerInstance.startInstance(im, quorumHostPort

src/java/systest/org/apache/zookeeper/test/system/QuorumPeerInstance.java

@@ -52,7 +52,8 @@ class QuorumPeerInstance implements Instance {
     }
 
     InetSocketAddress clientAddr;
-    InetSocketAddress quorumAddr;
+    InetSocketAddress quorumLeaderAddr;
+    InetSocketAddress quorumLeaderElectionAddr;
     HashMap<Long, QuorumServer> peers;
     File snapDir, logDir;
 
@@ -108,13 +109,20 @@ class QuorumPeerInstance implements Instance {
             }
             try {
                 ServerSocket ss = new ServerSocket(0, 1, InetAddress.getLocalHost());
-                quorumAddr = (InetSocketAddress) ss.getLocalSocketAddress();
+                quorumLeaderAddr = (InetSocketAddress) ss.getLocalSocketAddress();
+                ss.close();
+            } catch(IOException e) {
+                e.printStackTrace();
+            }
+            try {
+                ServerSocket ss = new ServerSocket(0, 1, InetAddress.getLocalHost());
+                quorumLeaderElectionAddr = (InetSocketAddress) ss.getLocalSocketAddress();
                 ss.close();
             } catch(IOException e) {
                 e.printStackTrace();
             }
             String report = clientAddr.getHostName() + ':' + clientAddr.getPort() +
-            ',' + quorumAddr.getHostName() + ':' + quorumAddr.getPort();
+            ',' + quorumLeaderAddr.getHostName() + ':' + quorumLeaderAddr.getPort() + ':' + quorumLeaderElectionAddr.getPort();
             try {
                 if (LOG.isDebugEnabled()) {
                     LOG.debug("Reporting " + report);
@@ -157,8 +165,15 @@ class QuorumPeerInstance implements Instance {
             String parts[] = quorumSpecs.split(",");
             peers = new HashMap<Long,QuorumServer>();
             for(int i = 0; i < parts.length; i++) {
-                String subparts[] = parts[i].split(":");
-                peers.put(Long.valueOf(i), new QuorumServer(i, new InetSocketAddress(subparts[0], Integer.parseInt(subparts[1]))));
+                // parts[i] == "host:leaderPort:leaderElectionPort;clientPort"
+                String subparts[] = (parts[i].split(";"))[0].split(":");
+		String clientPort = (parts[i].split(";"))[1];
+                peers.put(Long.valueOf(i),
+                          new QuorumServer(
+                                i,
+                                new InetSocketAddress(subparts[0], Integer.parseInt(subparts[1])),
+                                new InetSocketAddress(subparts[0], Integer.parseInt(subparts[2])),
+                                new InetSocketAddress(subparts[0], Integer.parseInt(clientPort))));
             }
             try {
                 if (LOG.isDebugEnabled()) {