Skip to content

Make sure that "Other ETS" and "Other system" memory metrics are never reported as negative (backport #15289) (backport #15290)#15291

Merged
michaelklishin merged 3 commits intov4.1.xfrom
mergify/bp/v4.1.x/pr-15290
Jan 17, 2026
Merged

Make sure that "Other ETS" and "Other system" memory metrics are never reported as negative (backport #15289) (backport #15290)#15291
michaelklishin merged 3 commits intov4.1.xfrom
mergify/bp/v4.1.x/pr-15290

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify bot commented Jan 17, 2026

This has been driving me nuts for a while because it results in a panic in one https://github.com/michaelklishin/rabbitmq-http-api-rs test.

These computed values can be reported as negative due to ETS tables being concurrently added, removed and updated.

So simply report 0 in such cases.

This is an automatic backport of pull request #15289 done by [Mergify](https://mergify.com).
This is an automatic backport of pull request #15290 done by [Mergify](https://mergify.com).

@michaelklishin @mergify
Make sure that "Other ETS" and "Other system" memory metrics are neve…
2a095f9 
…r negative

They can become negative due to ETS tables being concurrently
added, removed and updated.

So simply report 0 in such cases.

(cherry picked from commit 6e7bf23)
(cherry picked from commit 21b491a)

# Conflicts:
#	deps/rabbit/src/rabbit_vm.erl
@michaelklishin @mergify
Resolve conflicts #15289 #15290
d052c71 
(cherry picked from commit 6cee8ed)
@mergify mergify bot added the conflicts label Jan 17, 2026
@mergify
Copy link
Copy Markdown
Author

mergify bot commented Jan 17, 2026

Cherry-pick of 21b491a has failed:

On branch mergify/bp/v4.1.x/pr-15290
Your branch is up to date with 'origin/v4.1.x'.

You are currently cherry-picking commit 21b491a35.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   deps/rabbit/test/unit_rabbit_vm_SUITE.erl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbit/src/rabbit_vm.erl

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the make label Jan 17, 2026
@michaelklishin michaelklishin added this to the 4.1.8 milestone Jan 17, 2026
@michaelklishin michaelklishin merged commit 6b24a9c into v4.1.x Jan 17, 2026
272 of 274 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.1.x/pr-15290 branch January 17, 2026 05:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

conflicts make

Projects

None yet

Milestone

4.1.8

Development

Successfully merging this pull request may close these issues.

1 participant

@michaelklishin