xds:Move creating the retry timer in handleRpcStreamClosed to as late as possible and call close() #11776
+25
−12
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
…possible and call `close` so that the `call` is cancelled. Also add some debug logging.
ejona86
reviewed
Dec 26, 2024
| @@ -371,6 +375,11 @@ private void notifyIfReady() { | |||
| boolean doNotify; | |||
| synchronized (onReadyLock) { | |||
| doNotify = isReady(); | |||
| if (!doNotify) { | |||
| log.log(Level.FINE, | |||
| "Transport not ready. allocated/de:{0}/{3}, sent queued: {1}, ready thresh: {2}", | |||
There was a problem hiding this comment.
This can create an immense about of logspam. It's also not at all clear what it is talking about (if you aren't looking at the line of code logs this, it is meaningless). What is this trying to achieve?
| @@ -957,6 +960,7 @@ public void handleStreamClosed(Status status, boolean shouldTryFallback) { | |||
|
|
|||
| ControlPlaneClient cpcClosed = serverCpClientMap.get(serverInfo); | |||
| if (cpcClosed == null) { | |||
| logger.log(XdsLogLevel.DEBUG, "Couldn't find CPC for {0}", serverInfo); | |||
There was a problem hiding this comment.
This log statement is not at all clear. Any time this happens we'd expect us not to care because the CPC is shut down, but if you just read the message you would probably think this a surprise.
There was a problem hiding this comment.
I've made the message clearer. We might care because cleanup and metric reporting are being skipped.
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.
Call
close()instead of explicitly settingclosed = trueand callingcleanup()since that will also terminate the underlying ClientCall.Also add some debug logging.