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.
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
CURATOR-535: Fix client port conflict due to untrustworthy random port allocation #421
Merged
eolivelli
merged 1 commit into
apache:master
from
kezhuw:CURATOR-535-fix-port-conflict-for-TestingServer
Feb 21, 2023
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we already remove
public QuorumPeerConfig getConfig() throws Exception {
which breaks compatibility, what if we remove this deprecated mark and change the visibility to default (pacakge)?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
... and why do we remove
ZooKeeperMainFace#getConfig
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, this pr mixed two things: CURATOR-535 and bring back
TestTestingServer#setCustomTickTimeTest
for #383.ZooKeeperMainFace#getConfig
was introduced in #434, and its sole external usage inTestTestingServer#setCustomTickTimeTest
undermines #383.Comparing to public
InstanceSpec
, I thinkZooKeeperMainFace
is more like an internal concept. May be we can restrict visibility ofZooKeeperMainFace
to package ? This should solve all above concerns if make sense to you.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@kezhuw That sounds reasonable. And we can add
getTickTime
or something so that we don't have to changehasZooKeeperServerEmbedded
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have removed
public
fromZooKeeperMainFace
. @tisonkungetTickTime
needs reflection asZooKeeperServerEmbedded
exposes no such info(ZOOKEEPER-4670). In previous version(8eda7d0), I exposed a get method inZooKeeperMainFace
to retrieveServerCnxnFactory
where bothgetTickTime
andgetClientPort
could be easily constructed . But that approach depends heavily on reflection asQuorumPeerMain
andZooKeeperServerEmbedded
exposes no such info.