Fix for Issue 4014: simplified ping handling / deferral based on rece… #4015
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
…ive msg or ping only
|
I see this change resulted in a couple of JetStream cluster or supercluster tests failing. But it's not clear to me why that should be... |
| last time.Time | ||
| out int | ||
| tmr *time.Timer | ||
| lastRxPing time.Time |
There was a problem hiding this comment.
Can these not be combined? I think they are doing the same which is recording inbound activity only.
| pingInterval := c.srv.getOpts().PingInterval | ||
| if c.kind == GATEWAY { | ||
| pingInterval = adjustPingIntervalForGateway(pingInterval) | ||
| } | ||
| now := time.Now() | ||
| needRTT := c.rtt == 0 || now.Sub(c.rttStart) > DEFAULT_RTT_MEASUREMENT_INTERVAL | ||
|
|
||
| // Do not delay PINGs for GATEWAY or spoke LEAF connections. | ||
| if c.kind == GATEWAY || c.isSpokeLeafNode() { |
There was a problem hiding this comment.
Doing the write is most important over potential long haul or multi-hope networks. So even if we have received something we may need to write, so prefer this logic remains.
|
Closing this PR in favour of #4016 |
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.
Fix for issue #4014: using simplified ping handling / deferral based on receiving message or ping from the remote end
This is my own original work that I license to the project
Resolves #NNNgit pull --rebase origin main)Resolves #
Changes proposed in this pull request: