Skip to content

Properly kill the buck2 daemon #5863

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 1 commit into from
Oct 4, 2024
Merged

Properly kill the buck2 daemon #5863

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 14 additions & 10 deletions build/Utils.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,15 +235,14 @@ function(resolve_buck2)
OUTPUT_VARIABLE resolve_buck2_output
ERROR_VARIABLE resolve_buck2_error
RESULT_VARIABLE resolve_buck2_exit_code
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
WORKING_DIRECTORY ${executorch_root}
OUTPUT_STRIP_TRAILING_WHITESPACE
)

# $BUCK2 is a copy of the var from the parent scope. This block will set
# $buck2 to the value we want to return.
if(resolve_buck2_exit_code EQUAL 0)
set(BUCK2
${resolve_buck2_output}
PARENT_SCOPE
)
set(buck2 ${resolve_buck2_output})
message(STATUS "Resolved buck2 as ${resolve_buck2_output}.")
elseif(resolve_buck2_exit_code EQUAL 2)
# Wrong buck version used. Stop here to ensure that the user sees the error.
Expand All @@ -254,17 +253,22 @@ function(resolve_buck2)
message(WARNING "${resolve_buck2_error}")

if("${BUCK2}" STREQUAL "")
set(BUCK2
"buck2"
PARENT_SCOPE
)
set(buck2 "buck2")
endif()
endif()

# Update the var in the parent scope. Note that this does not modify our
# local $BUCK2 value.
set(BUCK2 "${buck2}" PARENT_SCOPE)

# The buck2 daemon can get stuck. Killing it can help.
message(STATUS "Killing buck2 daemon")
execute_process(
COMMAND "${BUCK2} kill" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
# Note that we need to use the local buck2 variable. BUCK2 is only set in
# the parent scope, and can still be empty in this scope.
COMMAND "${buck2} kill"
WORKING_DIRECTORY ${executorch_root}
COMMAND_ECHO STDOUT
)
endfunction()

Expand Down
Loading