github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for io class file classification tests

Browse Source
This commit is contained in:
Katarzyna Lapinska 2020-01-29 12:11:53 +01:00
parent 7b0e8168d1
commit 80c1306ec4
3 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/functional/test-framework

@ -1 +1 @@
Subproject commit ffeb8fcf7c8dc4b7f160171b490f304da52ea30c Subproject commit 6afb2b5581e2646ff0344a00db9259a735e20536

7
test/functional/tests/io_class/io_class_common.py
View File

@ -5,8 +5,9 @@
from api.cas import casadm from api.cas import casadm
from api.cas import ioclass_config from api.cas import ioclass_config
from api.cas.cache_config import CacheMode, CleaningPolicy from api.cas.cache_config import CacheMode, CleaningPolicy, SeqCutOffPolicy
from core.test_run import TestRun from core.test_run import TestRun
from test_utils.os_utils import Udev
from test_utils.size import Size, Unit from test_utils.size import Size, Unit
ioclass_config_path = "/tmp/opencas_ioclass.conf" ioclass_config_path = "/tmp/opencas_ioclass.conf"
@ -26,11 +27,13 @@ def prepare():
TestRun.LOGGER.info(f"Starting cache") TestRun.LOGGER.info(f"Starting cache")
cache = casadm.start_cache(cache_device, cache_mode=CacheMode.WB, force=True) cache = casadm.start_cache(cache_device, cache_mode=CacheMode.WB, force=True)
Udev.disable()
TestRun.LOGGER.info(f"Setting cleaning policy to NOP") TestRun.LOGGER.info(f"Setting cleaning policy to NOP")
casadm.set_param_cleaning(cache_id=cache.cache_id, policy=CleaningPolicy.nop) casadm.set_param_cleaning(cache_id=cache.cache_id, policy=CleaningPolicy.nop)
TestRun.LOGGER.info(f"Adding core device") TestRun.LOGGER.info(f"Adding core device")
core = casadm.add_core(cache, core_dev=core_device) core = casadm.add_core(cache, core_dev=core_device)
core.set_seq_cutoff_policy(SeqCutOffPolicy.never)
ioclass_config.create_ioclass_config( ioclass_config.create_ioclass_config(
add_default_rule=False, ioclass_config_path=ioclass_config_path add_default_rule=False, ioclass_config_path=ioclass_config_path
) )

31
test/functional/tests/io_class/test_io_class_file.py
View File

