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.

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

Fix weight consumption problem with XDC #16026

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −21
Open

Fix weight consumption problem with XDC #16026

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
21 changes: 9 additions & 12 deletions ydb/library/actors/interconnect/interconnect_channel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
LWTRACE_USING(ACTORLIB_PROVIDER);

namespace NActors {
bool TEventOutputChannel::FeedDescriptor(TTcpPacketOutTask& task, TEventHolder& event, ui64 *weightConsumed) {
bool TEventOutputChannel::FeedDescriptor(TTcpPacketOutTask& task, TEventHolder& event) {
const size_t amount = sizeof(TChannelPart) + sizeof(TEventDescr2);
if (task.GetInternalFreeAmount() < amount) {
return false;
Expand Down Expand Up @@ -49,7 +49,6 @@ namespace NActors {
task.Write<false>(&part, sizeof(part));
task.Write<false>(&descr, sizeof(descr));

*weightConsumed += amount;
OutputQueueSize -= sizeof(TEventDescr2);
Metrics->UpdateOutputChannelEvents(ChannelId);

Expand All @@ -63,7 +62,7 @@ namespace NActors {
}
}

bool TEventOutputChannel::FeedBuf(TTcpPacketOutTask& task, ui64 serial, ui64 *weightConsumed) {
bool TEventOutputChannel::FeedBuf(TTcpPacketOutTask& task, ui64 serial) {
for (;;) {
Y_ABORT_UNLESS(!Queue.empty());
TEventHolder& event = Queue.front();
Expand Down Expand Up @@ -101,15 +100,15 @@ namespace NActors {
break;

case EState::BODY:
if (FeedPayload(task, event, weightConsumed)) {
if (FeedPayload(task, event)) {
State = EState::DESCRIPTOR;
} else {
return false;
}
break;

case EState::DESCRIPTOR:
if (!FeedDescriptor(task, event, weightConsumed)) {
if (!FeedDescriptor(task, event)) {
return false;
}
event.Serial = serial;
Expand Down Expand Up @@ -230,7 +229,7 @@ namespace NActors {
return complete;
}

bool TEventOutputChannel::FeedPayload(TTcpPacketOutTask& task, TEventHolder& event, ui64 *weightConsumed) {
bool TEventOutputChannel::FeedPayload(TTcpPacketOutTask& task, TEventHolder& event) {
for (;;) {
// calculate inline or external part size (it may cover a few sections, not just single one)
while (!PartLenRemain) {
Expand All @@ -255,8 +254,8 @@ namespace NActors {

// serialize bytes
const auto complete = IsPartInline
? FeedInlinePayload(task, event, weightConsumed)
: FeedExternalPayload(task, event, weightConsumed);
? FeedInlinePayload(task, event)
: FeedExternalPayload(task, event);
if (!complete) { // no space to serialize
return false;
} else if (*complete) { // event serialized
Expand All @@ -265,7 +264,7 @@ namespace NActors {
}
}

std::optional<bool> TEventOutputChannel::FeedInlinePayload(TTcpPacketOutTask& task, TEventHolder& event, ui64 *weightConsumed) {
std::optional<bool> TEventOutputChannel::FeedInlinePayload(TTcpPacketOutTask& task, TEventHolder& event) {
if (task.GetInternalFreeAmount() <= sizeof(TChannelPart)) {
return std::nullopt;
}
Expand All @@ -284,13 +283,12 @@ namespace NActors {
};

task.WriteBookmark(std::move(partBookmark), &part, sizeof(part));
*weightConsumed += sizeof(TChannelPart) + part.Size;
OutputQueueSize -= part.Size;

return complete;
}

std::optional<bool> TEventOutputChannel::FeedExternalPayload(TTcpPacketOutTask& task, TEventHolder& event, ui64 *weightConsumed) {
std::optional<bool> TEventOutputChannel::FeedExternalPayload(TTcpPacketOutTask& task, TEventHolder& event) {
const size_t partSize = sizeof(TChannelPart) + sizeof(ui8) + sizeof(ui16) + (Params.Encryption ? 0 : sizeof(ui32));
if (task.GetInternalFreeAmount() < partSize || task.GetExternalFreeAmount() == 0) {
return std::nullopt;
Expand Down Expand Up @@ -331,7 +329,6 @@ namespace NActors {

task.WriteBookmark(std::move(partBookmark), buffer, partSize);

*weightConsumed += partSize + bytesSerialized;
OutputQueueSize -= bytesSerialized;

return complete;
Expand Down
10 changes: 5 additions & 5 deletions ydb/library/actors/interconnect/interconnect_channel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ namespace NActors {

void DropConfirmed(ui64 confirm);

bool FeedBuf(TTcpPacketOutTask& task, ui64 serial, ui64 *weightConsumed);
bool FeedBuf(TTcpPacketOutTask& task, ui64 serial);

bool IsEmpty() const {
return Queue.empty();
Expand Down Expand Up @@ -142,11 +142,11 @@ namespace NActors {
template<bool External>
bool SerializeEvent(TTcpPacketOutTask& task, TEventHolder& event, size_t *bytesSerialized);

bool FeedPayload(TTcpPacketOutTask& task, TEventHolder& event, ui64 *weightConsumed);
std::optional<bool> FeedInlinePayload(TTcpPacketOutTask& task, TEventHolder& event, ui64 *weightConsumed);
std::optional<bool> FeedExternalPayload(TTcpPacketOutTask& task, TEventHolder& event, ui64 *weightConsumed);
bool FeedPayload(TTcpPacketOutTask& task, TEventHolder& event);
std::optional<bool> FeedInlinePayload(TTcpPacketOutTask& task, TEventHolder& event);
std::optional<bool> FeedExternalPayload(TTcpPacketOutTask& task, TEventHolder& event);

bool FeedDescriptor(TTcpPacketOutTask& task, TEventHolder& event, ui64 *weightConsumed);
bool FeedDescriptor(TTcpPacketOutTask& task, TEventHolder& event);

void AccountTraffic() {
if (const ui64 amount = std::exchange(UnaccountedTraffic, 0)) {
Expand Down
5 changes: 3 additions & 2 deletions ydb/library/actors/interconnect/interconnect_tcp_session.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -953,8 +953,9 @@ namespace NActors {

// generate some data within this channel
const ui64 netBefore = channel->GetBufferedAmountOfData();
ui64 gross = 0;
const bool eventDone = channel->FeedBuf(task, serial, &gross);
ui32 gross = task.GetDataSize();
const bool eventDone = channel->FeedBuf(task, serial);
gross = task.GetDataSize() - gross;
channel->UnaccountedTraffic += gross;
const ui64 netAfter = channel->GetBufferedAmountOfData();
Y_DEBUG_ABORT_UNLESS(netAfter <= netBefore); // net amount should shrink
Expand Down
5 changes: 3 additions & 2 deletions ydb/library/actors/interconnect/ut/channel_scheduler_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,9 @@ Y_UNIT_TEST_SUITE(ChannelScheduler) {
while (numEvents) {
TEventOutputChannel *channel = scheduler.PickChannelWithLeastConsumedWeight();
ui32 before = task.GetDataSize();
ui64 weightConsumed = 0;
numEvents -= channel->FeedBuf(task, 0, &weightConsumed);
ui64 weightConsumed = task.GetDataSize();
numEvents -= channel->FeedBuf(task, 0);
weightConsumed = task.GetDataSize() - weightConsumed;
ui32 after = task.GetDataSize();
Y_ABORT_UNLESS(after >= before);
scheduler.FinishPick(weightConsumed, 0);
Expand Down
Loading