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.

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

[Disco] Treat hangup of disco worker process as kShutdown #16989

Merged
Merged
Changes from all commits
Commits
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
38 changes: 34 additions & 4 deletions src/runtime/disco/process_session.cc
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,21 @@ class DiscoPipeMessageQueue : private dmlc::Stream, private DiscoProtocol<DiscoP
}

TVMArgs Recv() {
DequeueNextPacket();
bool is_implicit_shutdown = DequeueNextPacket();
TVMValue* values = nullptr;
int* type_codes = nullptr;
int num_args = 0;
RPCReference::RecvPackedSeq(&values, &type_codes, &num_args, this);

if (is_implicit_shutdown) {
num_args = 2;
values = ArenaAlloc<TVMValue>(num_args);
type_codes = ArenaAlloc<int>(num_args);
TVMArgsSetter setter(values, type_codes);
setter(0, static_cast<int>(DiscoAction::kShutDown));
setter(1, 0);
} else {
RPCReference::RecvPackedSeq(&values, &type_codes, &num_args, this);
}
return TVMArgs(values, type_codes, num_args);
}

Expand All @@ -62,18 +72,38 @@ class DiscoPipeMessageQueue : private dmlc::Stream, private DiscoProtocol<DiscoP
write_buffer_.clear();
}

void DequeueNextPacket() {
/* \brief Read next packet and reset unpacker
*
* Read the next packet into `read_buffer_`, releasing all arena
* allocations performed by the unpacker and resetting the unpacker
* to its initial state.
*
* \return A boolean value. If true, this packet should be treated
* equivalently to a `DiscoAction::kShutdown` event. If false,
* this packet should be unpacked.
*/
bool DequeueNextPacket() {
uint64_t packet_nbytes = 0;
int read_size = pipe_.Read(&packet_nbytes, sizeof(packet_nbytes));
if (read_size == 0) {
// Special case, connection dropped between packets. Treat as a
// request to shutdown.
return true;
}

ICHECK_EQ(read_size, sizeof(packet_nbytes))
<< "Pipe closed without proper shutdown. Please make sure to explicitly call "
"`Session::Shutdown`";
read_buffer_.resize(packet_nbytes);
pipe_.Read(read_buffer_.data(), packet_nbytes);
read_size = pipe_.Read(read_buffer_.data(), packet_nbytes);
ICHECK_EQ(read_size, packet_nbytes)
<< "Pipe closed without proper shutdown. Please make sure to explicitly call "
"`Session::Shutdown`";
read_offset_ = 0;
this->RecycleAll();
RPCCode code = RPCCode::kReturn;
this->Read(&code);
return false;
}

size_t Read(void* data, size_t size) final {
Expand Down
Loading