Skip to content

[CURATOR-535] TestServer random port selection has a race condition #406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
paul8263 wants to merge 1 commit into from
Closed

[CURATOR-535] TestServer random port selection has a race condition #406

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand All @@ -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;
}

Expand Down Expand Up @@ -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;

}

Expand Down