Fix monitoring server connz idle time sorting #4463
Merged
+150
−59
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
|
I think you may have introduced a deadlock by looks of travis tests. |
|
If you can rebase onto top of main and see if that clears tests, and if not then the change has a deadlock. |
wallyqs
reviewed
Aug 31, 2023
server/monitor_sort_opts_test.go
Outdated
| "time" | ||
| ) | ||
|
|
||
| func TestSortByIdleTime(t *testing.T) { |
There was a problem hiding this comment.
After the rebase, let's move this back to monitor_test.go and rename this test to:
Suggested change
| func TestSortByIdleTime(t *testing.T) { | |
| func TestConnzSortByIdleTime(t *testing.T) { |
mdawar
force-pushed
the
connz-idle-sort
branch
from
a7d9cf0
to
d24d512
Compare
|
Done, rebased on top of main and moved the test from the new file to |
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.
Resolves #NNNgit pull --rebase origin main)Resolves #4462
Changes proposed in this pull request:
byIdlestruct compares the idle times (was subtracting the start time from the last activity time).byIdle.TestConnzSortedByIdle(No need for the clients to publish and subscribe if we are manually changing the client'slasttime, and we only need to test the sorting order). Also the test was not catching the problem because the clientsstarttime was the same, now every client has a different start time.