|
9 | 9 |
|
10 | 10 | from hamcrest import assert_that, equal_to, greater_than, not_none
|
11 | 11 |
|
| 12 | +from ydb.core.protos import config_pb2 |
12 | 13 | from ydb.tests.library.common.msgbus_types import MessageBusStatus
|
13 | 14 | from ydb.tests.library.common.protobuf_ss import AlterTableRequest
|
14 | 15 | from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
|
@@ -327,29 +328,37 @@ def test_storage_counters(self, ydb_cluster, ydb_database, ydb_client_session):
|
327 | 328 | insert_data(session, table)
|
328 | 329 | check_disk_quota_exceedance(client, database_path, retries=10, sleep_duration=5)
|
329 | 330 |
|
| 331 | + set_feature_flags = ydb_cluster.config.yaml_config["feature_flags"] |
| 332 | + default_feature_flags = config_pb2.TAppConfig().FeatureFlags |
| 333 | + btree_index_feature_flag = ( |
| 334 | + set_feature_flags["enable_local_dbbtree_index"] |
| 335 | + if "enable_local_dbbtree_index" in set_feature_flags |
| 336 | + else default_feature_flags.EnableLocalDBBtreeIndex |
| 337 | + ) |
330 | 338 | usage = describe(client, table).PathDescription.TableStats.StoragePools.PoolsUsage
|
331 | 339 | assert len(usage) == 2
|
332 | 340 | assert json_format.MessageToDict(usage[0], preserving_proto_field_name=True) == {
|
333 | 341 | "PoolKind": "hdd",
|
334 | 342 | "DataSize": "50",
|
335 |
| - "IndexSize": "0", |
| 343 | + "IndexSize": "0" if btree_index_feature_flag else "82", |
336 | 344 | }
|
337 | 345 | assert json_format.MessageToDict(usage[1], preserving_proto_field_name=True) == {
|
338 | 346 | "PoolKind": "hdd1",
|
339 | 347 | "DataSize": "71",
|
340 | 348 | "IndexSize": "0",
|
341 | 349 | }
|
| 350 | + used_bytes_by_tables = 121 if btree_index_feature_flag else 203 |
342 | 351 |
|
343 | 352 | # Note: .hdd counter aggregates usage across all storage pool kinds with prefix "hdd", i.e. "hdd" and "hdd1"
|
344 | 353 | check_counters(
|
345 | 354 | slot_mon_port,
|
346 | 355 | {
|
347 |
| - "resources.storage.used_bytes": 121, |
| 356 | + "resources.storage.used_bytes": used_bytes_by_tables, |
348 | 357 | "resources.storage.used_bytes.ssd": 0,
|
349 |
| - "resources.storage.used_bytes.hdd": 121, |
350 |
| - "resources.storage.table.used_bytes": 121, |
| 358 | + "resources.storage.used_bytes.hdd": used_bytes_by_tables, |
| 359 | + "resources.storage.table.used_bytes": used_bytes_by_tables, |
351 | 360 | "resources.storage.table.used_bytes.ssd": 0,
|
352 |
| - "resources.storage.table.used_bytes.hdd": 121, |
| 361 | + "resources.storage.table.used_bytes.hdd": used_bytes_by_tables, |
353 | 362 | },
|
354 | 363 | retries=60,
|
355 | 364 | sleep_duration=5,
|
|
0 commit comments