KAFKA-18274: Failed to restart controller in testing due to closed socket channel [2/2] #18337
+27
−0
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
github-actions
bot
added
triage
frankvicky
suggested changes
Dec 30, 2024
Comment on lines
52
to
65
| if (socketChannel != null && socketChannel.isOpen()) { | ||
| return socketChannel; | ||
| } else if (socketChannel != null) { | ||
| // bind the server socket with same port | ||
| socketAddress = new InetSocketAddress(socketAddress.getHostString(), socketChannel.socket().getLocalPort()); | ||
| socketChannel = ServerSocketFactory.INSTANCE.openServerSocket( | ||
| listenerName, | ||
| socketAddress, | ||
| listenBacklogSize, | ||
| recvBufferSize); | ||
| return socketChannel; | ||
| } |
There was a problem hiding this comment.
Please combine the null checks.
Instead of checking for socketChannel != null twice, we can combine them into a single block that handles the non-null case.
There was a problem hiding this comment.
Nice catch. Thanks!
|
@peterxcli please fix the conflicts |
peterxcli
force-pushed
the
k18274-controller-use-same-port-after-restarting
branch
from
89f5780 to
687af35
Compare
|
Failed tests are tracked by: |
chia7712
reviewed
Jan 8, 2025
There was a problem hiding this comment.
@peterxcli thanks for this patch. two minor comments remaining. Please take a look
| if (socketChannel.isOpen()) { | ||
| return socketChannel; | ||
| } | ||
| // bind the server socket with same port |
There was a problem hiding this comment.
Could you please add comments to explain the use cases of binding the same port?
|
|
||
| ControllerServer controller = cluster.controllers().values().iterator().next(); | ||
| controller.shutdown(); | ||
| controller.awaitShutdown(); |
There was a problem hiding this comment.
Could you please add test for broker as well? the fix should works for broker, right?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Enable controller to restart with the same port in ClusterTest.
Tests
In the newly added test
testKRaftIsolatedControllerRestart, if we don't have the corresponding changes inPreboundSocketFactoryManagerthen the admin will keep retrying connect to the restarted controller, cause the controller's port has changed.