Skip to content

Improve brigded group proxy a bit #24539

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
Sep 10, 2025
Merged

Improve brigded group proxy a bit #24539

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
42 changes: 15 additions & 27 deletions ydb/core/blobstorage/bridge/proxy/bridge_proxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,40 +199,27 @@ namespace NKikimr {
return CreateWithErrorReason(ev, ev->Status, ev->Id, StatusFlags, self.GroupId, ApproximateFreeSpaceShare);
}

std::unique_ptr<IEventBase> Combine(TThis& /*self*/, TEvBlobStorage::TEvGetBlockResult *ev, auto *current) {
Y_ABORT_UNLESS(!current || current->TabletId == ev->TabletId);
return CreateWithErrorReason(ev, ev->Status, ev->TabletId,
Max(current ? current->BlockedGeneration : 0, ev->BlockedGeneration));
}

template<typename TEvent>
std::unique_ptr<IEventBase> ProcessFullQuorumResponse(TThis& self, std::unique_ptr<TEvent> ev) {
// combine responses
if (CombinedResponse) {
Y_DEBUG_ABORT_UNLESS(dynamic_cast<TEvent*>(CombinedResponse.get()));
}
Y_DEBUG_ABORT_UNLESS(!CombinedResponse || dynamic_cast<TEvent*>(CombinedResponse.get()));
Y_DEBUG_ABORT_UNLESS(ev->Status != NKikimrProto::NODATA);
const bool readyToReply = !ResponsesPending || ev->Status != NKikimrProto::OK;
CombinedResponse = Combine(self, ev.get(), static_cast<TEvent*>(CombinedResponse.get()));
const bool readyToReply = !ResponsesPending ||
(ev->Status != NKikimrProto::OK && ev->Status != NKikimrProto::NODATA);
return readyToReply
? std::exchange(CombinedResponse, nullptr)
: nullptr;
}

template<typename TEvent>
std::unique_ptr<IEventBase> ProcessPrimaryPileResponse(TThis& self, std::unique_ptr<TEvent> ev,
const TBridgeInfo::TPile& pile) {
if (CombinedResponse) {
Y_DEBUG_ABORT_UNLESS(dynamic_cast<TEvent*>(CombinedResponse.get()));
}
if (ev->Status != NKikimrProto::OK && ev->Status != NKikimrProto::NODATA) {
// if any pile reports error, we finish with error
return MakeErrorFrom(self, ev.get());
}
if (pile.IsPrimary) {
return ev;
}
Y_ABORT_UNLESS(ResponsesPending);
return nullptr;
return readyToReply ? std::move(CombinedResponse) : nullptr;
}

std::unique_ptr<IEventBase> ProcessResponse(TThis& self, std::unique_ptr<TEvBlobStorage::TEvPutResult> ev,
const TBridgeInfo::TPile& /*pile*/, TRequestPayload& payload) {
if (IsRestoring) {
Y_ABORT_UNLESS(!std::holds_alternative<TPutState>(State));

if (ev->Status != NKikimrProto::OK) { // can't restore this blob
return std::visit(TOverloaded{
[&](TGetState& state) -> std::unique_ptr<IEventBase> {
Expand Down Expand Up @@ -463,8 +450,8 @@ namespace NKikimr {
}

std::unique_ptr<IEventBase> ProcessResponse(TThis& self, std::unique_ptr<TEvBlobStorage::TEvGetBlockResult> ev,
const TBridgeInfo::TPile& pile, TRequestPayload& /*payload*/) {
return ProcessPrimaryPileResponse(self, std::move(ev), pile);
const TBridgeInfo::TPile& /*pile*/, TRequestPayload& /*payload*/) {
return ProcessFullQuorumResponse(self, std::move(ev));
}

std::unique_ptr<IEventBase> ProcessResponse(TThis& self, std::unique_ptr<TEvBlobStorage::TEvDiscoverResult> ev,
Expand Down Expand Up @@ -876,6 +863,7 @@ namespace NKikimr {

STLOG(success ? PRI_INFO : PRI_NOTICE, BS_PROXY_BRIDGE, BPB01, "request finished",
(RequestId, request->RequestId),
(Status, common->Status),
(Response, response->ToString()),
(Passed, TDuration::Seconds(request->Timer.Passed())),
(SubrequestTimings, makeSubrequestTimings()));
Expand Down
Loading