@ -119,7 +119,10 @@ def test_ioclass_file_name_prefix():
core.create_filesystem(Filesystem.ext3) core.create_filesystem(Filesystem.ext3)
core.mount(mountpoint) core.mount(mountpoint)
assert previous_occupancy.get_value() <= cache.get_occupancy().get_value() current_occupancy = cache.get_occupancy()
if previous_occupancy.get_value() > current_occupancy.get_value():
TestRun.fail(f"Current occupancy ({str(current_occupancy)}) is lower "
f"than before ({str(previous_occupancy)}).")
# Filesystem creation caused metadata IO which is not supposed # Filesystem creation caused metadata IO which is not supposed
# to be cached # to be cached
@ -137,7 +140,10 @@ def test_ioclass_file_name_prefix():
dd.run() dd.run()
sync() sync()
current_occupancy = cache.get_occupancy() current_occupancy = cache.get_occupancy()
assert current_occupancy == previous_occupancy expected_occupancy = previous_occupancy + (dd_size * dd_count)
if current_occupancy != expected_occupancy:
TestRun.fail(f"Current occupancy value is not valid. "
f"(Expected: {str(expected_occupancy)}, actual: {str(current_occupancy)})")
previous_occupancy = current_occupancy previous_occupancy = current_occupancy
cache.flush_cache() cache.flush_cache()
@ -155,7 +161,10 @@ def test_ioclass_file_name_prefix():
dd.run() dd.run()
sync() sync()
current_occupancy = cache.get_occupancy() current_occupancy = cache.get_occupancy()
assert current_occupancy != previous_occupancy if current_occupancy != previous_occupancy:
TestRun.fail(f"Current occupancy value is not valid. "
f"(Expected: {str(previous_occupancy)}, actual: {str(current_occupancy)})")
@pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))
@pytest.mark.require_disk("core", DiskTypeLowerThan("cache")) @pytest.mark.require_disk("core", DiskTypeLowerThan("cache"))
@ -354,7 +363,7 @@ def test_ioclass_file_size(filesystem):
occupancy_after = cache.get_io_class_statistics( occupancy_after = cache.get_io_class_statistics(
io_class_id=ioclass_id).usage_stats.occupancy io_class_id=ioclass_id).usage_stats.occupancy
if occupancy_after != occupancy_before + size: if occupancy_after != occupancy_before + size:
pytest.xfail("File not cached properly!\n" TestRun.fail("File not cached properly!\n"
f"Expected {occupancy_before + size}\n" f"Expected {occupancy_before + size}\n"
f"Actual {occupancy_after}") f"Actual {occupancy_after}")
test_files.append(File(file_path).refresh_item()) test_files.append(File(file_path).refresh_item())
@ -371,8 +380,10 @@ def test_ioclass_file_size(filesystem):
Dd().input(file.full_path).output("/dev/null").block_size(file.size).run() Dd().input(file.full_path).output("/dev/null").block_size(file.size).run()
occupancy_after = cache.get_io_class_statistics( occupancy_after = cache.get_io_class_statistics(
io_class_id=ioclass_id).usage_stats.occupancy io_class_id=ioclass_id).usage_stats.occupancy
if occupancy_after != occupancy_before + file.size: actual_blocks = occupancy_after.get_value(Unit.Blocks4096)
pytest.xfail("File not reclassified properly!\n" expected_blocks = (occupancy_before + file.size).get_value(Unit.Blocks4096)
if actual_blocks != expected_blocks:
TestRun.fail("File not reclassified properly!\n"
f"Expected {occupancy_before + file.size}\n" f"Expected {occupancy_before + file.size}\n"
f"Actual {occupancy_after}") f"Actual {occupancy_after}")
sync() sync()
@ -397,7 +408,7 @@ def test_ioclass_file_size(filesystem):
Dd().input(file.full_path).output("/dev/null").block_size(file.size).run() Dd().input(file.full_path).output("/dev/null").block_size(file.size).run()
occupancy_after = cache.get_io_class_statistics(io_class_id=0).usage_stats.occupancy occupancy_after = cache.get_io_class_statistics(io_class_id=0).usage_stats.occupancy
if occupancy_after != occupancy_before + file.size: if occupancy_after != occupancy_before + file.size:
pytest.xfail("File not reclassified properly!\n" TestRun.fail("File not reclassified properly!\n"
f"Expected {occupancy_before + file.size}\n" f"Expected {occupancy_before + file.size}\n"
f"Actual {occupancy_after}") f"Actual {occupancy_after}")
occupancy_before = occupancy_after occupancy_before = occupancy_after
@ -420,7 +431,6 @@ def test_ioclass_file_size(filesystem):
load_file_size_io_classes() load_file_size_io_classes()
cache, core = prepare() cache, core = prepare()
Udev.disable()
base_size = Size(random.randint(50, 1000) * 2, Unit.Blocks4096) base_size = Size(random.randint(50, 1000) * 2, Unit.Blocks4096)
size_to_class = { size_to_class = {
base_size: 1, base_size: 1,
@ -448,4 +458,9 @@ def test_ioclass_file_size(filesystem):
remove_files_classification() remove_files_classification()
restore_classification_config() restore_classification_config()
# CAS device should be unmounted and mounted because data can be sometimes still cached by
# OS cache so occupancy statistics will not match
core.unmount()
core.mount(mountpoint)
reclassify_files() reclassify_files()