aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlnaz Nizametdinov <i.nizametdinov@gmail.com>2022-07-05 21:00:36 +0300
committerDaniil Cherednik <dan.cherednik@gmail.com>2022-07-05 21:00:36 +0300
commita91ee9ef69a16257cf124ef53a7f7eb9357121b0 (patch)
tree1ebea098f0b826d0ae1017a1abdb964ff53058c3
parent7d00701f4c2ef8f841a41ec86d7dfd1c5a8eb5f1 (diff)
downloadydb-a91ee9ef69a16257cf124ef53a7f7eb9357121b0.tar.gz
22-2: Configurable read buffer size limit KIKIMR-14803
mrege from trunk: r9655347 REVIEW: 2690339 x-ydb-stable-ref: a603bf48b7062fe1f247e2dba105f2114623c87b
-rw-r--r--ydb/core/protos/config.proto1
-rw-r--r--ydb/core/protos/flat_scheme_op.proto2
-rw-r--r--ydb/core/tx/datashard/import_s3.cpp2
3 files changed, 3 insertions, 2 deletions
diff --git a/ydb/core/protos/config.proto b/ydb/core/protos/config.proto
index 0c1cc49d86..455fe8bdb6 100644
--- a/ydb/core/protos/config.proto
+++ b/ydb/core/protos/config.proto
@@ -1400,6 +1400,7 @@ message TDataShardConfig {
optional uint64 TtlReadAheadLo = 13 [default = 524288];
optional uint64 TtlReadAheadHi = 14 [default = 1048576];
optional uint64 IdleMemCompactionIntervalSeconds = 15 [default = 60];
+ optional uint64 RestoreReadBufferSizeLimit = 16 [default = 268435456]; // 256 MB
}
message TSchemeShardConfig {
diff --git a/ydb/core/protos/flat_scheme_op.proto b/ydb/core/protos/flat_scheme_op.proto
index c52d885ef0..244ee7a4f7 100644
--- a/ydb/core/protos/flat_scheme_op.proto
+++ b/ydb/core/protos/flat_scheme_op.proto
@@ -865,7 +865,7 @@ message TS3Settings {
message TLimits {
optional uint32 ReadBatchSize = 1 [default = 8388608]; // 8 MB
optional uint32 MinWriteBatchSize = 2 [default = 5242880]; // 5 MB
- optional uint32 ReadBufferSizeLimit = 3 [default = 67108864]; // 64 MB
+ reserved 3; // ReadBufferSizeLimit
};
optional TLimits Limits = 100;
diff --git a/ydb/core/tx/datashard/import_s3.cpp b/ydb/core/tx/datashard/import_s3.cpp
index 571cb448aa..9227522c45 100644
--- a/ydb/core/tx/datashard/import_s3.cpp
+++ b/ydb/core/tx/datashard/import_s3.cpp
@@ -696,7 +696,7 @@ public:
, LogPrefix_(TStringBuilder() << "s3:" << TxId)
, Retries(task.GetNumberOfRetries())
, ReadBatchSize(task.GetS3Settings().GetLimits().GetReadBatchSize())
- , ReadBufferSizeLimit(task.GetS3Settings().GetLimits().GetReadBufferSizeLimit())
+ , ReadBufferSizeLimit(AppData()->DataShardConfig.GetRestoreReadBufferSizeLimit())
{
}