This repository has been archived by the owner on Sep 26, 2019. It is now read-only.
[PAN-2386] Report the correct tcp port in PING packets when it differs from the UDP port #1019
Conversation
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
mbaxter
reviewed
Mar 4, 2019
| @@ -145,7 +145,7 @@ public MockPeerDiscoveryAgent startDiscoveryAgent( | |||
|
|
|||
| public MockPeerDiscoveryAgent startDiscoveryAgent(final AgentBuilder agentBuilder) { | |||
| final MockPeerDiscoveryAgent agent = createDiscoveryAgent(agentBuilder); | |||
| agent.start(); | |||
| agent.start(65500).join(); | |||
There was a problem hiding this comment.
You could use PeerDiscoveryTestHelper.nextAvailablePort here. Or you could try grabbing the discovery port from the agent's config and reusing that for the tcp port. Would be nice if we don't have to start scattering random numbers throughout the tests.
There was a problem hiding this comment.
Is it possible to clean up the rest of the magic numbers?
There was a problem hiding this comment.
I'll have a look. They are just arbitrary numbers since we don't assert on them and don't open a port for them anywhere.
There was a problem hiding this comment.
I've pulled them out as constants - one of the tests already had a constant it had used for this previously.
mbaxter
approved these changes
Mar 4, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
PR description
When Pantheon is started with
--p2p-port=0an available port is selected for the UDP peer discovery and TCP peer connections but there is no guarantee this port will be the same. Previously Pantheon would assume the UDP and TCP ports were the same so send the UDP port in place of the TCP port in PING messages, making it impossible for other peers to connect to it as they would use the wrong port.