Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions ydb/core/base/appdata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <ydb/core/protos/cms.pb.h>
#include <ydb/core/protos/config.pb.h>
#include <ydb/core/protos/data_integrity_trails.pb.h>
#include <ydb/core/protos/schemeshard_config.pb.h>
#include <ydb/core/protos/datashard_config.pb.h>
#include <ydb/core/protos/feature_flags.pb.h>
#include <ydb/core/protos/key.pb.h>
Expand Down
1 change: 1 addition & 0 deletions ydb/core/driver_lib/run/run.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
#include <ydb/core/protos/http_config.pb.h>
#include <ydb/core/protos/node_broker.pb.h>
#include <ydb/core/protos/replication.pb.h>
#include <ydb/core/protos/schemeshard_config.pb.h>
#include <ydb/core/protos/stream.pb.h>
#include <ydb/core/protos/workload_manager_config.pb.h>

Expand Down
34 changes: 2 additions & 32 deletions ydb/core/protos/config.proto
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import "ydb/core/protos/cms.proto";
import "ydb/core/protos/compaction.proto";
import "ydb/core/protos/config_metrics.proto";
import "ydb/core/protos/config_units.proto";
import "ydb/core/protos/counters_schemeshard.proto";
import "ydb/core/protos/data_integrity_trails.proto";
import "ydb/core/protos/schemeshard_config.proto";
import "ydb/core/protos/datashard_config.proto";
import "ydb/core/protos/drivemodel.proto";
import "ydb/core/protos/feature_flags.proto";
Expand Down Expand Up @@ -2167,37 +2167,7 @@ message TColumnShardConfig {
}
}

message TSchemeShardConfig {
message TInFlightCounterConfig {
optional NKikimr.NSchemeShard.ESimpleCounters Type = 1;
// after this amount scheme shard begin to abort the operations
// to disable set to 0
optional uint32 InFlightLimit = 2 [default = 10000];
}
// after this amount of time we forcibly write full stats to local DB
// to disable set to 0
optional uint32 StatsBatchTimeoutMs = 1 [default = 100];

// number of shards stats to batch together
// to disable set to 0
optional uint32 StatsMaxBatchSize = 2 [default = 100];

optional uint32 StatsMaxExecuteMs = 3 [default = 10];

repeated TInFlightCounterConfig InFlightCounterConfig = 4;

// number of shards per table
optional uint32 MaxCdcInitialScanShardsInFlight = 5 [default = 32];

// number of shards per table
// 0 means default - NKikimrIndexBuilder.TIndexBuildSettings.max_shards_in_flight
optional uint32 MaxRestoreBuildIndexShardsInFlight = 6 [default = 1000];

// number of shards per table
// database level default for TTL mechanics
// 0 means no limit
optional uint32 MaxTTLShardsInFlight = 7 [default = 0];
}
// TSchemeShardConfig has been moved to ydb/core/protos/schemeshard_config.proto

message TCompactionConfig {
message TBackgroundCompactionConfig {
Expand Down
1 change: 1 addition & 0 deletions ydb/core/protos/feature_flags.proto
Original file line number Diff line number Diff line change
Expand Up @@ -242,4 +242,5 @@ message TFeatureFlags {
optional bool UseYdsTopicStorageMetering = 220 [default = false];
optional bool EnableFsBackups = 222 [default = false];
optional bool EnableResourcePoolsScheduler = 224 [default = true]; // works only with EnableResourcePools = true
optional bool EnableConditionalEraseResponseBatching = 229 [default = false];
}
44 changes: 44 additions & 0 deletions ydb/core/protos/schemeshard_config.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import "ydb/core/protos/counters_schemeshard.proto";

package NKikimrConfig;
option java_package = "ru.yandex.kikimr.proto";

message TSchemeShardConfig {
message TInFlightCounterConfig {
optional NKikimr.NSchemeShard.ESimpleCounters Type = 1;
// after this amount scheme shard begin to abort the operations
// to disable set to 0
optional uint32 InFlightLimit = 2 [default = 10000];
}
// after this amount of time we forcibly write full stats to local DB
// to disable set to 0
optional uint32 StatsBatchTimeoutMs = 1 [default = 100];

// number of shards stats to batch together
// to disable set to 0
optional uint32 StatsMaxBatchSize = 2 [default = 100];

optional uint32 StatsMaxExecuteMs = 3 [default = 10];

repeated TInFlightCounterConfig InFlightCounterConfig = 4;

// number of shards per table
optional uint32 MaxCdcInitialScanShardsInFlight = 5 [default = 32];

// number of shards per table
// 0 means default - NKikimrIndexBuilder.TIndexBuildSettings.max_shards_in_flight
optional uint32 MaxRestoreBuildIndexShardsInFlight = 6 [default = 1000];

// number of shards per table
// database level default for TTL mechanics
// 0 means no limit
optional uint32 MaxTTLShardsInFlight = 7 [default = 0];

// number of conditional erase responses to batch together
// 0 disables batching (processes each response immediately via non-batch path)
// 1 processes each response immediately via batch path (not recommended)
optional uint32 CondEraseResponseBatchSize = 8 [default = 100];

// maximum time to hold an incomplete conditional erase response batch before processing
optional uint32 CondEraseResponseBatchMaxTimeMs = 9 [default = 100];
}
1 change: 1 addition & 0 deletions ydb/core/protos/ya.make
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ SRCS(
scheme_log.proto
scheme_type_metadata.proto
scheme_type_operation.proto
schemeshard_config.proto
serverless_proxy_config.proto
shared_cache.proto
sqs.proto
Expand Down
1 change: 1 addition & 0 deletions ydb/core/testlib/actors/test_runtime.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <ydb/core/protos/key.pb.h>
#include <ydb/core/protos/netclassifier.pb.h>
#include <ydb/core/protos/pqconfig.pb.h>
#include <ydb/core/protos/schemeshard_config.pb.h>
#include <ydb/core/protos/stream.pb.h>
#include <ydb/core/protos/workload_manager_config.pb.h>

Expand Down
1 change: 1 addition & 0 deletions ydb/core/testlib/basics/appdata.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <ydb/core/protos/blobstorage.pb.h>
#include <ydb/core/protos/config.pb.h>
#include <ydb/core/protos/datashard_config.pb.h>
#include <ydb/core/protos/schemeshard_config.pb.h>
#include <ydb/core/protos/kqp.pb.h>
#include <ydb/core/protos/pqconfig.pb.h>
#include <ydb/core/protos/resource_broker.pb.h>
Expand Down
Loading
Loading