Skip to content

Remove Powershell as a backup to handle.exe (backport #8961) #8993

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 2 commits into from
Aug 1, 2023
Merged

Remove Powershell as a backup to handle.exe (backport #8961) #8993

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0e9bcc
Remove Powershell as a backup to `handle.exe`
lukebakken Jul 26, 2023
bf79064
Update incorrect warning message
lukebakken Jul 31, 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
25 changes: 9 additions & 16 deletions deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,29 +104,27 @@ get_used_fd({unix, _}, State0) ->
%% you will see a list of handles of various types, including network sockets
%% shown as file handles to \Device\Afd.
get_used_fd({win32, _}, State0) ->
MissingHandleMsg = "Could not execute handle.exe, please install from "
"https://learn.microsoft.com/en-us/sysinternals/downloads/handle",
Pid = os:getpid(),
case os:find_executable("handle.exe") of
false ->
State1 = log_fd_warning_once("Could not find handle.exe, using powershell to determine handle count", [], State0),
UsedFd = get_used_fd_via_powershell(Pid),
{State1, UsedFd};
State1 = log_fd_warning_once(MissingHandleMsg, [], State0),
{State1, 0};
HandleExe ->
Args = ["/accepteula", "-s", "-p", Pid],
{ok, HandleExeOutput} = rabbit_misc:win32_cmd(HandleExe, Args),
case HandleExeOutput of
[] ->
State1 = log_fd_warning_once("Could not execute handle.exe, using powershell to determine handle count", [], State0),
UsedFd = get_used_fd_via_powershell(Pid),
{State1, UsedFd};
State1 = log_fd_warning_once(MissingHandleMsg, [], State0),
{State1, 0};
_ ->
case find_files_line(HandleExeOutput) of
unknown ->
State1 = log_fd_warning_once("handle.exe output did not contain "
"a line beginning with 'File', using "
"powershell to determine used file descriptor "
"count: ~tp", [HandleExeOutput], State0),
UsedFd = get_used_fd_via_powershell(Pid),
{State1, UsedFd};
"a line beginning with 'File': ~tp",
[HandleExeOutput], State0),
{State1, 0};
UsedFd ->
{State0, UsedFd}
end
Expand All @@ -144,11 +142,6 @@ find_files_line(["File " ++ Rest | _T]) ->
find_files_line([_H | T]) ->
find_files_line(T).

get_used_fd_via_powershell(Pid) ->
Cmd = "Get-Process -Id " ++ Pid ++ " | Select-Object -ExpandProperty HandleCount",
{ok, [Result]} = rabbit_misc:pwsh_cmd(Cmd),
list_to_integer(Result).

-define(SAFE_CALL(Fun, NoProcFailResult),
try
Fun
Expand Down