Skip to content

Commit 41ce5c8

Browse files
authored
Fix test_db_counters test (#6436)
1 parent 6353290 commit 41ce5c8

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

ydb/tests/functional/tenants/test_db_counters.py

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
from hamcrest import assert_that, equal_to, greater_than, not_none
1111

12+
from ydb.core.protos import config_pb2
1213
from ydb.tests.library.common.msgbus_types import MessageBusStatus
1314
from ydb.tests.library.common.protobuf_ss import AlterTableRequest
1415
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):
327328
insert_data(session, table)
328329
check_disk_quota_exceedance(client, database_path, retries=10, sleep_duration=5)
329330

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+
)
330338
usage = describe(client, table).PathDescription.TableStats.StoragePools.PoolsUsage
331339
assert len(usage) == 2
332340
assert json_format.MessageToDict(usage[0], preserving_proto_field_name=True) == {
333341
"PoolKind": "hdd",
334342
"DataSize": "50",
335-
"IndexSize": "0",
343+
"IndexSize": "0" if btree_index_feature_flag else "82",
336344
}
337345
assert json_format.MessageToDict(usage[1], preserving_proto_field_name=True) == {
338346
"PoolKind": "hdd1",
339347
"DataSize": "71",
340348
"IndexSize": "0",
341349
}
350+
used_bytes_by_tables = 121 if btree_index_feature_flag else 203
342351

343352
# Note: .hdd counter aggregates usage across all storage pool kinds with prefix "hdd", i.e. "hdd" and "hdd1"
344353
check_counters(
345354
slot_mon_port,
346355
{
347-
"resources.storage.used_bytes": 121,
356+
"resources.storage.used_bytes": used_bytes_by_tables,
348357
"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,
351360
"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,
353362
},
354363
retries=60,
355364
sleep_duration=5,

0 commit comments

Comments
 (0)