From 3503d81d9b5eed94eb6f060648c18436b790479b Mon Sep 17 00:00:00 2001 From: Michal Mielewczyk Date: Tue, 27 Apr 2021 09:54:59 +0200 Subject: [PATCH] tests: fix trim eviction test Consider IO to metadata as vaild Signed-off-by: Michal Mielewczyk --- .../tests/io/trim/test_trim_eviction.py | 36 ++++++++++++++++--- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/test/functional/tests/io/trim/test_trim_eviction.py b/test/functional/tests/io/trim/test_trim_eviction.py index 2c626f1..3915d23 100644 --- a/test/functional/tests/io/trim/test_trim_eviction.py +++ b/test/functional/tests/io/trim/test_trim_eviction.py @@ -5,11 +5,11 @@ import os import pytest -from api.cas import casadm +from api.cas import casadm, ioclass_config from api.cas.cache_config import CacheMode, CacheLineSize, CleaningPolicy from core.test_run import TestRun from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan -from test_tools import fs_utils +from test_tools import fs_utils, disk_utils from test_tools.ddrescue import Ddrescue from test_tools.disk_utils import Filesystem from test_utils import os_utils @@ -44,6 +44,8 @@ def test_trim_eviction(cache_mode, cache_line_size, filesystem, cleaning): core_disk.create_partitions([Size(1, Unit.GibiByte)]) core_dev = core_disk.partitions[0] + cache_block_size = disk_utils.get_block_size(cache_disk) + with TestRun.step("Start cache on device supporting trim and add core."): cache = casadm.start_cache(cache_dev, cache_mode, cache_line_size) cache.set_cleaning_policy(cleaning) @@ -54,12 +56,25 @@ def test_trim_eviction(cache_mode, cache_line_size, filesystem, cleaning): core.create_filesystem(filesystem) core.mount(mount_point, ["discard"]) + with TestRun.step("Create ioclass config."): + ioclass_config.create_ioclass_config() + ioclass_config.add_ioclass( + ioclass_id=1, eviction_priority=1, allocation="0.00", rule=f"metadata" + ) + casadm.load_io_classes( + cache_id=cache.cache_id, file=ioclass_config.default_config_file_path + ) + with TestRun.step("Create random file using ddrescue."): test_file = fs_utils.create_random_test_file(test_file_path, core_dev.size * 0.9) create_file_with_ddrescue(core_dev, test_file) + os_utils.sync() + os_utils.drop_caches() with TestRun.step("Remove file and create a new one."): cache_iostats_before = cache_dev.get_io_stats() + data_reads_before = cache.get_io_class_statistics(io_class_id=0).block_stats.cache.reads + metadata_reads_before = cache.get_io_class_statistics(io_class_id=1).block_stats.cache.reads test_file.remove() os_utils.sync() os_utils.drop_caches() @@ -67,12 +82,23 @@ def test_trim_eviction(cache_mode, cache_line_size, filesystem, cleaning): with TestRun.step("Check using iostat that reads from cache did not occur."): cache_iostats_after = cache_dev.get_io_stats() + data_reads_after = cache.get_io_class_statistics(io_class_id=0).block_stats.cache.reads + metadata_reads_after = cache.get_io_class_statistics(io_class_id=1).block_stats.cache.reads reads_before = cache_iostats_before.sectors_read reads_after = cache_iostats_after.sectors_read - if reads_after != reads_before: - TestRun.fail(f"Number of reads from cache before and after removing test file " - f"differs. Reads before: {reads_before}, reads after: {reads_after}.") + metadata_reads_diff = metadata_reads_after - metadata_reads_before + data_reads_diff = data_reads_after - data_reads_before + iostat_diff = (reads_after - reads_before) * cache_block_size + + if iostat_diff > int(metadata_reads_diff) or int(data_reads_diff) > 0: + TestRun.fail( + f"Number of reads from cache before and after removing test file " + f"differs. Sectors read before: {reads_before}, sectors read after: {reads_after}." + f"Data read from cache before {data_reads_before}, after {data_reads_after}." + f"Metadata read from cache before {metadata_reads_before}, " + f"after {metadata_reads_after}." + ) else: TestRun.LOGGER.info( "Number of reads from cache before and after removing test file is the same.")