From 388a68be32ad39f841ed76c7b1a17ddbc433f70d Mon Sep 17 00:00:00 2001
From: Yao Zhang <xzhangyao@126.com>
Date: Tue, 7 Dec 2021 10:37:27 +0800
Subject: [PATCH] [CURATOR-535] TestServer random port selection has a race
 condition

---
 .../org/apache/curator/test/InstanceSpec.java | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java b/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java
index 8948f4d377..8b2f2b6659 100644
--- a/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java
+++ b/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java
@@ -64,9 +64,9 @@ public class InstanceSpec
     }
 
     private final File dataDirectory;
-    private final int port;
-    private final int electionPort;
-    private final int quorumPort;
+    private int port;
+    private int electionPort;
+    private int quorumPort;
     private final boolean deleteDataDirectoryOnClose;
     private final int serverId;
     private final int tickTime;
@@ -170,9 +170,9 @@ public InstanceSpec(File dataDirectory, int port, int electionPort, int quorumPo
     public InstanceSpec(File dataDirectory, int port, int electionPort, int quorumPort, boolean deleteDataDirectoryOnClose, int serverId, int tickTime, int maxClientCnxns, Map<String,Object> customProperties,String hostname)
     {
         this.dataDirectory = (dataDirectory != null) ? dataDirectory : Files.createTempDir();
-        this.port = (port >= 0) ? port : getRandomPort();
-        this.electionPort = (electionPort >= 0) ? electionPort : getRandomPort();
-        this.quorumPort = (quorumPort >= 0) ? quorumPort : getRandomPort();
+        this.port = port;
+        this.electionPort = port;
+        this.quorumPort = port;
         this.deleteDataDirectoryOnClose = deleteDataDirectoryOnClose;
         this.serverId = (serverId >= 0) ? serverId : nextServerId.getAndIncrement();
         this.tickTime = (tickTime > 0 ? tickTime : -1); // -1 to set default value
@@ -193,16 +193,25 @@ public File getDataDirectory()
 
     public int getPort()
     {
+        if (port < 0) {
+            port = getRandomPort();
+        }
         return port;
     }
 
     public int getElectionPort()
     {
+        if (electionPort < 0) {
+            electionPort = getRandomPort();
+        }
         return electionPort;
     }
 
     public int getQuorumPort()
     {
+        if (quorumPort < 0) {
+            quorumPort = getRandomPort();
+        }
         return quorumPort;
     }
 
@@ -265,7 +274,7 @@ public boolean equals(Object o)
 
         InstanceSpec that = (InstanceSpec)o;
 
-        return hostname.equals(that.getHostname()) && port == that.port;
+        return hostname.equals(that.getHostname()) && port >= 0 && port == that.port;
 
     }