Skip to content

Commit b61d000

Browse files
mregrockmregrock
authored
Add top-level storage_pool_types declaration (#18067)
1 parent c64b2e2 commit b61d000

File tree

47 files changed

+10622
-94
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+10622
-94
lines changed

‎ydb/library/yaml_config/core_constants.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ constexpr inline TStringBuf GROUP_PATH = "/blob_storage_config/service_set/group
1717
constexpr inline TStringBuf DISABLE_BUILTIN_SECURITY_PATH = "/domains_config/disable_builtin_security";
1818
constexpr inline TStringBuf DEFAULT_GROUPS_PATH = "/domains_config/default_groups";
1919
constexpr inline TStringBuf DEFAULT_ACCESS_PATH = "/domains_config/default_access";
20-
constexpr inline TStringBuf POOL_CONFIG_PATH = "/domains_config/domains/*/storage_pool_types/*/pool_config";
20+
constexpr inline TStringBuf POOL_CONFIG_PATH = "/domains_config/domain/*/storage_pool_types/*/pool_config";
2121

2222
constexpr inline TStringBuf ERASURE_SPECIES_FIELD = "erasure_species";
2323

‎ydb/library/yaml_config/protos/config.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ message TEphemeralInputFields {
158158
optional TTls Tls = 8;
159159
optional FailDomainKind FailDomainType = 9 [default = Rack];
160160
optional TDomainsConfig.TSecurityConfig SecurityConfig = 10;
161+
repeated TDomainsConfig.TStoragePoolType StoragePoolTypes = 11;
161162

162163
enum FailDomainKind {
163164
Rack = 0;

‎ydb/library/yaml_config/ut_transform/canondata/result.json

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,64 @@
103103
"uri": "file://test_transform.TestYamlConfigTransformations.test_basic_args1-dump_ds_init_/block-4-2.yaml.result.json"
104104
}
105105
],
106+
"test_transform.TestYamlConfigTransformations.test_domains_config[dump]": [
107+
{
108+
"uri": "file://test_transform.TestYamlConfigTransformations.test_domains_config_dump_/storage-pool-types.yaml.result.json"
109+
},
110+
{
111+
"uri": "file://test_transform.TestYamlConfigTransformations.test_domains_config_dump_/storage-pool-types-distconf.yaml.result.json"
112+
},
113+
{
114+
"uri": "file://test_transform.TestYamlConfigTransformations.test_domains_config_dump_/multinode-valid.yaml.result.json"
115+
},
116+
{
117+
"uri": "file://test_transform.TestYamlConfigTransformations.test_domains_config_dump_/multinode-unmatched-types.yaml.result.json"
118+
},
119+
{
120+
"uri": "file://test_transform.TestYamlConfigTransformations.test_domains_config_dump_/multinode-storage-pool.yaml.result.json"
121+
},
122+
{
123+
"uri": "file://test_transform.TestYamlConfigTransformations.test_domains_config_dump_/multinode-storage-pool-distconf.yaml.result.json"
124+
},
125+
{
126+
"uri": "file://test_transform.TestYamlConfigTransformations.test_domains_config_dump_/multinode-missing-types.yaml.result.json"
127+
},
128+
{
129+
"uri": "file://test_transform.TestYamlConfigTransformations.test_domains_config_dump_/multinode-missing-all.yaml.result.json"
130+
},
131+
{
132+
"uri": "file://test_transform.TestYamlConfigTransformations.test_domains_config_dump_/domains-config.yaml.result.json"
133+
}
134+
],
135+
"test_transform.TestYamlConfigTransformations.test_domains_config[dump_ds_init]": [
136+
{
137+
"uri": "file://test_transform.TestYamlConfigTransformations.test_domains_config_dump_ds_init_/storage-pool-types.yaml.result.json"
138+
},
139+
{
140+
"uri": "file://test_transform.TestYamlConfigTransformations.test_domains_config_dump_ds_init_/storage-pool-types-distconf.yaml.result.json"
141+
},
142+
{
143+
"uri": "file://test_transform.TestYamlConfigTransformations.test_domains_config_dump_ds_init_/multinode-valid.yaml.result.json"
144+
},
145+
{
146+
"uri": "file://test_transform.TestYamlConfigTransformations.test_domains_config_dump_ds_init_/multinode-unmatched-types.yaml.result.json"
147+
},
148+
{
149+
"uri": "file://test_transform.TestYamlConfigTransformations.test_domains_config_dump_ds_init_/multinode-storage-pool.yaml.result.json"
150+
},
151+
{
152+
"uri": "file://test_transform.TestYamlConfigTransformations.test_domains_config_dump_ds_init_/multinode-storage-pool-distconf.yaml.result.json"
153+
},
154+
{
155+
"uri": "file://test_transform.TestYamlConfigTransformations.test_domains_config_dump_ds_init_/multinode-missing-types.yaml.result.json"
156+
},
157+
{
158+
"uri": "file://test_transform.TestYamlConfigTransformations.test_domains_config_dump_ds_init_/multinode-missing-all.yaml.result.json"
159+
},
160+
{
161+
"uri": "file://test_transform.TestYamlConfigTransformations.test_domains_config_dump_ds_init_/domains-config.yaml.result.json"
162+
}
163+
],
106164
"test_transform.TestYamlConfigTransformations.test_simplified[dump]": [
107165
{
108166
"uri": "file://test_transform.TestYamlConfigTransformations.test_simplified_dump_/single-node-with-file.yaml.result.json"
@@ -134,6 +192,12 @@
134192
{
135193
"uri": "file://test_transform.TestYamlConfigTransformations.test_simplified_dump_/disk.yaml.result.json"
136194
},
195+
{
196+
"uri": "file://test_transform.TestYamlConfigTransformations.test_simplified_dump_/disk-type-short.yaml.result.json"
197+
},
198+
{
199+
"uri": "file://test_transform.TestYamlConfigTransformations.test_simplified_dump_/disk-type-short-single.yaml.result.json"
200+
},
137201
{
138202
"uri": "file://test_transform.TestYamlConfigTransformations.test_simplified_dump_/block-4-2.yaml.result.json"
139203
}
@@ -169,6 +233,12 @@
169233
{
170234
"uri": "file://test_transform.TestYamlConfigTransformations.test_simplified_dump_ds_init_/disk.yaml.result.json"
171235
},
236+
{
237+
"uri": "file://test_transform.TestYamlConfigTransformations.test_simplified_dump_ds_init_/disk-type-short.yaml.result.json"
238+
},
239+
{
240+
"uri": "file://test_transform.TestYamlConfigTransformations.test_simplified_dump_ds_init_/disk-type-short-single.yaml.result.json"
241+
},
172242
{
173243
"uri": "file://test_transform.TestYamlConfigTransformations.test_simplified_dump_ds_init_/block-4-2.yaml.result.json"
174244
}

‎ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic_args0-dump_/nvme.yaml.result.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -587,17 +587,20 @@
587587
{
588588
"ErasureSpecies":"block-4-2",
589589
"PDiskCategory":2,
590-
"VDiskCategory":"Default"
590+
"VDiskCategory":"Default",
591+
"StoragePoolKind":"nvme"
591592
},
592593
{
593594
"ErasureSpecies":"block-4-2",
594595
"PDiskCategory":2,
595-
"VDiskCategory":"Default"
596+
"VDiskCategory":"Default",
597+
"StoragePoolKind":"nvme"
596598
},
597599
{
598600
"ErasureSpecies":"block-4-2",
599601
"PDiskCategory":2,
600-
"VDiskCategory":"Default"
602+
"VDiskCategory":"Default",
603+
"StoragePoolKind":"nvme"
601604
}
602605
]
603606
}

‎ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic_args1-dump_/nvme.yaml.result.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -592,17 +592,20 @@
592592
{
593593
"ErasureSpecies":"block-4-2",
594594
"PDiskCategory":2,
595-
"VDiskCategory":"Default"
595+
"VDiskCategory":"Default",
596+
"StoragePoolKind":"nvme"
596597
},
597598
{
598599
"ErasureSpecies":"block-4-2",
599600
"PDiskCategory":2,
600-
"VDiskCategory":"Default"
601+
"VDiskCategory":"Default",
602+
"StoragePoolKind":"nvme"
601603
},
602604
{
603605
"ErasureSpecies":"block-4-2",
604606
"PDiskCategory":2,
605-
"VDiskCategory":"Default"
607+
"VDiskCategory":"Default",
608+
"StoragePoolKind":"nvme"
606609
}
607610
]
608611
}

‎ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic_args1-dump_ds_init_/nvme.yaml.result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"error": true, "stderr": "Terminating due to uncaught exception 0x59e3f140410 what() -> \"ydb/library/yaml_config/deprecated/yaml_config_parser.cpp:855: Specify host_configs to use blobstorage init command\"\n of type TWithBackTrace<yexception>\n"}
1+
{"error": true, "stderr": "Terminating due to uncaught exception REDACTED what() -> \"ydb/library/yaml_config/deprecated/yaml_config_parser.cpp:855: Specify host_configs to use blobstorage init command\"\n of type TWithBackTrace<yexception>\n"}

0 commit comments

Comments
 (0)