Skip to content

ARROW-15181: [C++][FlightRPC] Fix race between signal handler and shutdown #12037

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

Closed
lidavidm wants to merge 1 commit into from
Closed

ARROW-15181: [C++][FlightRPC] Fix race between signal handler and shutdown #12037

Show file tree
Hide file tree
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
18 changes: 18 additions & 0 deletions cpp/src/arrow/flight/flight_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,24 @@ TEST(TestFlight, BuilderHook) {
ASSERT_OK(server->Shutdown());
}

TEST(TestFlight, ServeShutdown) {
// Regression test for ARROW-15181
constexpr int kIterations = 10;
for (int i = 0; i < kIterations; i++) {
Location location;
std::unique_ptr<FlightServerBase> server = ExampleTestServer();

ASSERT_OK(Location::ForGrpcTcp("localhost", 0, &location));
FlightServerOptions options(location);
ASSERT_OK(server->Init(options));
ASSERT_GT(server->port(), 0);
std::thread t([&]() { ASSERT_OK(server->Serve()); });
ASSERT_OK(server->Shutdown());
ASSERT_OK(server->Wait());
t.join();
}
}

// ----------------------------------------------------------------------
// Client tests

Expand Down
3 changes: 2 additions & 1 deletion cpp/src/arrow/flight/server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,9 +826,9 @@ class ServerSignalHandler {
errno != EWOULDBLOCK && errno != EINTR) {
return arrow::internal::IOErrorFromErrno(errno, "Could not unblock signal thread");
}
handle_signals_.join();
RETURN_NOT_OK(arrow::internal::FileClose(self_pipe_.rfd));
RETURN_NOT_OK(arrow::internal::FileClose(self_pipe_.wfd));
handle_signals_.join();
self_pipe_.rfd = 0;
self_pipe_.wfd = 0;
return Status::OK();
Expand Down Expand Up @@ -1012,6 +1012,7 @@ Status FlightServerBase::Shutdown() {
if (!server) {
return Status::Invalid("Shutdown() on uninitialized FlightServerBase");
}
impl_->running_instance_ = nullptr;
impl_->server_->Shutdown();
return Status::OK();
}
Expand Down