Skip to content

rabbit_disk_monitor: handle gen_server timeouts to reduce log noise #8837

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

Merged
merged 4 commits into from
Jul 12, 2023
Merged

rabbit_disk_monitor: handle gen_server timeouts to reduce log noise #8837

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18efb87
rabbit_disk_monitor: handle gen_server timeouts to reduce log noise
michaelklishin Jul 12, 2023
08bf4ee
rabbit_disk_monitor: formatting
michaelklishin Jul 12, 2023
39247ea
Merge branch 'main' into rabbitmq-server-8836
michaelklishin Jul 12, 2023
b8105de
Merge branch 'main' into rabbitmq-server-8836
michaelklishin Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 23 additions & 13 deletions deps/rabbit/src/rabbit_disk_monitor.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ internal_update(State = #state{limit = Limit,
os = OS,
port = Port}) ->
CurrentFree = get_disk_free(Dir, OS, Port),
%% note: 'NaN' is considered to be less than a number
NewAlarmed = CurrentFree < Limit,
case {Alarmed, NewAlarmed} of
{false, true} ->
Expand Down Expand Up @@ -321,19 +322,28 @@ get_disk_free(Dir, {win32, _}, not_used) ->
end,
% Note: we can use os_mon_sysinfo:get_disk_info/1 after the following is fixed:
% https://github.com/erlang/otp/issues/6156
[DriveInfoStr] = lists:filter(F, os_mon_sysinfo:get_disk_info()),

% Note: DriveInfoStr is in this format
% "C:\\ DRIVE_FIXED 720441434112 1013310287872 720441434112\n"
[DriveLetter, $:, $\\, $\s | DriveInfo] = DriveInfoStr,

% https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-getdiskfreespaceexa
% lib/os_mon/c_src/win32sysinfo.c:
% if (fpGetDiskFreeSpaceEx(drive,&availbytes,&totbytes,&totbytesfree)){
% sprintf(answer,"%s DRIVE_FIXED %I64u %I64u %I64u\n",drive,availbytes,totbytes,totbytesfree);
["DRIVE_FIXED", FreeBytesAvailableToCallerStr,
_TotalNumberOfBytesStr, _TotalNumberOfFreeBytesStr] = string:tokens(DriveInfo, " "),
list_to_integer(FreeBytesAvailableToCallerStr)
try
% Note: DriveInfoStr is in this format
% "C:\\ DRIVE_FIXED 720441434112 1013310287872 720441434112\n"
Lines = os_mon_sysinfo:get_disk_info(),
[DriveInfoStr] = lists:filter(F, Lines),
[DriveLetter, $:, $\\, $\s | DriveInfo] = DriveInfoStr,

% https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-getdiskfreespaceexa
% lib/os_mon/c_src/win32sysinfo.c:
% if (fpGetDiskFreeSpaceEx(drive,&availbytes,&totbytes,&totbytesfree)){
% sprintf(answer,"%s DRIVE_FIXED %I64u %I64u %I64u\n",drive,availbytes,totbytes,totbytesfree);
["DRIVE_FIXED", FreeBytesAvailableToCallerStr,
_TotalNumberOfBytesStr, _TotalNumberOfFreeBytesStr] = string:tokens(DriveInfo, " "),
list_to_integer(FreeBytesAvailableToCallerStr)
catch _:{timeout, _}:_ ->
%% could not compute the result
'NaN';
_:Reason:_ ->
rabbit_log:warning("Free disk space monitoring failed to retrieve the amount of available space: ~p", [Reason]),
%% could not compute the result
'NaN'
end
end.

parse_free_unix(Str) ->
Expand Down