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

[Configs Refactor] Split protobufs #1863

Merged
merged 2 commits into from
Feb 12, 2024
Merged

[Configs Refactor] Split protobufs #1863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba8b6ba
split proto files
Enjection Feb 12, 2024
f920f1e
fix
Enjection Feb 12, 2024
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
67 changes: 67 additions & 0 deletions ydb/core/protos/bootstrap.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
import "ydb/core/protos/compile_service_config.proto";
import "ydb/core/protos/flat_scheme_op.proto";
import "ydb/core/protos/node_limits.proto";
import "ydb/core/protos/resource_broker.proto";
import "ydb/core/protos/shared_cache.proto";
import "ydb/core/protos/tablet.proto";
import "ydb/core/protos/tablet_database.proto";

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

message TBootstrap {
enum ETabletType {
TX_DUMMY = 0;

HIVE = 1;

TX_COORDINATOR = 10;
TX_MEDIATOR = 11;
TX_PROXY = 12;
FLAT_TX_COORDINATOR = 13;
FLAT_HIVE = 14;
FLAT_BS_CONTROLLER = 15;
FLAT_TX_PROXY = 17;
TX_ALLOCATOR = 18;

BS_DOMAINCONTROLLER = 20;

SCHEMESHARD = 30;
DATASHARD = 31;
FLAT_SCHEMESHARD = 32;
KEYVALUEFLAT = 33;

JOBRUNNER_POOL_MANAGER = 40;
FLAT_JOBRUNNER_POOL_MANAGER = 41;

CMS = 51;
NODE_BROKER = 52;

TENANT_SLOT_BROKER = 53;
CONSOLE = 54;

FAKE_DATASHARD = 700;
}

message TTablet {
optional ETabletType Type = 1;
repeated uint32 Node = 2;
optional NKikimrTabletBase.TTabletStorageInfo Info = 3;
optional bool StandBy = 4;
optional uint64 WatchThreshold = 5;
optional bool StartFollowers = 6;
optional bool AllowDynamicConfiguration = 7 [default = false];
}

repeated TTablet Tablet = 1;

optional uint64 ProxySchemeCacheNodes = 2;
optional uint64 ProxySchemeCacheDistNodes = 3;
optional NKikimrTablet.TCompactionBroker CompactionBroker = 4;
optional NKikimrNodeLimits.TNodeLimitsConfig NodeLimits = 5;
optional NKikimrResourceBroker.TResourceBrokerConfig ResourceBroker = 6;
optional NKikimrSharedCache.TSharedCacheConfig SharedCacheConfig = 7;
repeated NKikimrSchemeOp.TResourceProfile ResourceProfiles = 8;
optional TCompileServiceConfig CompileServiceConfig = 9; //may be need special file with resource limits?
optional bool EnableIntrospection = 10;
}
6 changes: 6 additions & 0 deletions ydb/core/protos/compile_service_config.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package NKikimrConfig;
option java_package = "ru.yandex.kikimr.proto";

message TCompileServiceConfig {
optional uint32 InflightLimit = 1 [default = 100000];
}
64 changes: 1 addition & 63 deletions ydb/core/protos/config.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import "ydb/core/protos/blobstorage.proto";
import "ydb/core/protos/blobstorage_config.proto";
import "ydb/core/protos/blobstorage_pdisk_config.proto";
import "ydb/core/protos/blobstorage_vdisk_config.proto";
import "ydb/core/protos/bootstrap.proto";
import "ydb/core/protos/cms.proto";
import "ydb/core/protos/config_units.proto";
import "ydb/core/protos/counters_schemeshard.proto";
Expand All @@ -21,14 +22,12 @@ import "ydb/core/protos/kqp.proto";
import "ydb/core/protos/local.proto";
import "ydb/core/protos/netclassifier.proto";
import "ydb/core/protos/node_broker.proto";
import "ydb/core/protos/node_limits.proto";
import "ydb/core/protos/pqconfig.proto";
import "ydb/core/protos/resource_broker.proto";
import "ydb/core/protos/shared_cache.proto";
import "ydb/core/protos/stream.proto";
import "ydb/core/protos/table_service_config.proto";
import "ydb/core/protos/tablet.proto";
import "ydb/core/protos/tablet_database.proto";
import "ydb/core/protos/tenant_pool.proto";
import "ydb/core/protos/tenant_slot_broker.proto";
import "ydb/library/actors/protos/interconnect.proto";
Expand Down Expand Up @@ -338,67 +337,6 @@ message TLogConfig {
optional bool IgnoreUnknownComponents = 15 [default = true];
}

message TCompileServiceConfig {
optional uint32 InflightLimit = 1 [default = 100000];
}

