diff options
| author | tesseract <tesseract@yandex-team.com> | 2023-10-20 11:33:04 +0300 |
|---|---|---|
| committer | tesseract <tesseract@yandex-team.com> | 2023-10-20 12:06:59 +0300 |
| commit | 529421651ffae182d6df0efd887099790b3931fc (patch) | |
| tree | b4a8f5385c21c9259ae2333afb401f45cf6b1798 | |
| parent | 6308fd639c0a16f4ddaeb14a3d5223cca88adcc5 (diff) | |
| download | ydb-529421651ffae182d6df0efd887099790b3931fc.tar.gz | |
Change default metering mode of the topic to request units
| -rw-r--r-- | ydb/services/datastreams/datastreams_proxy.cpp | 2 | ||||
| -rw-r--r-- | ydb/services/datastreams/datastreams_ut.cpp | 17 |
2 files changed, 13 insertions, 6 deletions
diff --git a/ydb/services/datastreams/datastreams_proxy.cpp b/ydb/services/datastreams/datastreams_proxy.cpp index 435f138ec95..13f755790ae 100644 --- a/ydb/services/datastreams/datastreams_proxy.cpp +++ b/ydb/services/datastreams/datastreams_proxy.cpp @@ -128,7 +128,7 @@ namespace NKikimr::NDataStreams::V1 { PartitionWriteSpeedInBytesPerSec(GetProtoRequest()->write_quota_kb_per_sec())); if (AppData(ctx)->PQConfig.GetBillingMeteringConfig().GetEnabled()) { - topicRequest.set_metering_mode(Ydb::Topic::METERING_MODE_RESERVED_CAPACITY); + topicRequest.set_metering_mode(Ydb::Topic::METERING_MODE_REQUEST_UNITS); if (GetProtoRequest()->has_stream_mode_details()) { switch(GetProtoRequest()->stream_mode_details().stream_mode()) { diff --git a/ydb/services/datastreams/datastreams_ut.cpp b/ydb/services/datastreams/datastreams_ut.cpp index cfa8e460235..b7217e78eb7 100644 --- a/ydb/services/datastreams/datastreams_ut.cpp +++ b/ydb/services/datastreams/datastreams_ut.cpp @@ -440,8 +440,11 @@ Y_UNIT_TEST_SUITE(DataStreams) { const ui32 shardCount = 2; { auto result = testServer.DataStreamsClient->CreateStream(streamName, - NYDS_V1::TCreateStreamSettings().ShardCount(shardCount) - .RetentionStorageMegabytes(storageMb)).ExtractValueSync(); + NYDS_V1::TCreateStreamSettings() + .ShardCount(shardCount) + .RetentionStorageMegabytes(storageMb) + .StreamMode(NYdb::NDataStreams::V1::ESM_PROVISIONED) + ).ExtractValueSync(); UNIT_ASSERT_VALUES_EQUAL(result.IsTransportError(), false); UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString()); } @@ -580,7 +583,9 @@ Y_UNIT_TEST_SUITE(DataStreams) { { auto result = testServer.DataStreamsClient->CreateStream(streamName, NYDS_V1::TCreateStreamSettings().ShardCount(shardCount) - .RetentionStorageMegabytes(storageMb)).ExtractValueSync(); + .RetentionStorageMegabytes(storageMb) + .StreamMode(NYdb::NDataStreams::V1::ESM_PROVISIONED) + ).ExtractValueSync(); UNIT_ASSERT_VALUES_EQUAL(result.IsTransportError(), false); UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString()); } @@ -723,7 +728,9 @@ Y_UNIT_TEST_SUITE(DataStreams) { const TString streamPath = "/Root/" + streamName; { auto result = testServer.DataStreamsClient->CreateStream(streamPath, - NYDS_V1::TCreateStreamSettings().ShardCount(1)).ExtractValueSync(); + NYDS_V1::TCreateStreamSettings().ShardCount(1) + .StreamMode(NYdb::NDataStreams::V1::ESM_PROVISIONED) + ).ExtractValueSync(); UNIT_ASSERT_VALUES_EQUAL(result.IsTransportError(), false); UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString()); } @@ -891,7 +898,7 @@ Y_UNIT_TEST_SUITE(DataStreams) { TDuration::Days(7).Hours()); UNIT_ASSERT_VALUES_EQUAL(result.GetResult().stream_description().storage_limit_mb(), 50_GB / 1_MB); UNIT_ASSERT_VALUES_EQUAL(result.GetResult().stream_description().stream_mode_details().stream_mode(), - Ydb::DataStreams::V1::StreamMode::PROVISIONED); + Ydb::DataStreams::V1::StreamMode::ON_DEMAND); } |