Skip to content

De-flake TestPSEmulation#6940

Merged
neilalexander merged 1 commit intomainfrom
neil/pse
Jun 3, 2025
Merged

De-flake TestPSEmulation#6940
neilalexander merged 1 commit intomainfrom
neil/pse

Conversation

@neilalexander
Copy link
Copy Markdown
Member

@neilalexander neilalexander commented Jun 3, 2025

Signed-off-by: Neil Twigg neil@nats.io

@neilalexander
De-flake TestPSEmulation
c4bd9ef 
Signed-off-by: Neil Twigg <neil@nats.io>
derekcollison
derekcollison reviewed Jun 3, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@derekcollison derekcollison left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you want both..

@neilalexander
Copy link
Copy Markdown
Member Author

neilalexander commented Jun 3, 2025

The godocs think that the GC run is handled too here:

FreeOSMemory forces a garbage collection followed by an attempt to return as much memory to the operating system as possible. (Even if this is not called, the runtime gradually returns memory to the operating system in a background task.)

@neilalexander neilalexander marked this pull request as ready for review June 3, 2025 16:43
@neilalexander neilalexander requested a review from a team as a code owner June 3, 2025 16:43
derekcollison
derekcollison approved these changes Jun 3, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@derekcollison derekcollison left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@neilalexander neilalexander merged commit 887d928 into main Jun 3, 2025
112 of 114 checks passed
@neilalexander neilalexander deleted the neil/pse branch June 3, 2025 16:54
@neilalexander neilalexander mentioned this pull request Jun 17, 2025
Merged
neilalexander added a commit that referenced this pull request Jun 17, 2025
@neilalexander
Cherry-picks for 2.11.5-RC.1 (#6985)
cd8f3f8 
Includes the following:

- #6922
- #6931
- #6933
- #6934
- #6939
- #6938
- #6940
- #6941
- #6942
- #6943
- #6945
- #6944
- #6947
- #6948
- #6949
- #6956
- #6960
- #6961
- #6951
- #6965
- #6968
- #6981
- #6983
- #6984

Signed-off-by: Neil Twigg <neil@nats.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@derekcollison derekcollison derekcollison approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@neilalexander @derekcollison