message TBootstrap {
enum ETabletType {
TX_DUMMY = 0;

HIVE = 1;

TX_COORDINATOR = 10;
TX_MEDIATOR = 11;
TX_PROXY = 12;
FLAT_TX_COORDINATOR = 13;
FLAT_HIVE = 14;
FLAT_BS_CONTROLLER = 15;
FLAT_TX_PROXY = 17;
TX_ALLOCATOR = 18;

BS_DOMAINCONTROLLER = 20;

SCHEMESHARD = 30;
DATASHARD = 31;
FLAT_SCHEMESHARD = 32;
KEYVALUEFLAT = 33;

JOBRUNNER_POOL_MANAGER = 40;
FLAT_JOBRUNNER_POOL_MANAGER = 41;

CMS = 51;
NODE_BROKER = 52;

TENANT_SLOT_BROKER = 53;
CONSOLE = 54;

FAKE_DATASHARD = 700;
}

message TTablet {
optional ETabletType Type = 1;
repeated uint32 Node = 2;
optional NKikimrTabletBase.TTabletStorageInfo Info = 3;
optional bool StandBy = 4;
optional uint64 WatchThreshold = 5;
optional bool StartFollowers = 6;
optional bool AllowDynamicConfiguration = 7 [default = false];
}

repeated TTablet Tablet = 1;

optional uint64 ProxySchemeCacheNodes = 2;
optional uint64 ProxySchemeCacheDistNodes = 3;
optional NKikimrTablet.TCompactionBroker CompactionBroker = 4;
optional NKikimrNodeLimits.TNodeLimitsConfig NodeLimits = 5;
optional NKikimrResourceBroker.TResourceBrokerConfig ResourceBroker = 6;
optional NKikimrSharedCache.TSharedCacheConfig SharedCacheConfig = 7;
repeated NKikimrSchemeOp.TResourceProfile ResourceProfiles = 8;
optional TCompileServiceConfig CompileServiceConfig = 9; //may be need special file with resource limits?
optional bool EnableIntrospection = 10;
}

message TInterconnectConfig {
message TChannel {
optional uint32 Index = 1;
Expand Down
50 changes: 26 additions & 24 deletions ydb/core/protos/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,72 +8,80 @@ ENDIF()

SRCS(
alloc.proto
auth.proto
base.proto
bind_channel_storage_pool.proto
blob_depot.proto
blob_depot_config.proto
blobstorage.proto
blobstorage_base.proto
blobstorage_base3.proto
blobstorage_config.proto
blobstorage_disk.proto
blobstorage_disk_color.proto
blobstorage_distributed_config.proto
blobstorage_pdisk_config.proto
blobstorage_vdisk_config.proto
blobstorage_vdisk_internal.proto
blobstorage_config.proto
blockstore_config.proto
datashard_config.proto
db_metadata_cache.proto
feature_flags.proto
filestore_config.proto
bootstrap.proto
bootstrapper.proto
change_exchange.proto
channel_purpose.proto
cms.proto
compile_service_config.proto
config.proto
config_units.proto
console.proto
console_base.proto
console_config.proto
console_tenant.proto
counters_tx_allocator.proto
counters.proto
counters_blob_depot.proto
counters_bs_controller.proto
counters_cms.proto
counters_coordinator.proto
counters_columnshard.proto
counters_coordinator.proto
counters_datashard.proto
counters_hive.proto
counters_kesus.proto
counters_keyvalue.proto
counters_mediator.proto
counters_pq.proto
counters_replication.proto
counters_schemeshard.proto
counters_sequenceshard.proto
counters_statistics_aggregator.proto
counters_sysview_processor.proto
counters_testshard.proto
counters_tx_allocator.proto
counters_tx_proxy.proto
counters_mediator.proto
counters.proto
database_basic_sausage_metainfo.proto
data_events.proto
database_basic_sausage_metainfo.proto
datashard_config.proto
datashard_load.proto
db_metadata_cache.proto
drivemodel.proto
export.proto
external_sources.proto
flat_tx_scheme.proto
feature_flags.proto
filestore_config.proto
flat_scheme_op.proto
flat_tx_scheme.proto
follower_group.proto
grpc.proto
grpc_pq_old.proto
grpc_status_proxy.proto
health.proto
hive.proto
http_config.proto
import.proto
index_builder.proto
kesus.proto
key.proto
kqp.proto
kqp_physical.proto
kqp_stats.proto
kqp.proto
labeled_counters.proto
load_test.proto
local.proto
Expand All @@ -89,22 +97,27 @@ SRCS(
netclassifier.proto
node_broker.proto
node_limits.proto
node_whiteboard.proto
pdiskfit.proto
pqconfig.proto
profiler.proto
query_stats.proto
replication.proto
resource_broker.proto
scheme_board.proto
scheme_board_mon.proto
scheme_log.proto
scheme_type_metadata.proto
scheme_type_operation.proto
serverless_proxy_config.proto
shared_cache.proto
sqs.proto
follower_group.proto
ssa.proto
statestorage.proto
statistics.proto
stream.proto
subdomains.proto
sys_view.proto
table_service_config.proto
table_stats.proto
tablet.proto
Expand All @@ -118,26 +131,15 @@ SRCS(
tenant_slot_broker.proto
test_shard.proto
tracing.proto
node_whiteboard.proto
tx.proto
tx_columnshard.proto
tx_datashard.proto
tx_mediator_timecast.proto
tx_proxy.proto
tx_scheme.proto
tx_sequenceshard.proto
pdiskfit.proto
pqconfig.proto
auth.proto
key.proto
grpc.proto
grpc_pq_old.proto
grpc_status_proxy.proto
ydb_result_set_old.proto
ydb_table_impl.proto
scheme_board.proto
scheme_board_mon.proto
sys_view.proto
)

GENERATE_ENUM_SERIALIZATION(blobstorage_pdisk_config.pb.h)
Expand Down
Loading