Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use win32sysinfo.exe to get disk and memory info #5241

Merged
merged 5 commits into from Jul 19, 2022
Merged

Use win32sysinfo.exe to get disk and memory info #5241

merged 5 commits into from Jul 19, 2022

Conversation

lukebakken
Copy link
Collaborator

@lukebakken lukebakken commented Jul 15, 2022 •
edited

Follow-up to #4140

In #4328, I use Powershell to get disk info. This PR changes that to use the "included with OTP" win32sysinfo.exe

@lukebakken lukebakken self-assigned this Jul 15, 2022
@lukebakken lukebakken mentioned this pull request Jul 15, 2022
Closed
@lukebakken
Use win32sysinfo.exe to get disk and memory info
c0f2f6a 
Follow-up to #4140

In #4328, I use Powershell to get disk info. This PR changes that
to use the "included with OTP" win32sysinfo.exe

Remove Powershell code

Correctly parse the return value of os_mon_sysinfo:get_disk_info/0
@lukebakken lukebakken force-pushed the rabbitmq-server-4140-followup branch from c1774a7 to c0f2f6a Compare July 16, 2022 21:32
@lukebakken lukebakken marked this pull request as ready for review July 16, 2022 21:33
@lukebakken
Copy link
Collaborator Author

@dumbbell @michaelklishin this is a much better solution than #4328, especially since we're already using the os_mon application (which I wasn't aware of).

Yury.Alioshinov and others added 3 commits July 18, 2022 16:06
@michaelklishin
fix shovel error according to consumer_timeout
41958e2
@michaelklishin
Naming
8c37c2a
@michaelklishin
Only populate index route table if its FF is enabled
aca475b 
This is a patch by @ansd, and addresses
//deps/rabbit:direct_exchange_routing_v2_SUITE test run failures
dumbbell
dumbbell reviewed Jul 19, 2022
View reviewed changes
Copy link
Member

@dumbbell dumbbell left a comment •
edited

Choose a reason for hiding this comment

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

The patch works fine for me on Windows 10 Professional.

Just a tiny aesthetic-related comment.

However, there are a lot of unrelated changes in this patch. I guess GitHub is confused by some merges or whatever and a rebase will probably sort this out.

deps/rabbit/src/rabbit_disk_monitor.erl Outdated Show resolved Hide resolved
@michaelklishin michaelklishin mentioned this pull request Jul 19, 2022
Merged
@michaelklishin michaelklishin merged commit 5781641 into master Jul 19, 2022
@michaelklishin michaelklishin deleted the rabbitmq-server-4140-followup branch July 19, 2022 08:05
@mergify mergify bot mentioned this pull request Jul 19, 2022
Closed
@michaelklishin michaelklishin added this to the 3.10.7 milestone Jul 19, 2022
@michaelklishin
Copy link
Member

Backported manually to v3.10.x.

@deejayprod
Copy link

Backported manually to v3.10.x.

This is awesome! Do you know if a 3.10.x release is already scheduled?

@michaelklishin
Copy link
Member

We produce patch releases about once a month on average.

@michaelklishin michaelklishin mentioned this pull request Aug 25, 2022
Closed
This was referenced Sep 7, 2022
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michaelklishin michaelklishin michaelklishin approved these changes

@dumbbell dumbbell dumbbell left review comments

Assignees

@lukebakken lukebakken

Labels
None yet
Projects
None yet
Milestone
3.10.7
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@lukebakken @michaelklishin @deejayprod @dumbbell