Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
CURATOR-535: Fix client port conflict due to untrustworthy random por…
…t allocation This commit tries to solve port conflict for `TestingServer` if port is unspecified(aka. `port <= 0`): * Set `InstanceSpec.port` to 0 if port is unspecified. * Save OS chosen bind port after started to maintain same port across restart. Ideally, it should be possible to bootstrap `TestingCluster`(with unspecified ports) too with help from `reconfig`. But there are difficulties since election port, quorum port were not designed to be bound to `0` in ZooKeeper. `TestingServer` should be enough for most cases. Users should resort to other solutions(eg. container) if they got bored by port conflict due to usages of `TestingCluster` and `TestingServer.restart`.
- Loading branch information
Showing
10 changed files
with
195 additions
and
87 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 52 additions & 0 deletions
52
curator-test/src/main/java/org/apache/curator/test/QuorumPeerConfigBuilder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
/** | ||
* 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.curator.test; | ||
|
||
import org.apache.zookeeper.server.quorum.QuorumPeerConfig; | ||
|
||
import java.util.Properties; | ||
|
||
public class QuorumPeerConfigBuilder { | ||
private final QuorumConfigBuilder configBuilder; | ||
private final int instanceIndex; | ||
private final int instancePort; | ||
|
||
QuorumPeerConfigBuilder(QuorumConfigBuilder configBuilder, int instanceIndex, int instancePort) { | ||
this.configBuilder = configBuilder; | ||
this.instanceIndex = instanceIndex; | ||
this.instancePort = instancePort; | ||
} | ||
|
||
public boolean isFromRandom() { | ||
return configBuilder.isFromRandom(); | ||
} | ||
|
||
public InstanceSpec getInstanceSpec() { | ||
return configBuilder.getInstanceSpec(instanceIndex); | ||
} | ||
|
||
public QuorumPeerConfig buildConfig() throws Exception { | ||
return configBuilder.buildConfig(instanceIndex, instancePort); | ||
} | ||
|
||
public Properties buildProperties() throws Exception { | ||
return configBuilder.buildConfigProperties(instanceIndex, instancePort); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.