Skip to content

[k2] register the confdata reader abort handler before sending the lease #1697

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
apolyakov merged 2 commits into from
Sep 25, 2026
Merged

[k2] register the confdata reader abort handler before sending the lease #1697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c80f4c
[k2] register the confdata reader abort handler before sending the lease
apolyakov Sep 23, 2026
8aca0ba
bump kphp-confdata version
apolyakov Sep 25, 2026
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
2 changes: 1 addition & 1 deletion runtime-light/components/confdata/confdata-component.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ VISIBILITY_DEFAULT const ImageInfo* k2_describe() {
.is_oneshot = 0,
.build_timestamp = KPHP_CONFDATA_BUILD_TIMESTAMP,
.header_h_version = K2_PLATFORM_HEADER_H_VERSION,
.version = "1.0.0",
.version = "1.0.1",
.extra_info_size = extra_info.size(),
.extra_info = extra_info.data()};
return std::addressof(image_info);
Expand Down
10 changes: 6 additions & 4 deletions runtime-light/components/confdata/state/instance-state.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,8 @@ auto InstanceState::accept_loop() noexcept -> kphp::coro::task<> {
}

auto InstanceState::serve_reader_lease(kphp::component::stream reader_stream) noexcept -> kphp::coro::task<> {
// Outlive the connection, whose destructor unregisters the handler capturing this event.
kphp::coro::event reader_disconnected{};
auto connection{kphp::component::connection::from_stream(std::move(reader_stream))};
if (!connection) [[unlikely]] {
co_return kphp::log::warning("failed to create a confdata reader connection: error -> {}", connection.error());
Expand All @@ -353,6 +355,10 @@ auto InstanceState::serve_reader_lease(kphp::component::stream reader_stream) no
co_return kphp::log::warning("can't serve a confdata reader lease: can't find confdata piece");
}

if (const auto registered{connection->register_abort_handler([&reader_disconnected] noexcept { reader_disconnected.set(); })}; !registered) [[unlikely]] {
co_return kphp::log::warning("failed to watch a confdata reader connection: error -> {}", registered.error());
}

reader_session session{*this, std::prev(m_confdata_pieces.end())};
kphp::log::debug("issuing reader lease: sample -> {}, sections -> {}", session.sample_id(),
m_confdata_pieces.back().storage().values(session.sample_id()).size());
Expand All @@ -364,10 +370,6 @@ auto InstanceState::serve_reader_lease(kphp::component::stream reader_stream) no
co_return kphp::log::warning("failed to write a confdata reader lease: error -> {}", written.error());
}

kphp::coro::event reader_disconnected{};
if (const auto registered{connection->register_abort_handler([&reader_disconnected] noexcept { reader_disconnected.set(); })}; !registered) [[unlikely]] {
co_return kphp::log::warning("failed to watch a confdata reader connection: error -> {}", registered.error());
}
co_await reader_disconnected;
}

Expand Down
Loading