Skip to content

Merge to 24-3: Fix incorrect counter of inflight requests for get_storage_channel_status #12488

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
kruall merged 1 commit into from
Dec 11, 2024
Merged

Merge to 24-3: Fix incorrect counter of inflight requests for get_storage_channel_status #12488

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
6 changes: 3 additions & 3 deletions ydb/core/keyvalue/keyvalue_state.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3164,7 +3164,7 @@ void TKeyValueState::OnEvReadRequest(TEvKeyValue::TEvRead::TPtr &ev, const TActo
++IntermediatesInFlight;
} else {
LOG_DEBUG_S(ctx, NKikimrServices::KEYVALUE, "KeyValue# " << TabletId
<< " Enqueue storage read request, Marker# KV56");
<< " Enqueue storage read request " << IntermediatesInFlight << '/' << IntermediatesInFlightLimit << ", Marker# KV56");
PostponeIntermediate<TEvKeyValue::TEvRead>(std::move(intermediate));
}
}
Expand Down Expand Up @@ -3244,14 +3244,14 @@ void TKeyValueState::OnEvGetStorageChannelStatus(TEvKeyValue::TEvGetStorageChann
ResourceMetrics->Network.Increment(ev->Get()->Record.ByteSize());
ResourceMetrics->TryUpdate(ctx);

TRequestType::EType requestType = TRequestType::ReadOnlyInline;
TRequestType::EType requestType = TRequestType::ReadOnly;
CountRequestIncoming(requestType);

if (PrepareGetStorageChannelStatusRequest(ctx, ev, intermediate, info)) {
LOG_DEBUG_S(ctx, NKikimrServices::KEYVALUE, "KeyValue# " << TabletId
<< " Create GetStorageChannelStatus request, Marker# KV75");
RegisterRequestActor(ctx, std::move(intermediate), info, ExecutorGeneration);
++RoInlineIntermediatesInFlight;
++IntermediatesInFlight;
CountRequestTakeOffOrEnqueue(requestType);
} else {
intermediate->UpdateStat();
Expand Down
41 changes: 41 additions & 0 deletions ydb/services/keyvalue/grpc_service_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,6 +634,47 @@ Y_UNIT_TEST_SUITE(KeyValueGRPCService) {
});
}

Y_UNIT_TEST(SimpleWriteReadWithGetChannelStatus) {
TString tablePath = "/Root/mydb/kvtable";
MakeSimpleTest(tablePath, [tablePath](const std::unique_ptr<Ydb::KeyValue::V1::KeyValueService::Stub> &stub){
Ydb::KeyValue::GetStorageChannelStatusRequest getStatusRequest;
getStatusRequest.set_path(tablePath);
getStatusRequest.add_storage_channel(0);
getStatusRequest.add_storage_channel(1);
getStatusRequest.add_storage_channel(2);
Ydb::KeyValue::GetStorageChannelStatusResponse getStatusResponse;
grpc::ClientContext getStatusCtx;
AdjustCtxForDB(getStatusCtx);
stub->GetStorageChannelStatus(&getStatusCtx, getStatusRequest, &getStatusResponse);
UNIT_ASSERT_CHECK_STATUS(getStatusResponse.operation(), Ydb::StatusIds::SUCCESS);

Write(tablePath, 0, "key", "value", 0, stub);

Ydb::KeyValue::GetStorageChannelStatusRequest getStatusRequest2;
getStatusRequest2.set_path(tablePath);
getStatusRequest2.add_storage_channel(0);
getStatusRequest2.add_storage_channel(1);
getStatusRequest2.add_storage_channel(2);
Ydb::KeyValue::GetStorageChannelStatusResponse getStatusResponse2;
grpc::ClientContext getStatusCtx2;
AdjustCtxForDB(getStatusCtx2);
stub->GetStorageChannelStatus(&getStatusCtx2, getStatusRequest2, &getStatusResponse2);
UNIT_ASSERT_CHECK_STATUS(getStatusResponse2.operation(), Ydb::StatusIds::SUCCESS);

Ydb::KeyValue::ReadRequest readRequest;
readRequest.set_path(tablePath);
readRequest.set_partition_id(0);
readRequest.set_key("key");
Ydb::KeyValue::ReadResponse readResponse;
Ydb::KeyValue::ReadResult readResult;

grpc::ClientContext readCtx;
AdjustCtxForDB(readCtx);
stub->Read(&readCtx, readRequest, &readResponse);
UNIT_ASSERT_CHECK_STATUS(readResponse.operation(), Ydb::StatusIds::SUCCESS);
});
}

Y_UNIT_TEST(SimpleWriteReadOverrun) {
TString tablePath = "/Root/mydb/kvtable";
MakeSimpleTest(tablePath, [tablePath](const std::unique_ptr<Ydb::KeyValue::V1::KeyValueService::Stub> &stub){
Expand Down
Loading