From 8e40543ee3b9bf45238cab5408ffec05c2186e14 Mon Sep 17 00:00:00 2001 From: Jeffrey Devloo Date: Mon, 29 May 2017 14:42:38 +0200 Subject: [PATCH] Add a clone after writing data --- ci/scenarios/vmachine/check_scrubbing_test/main.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ci/scenarios/vmachine/check_scrubbing_test/main.py b/ci/scenarios/vmachine/check_scrubbing_test/main.py index 72b8dc7..37af4fc 100644 --- a/ci/scenarios/vmachine/check_scrubbing_test/main.py +++ b/ci/scenarios/vmachine/check_scrubbing_test/main.py @@ -86,7 +86,7 @@ def start_test(cls): vdisks = created_vdisks['clones'] else: vdisks = created_vdisks['parents'] - stored_map = cls._prepare_for_scrubbing(vdisks, storagedriver, fio_bin_loc, is_ee) + stored_map = cls._prepare_for_scrubbing(vdisks, storagedriver, fio_bin_loc, is_ee, api) cls._validate_scrubbing(stored_map) finally: for vdisk_type, vdisk_list in created_vdisks.iteritems(): @@ -131,7 +131,7 @@ def _validate_scrubbing(vdisk_stored_mapper, amount_checks=MAX_SCRUBBING_CHECKS, raise RuntimeError(error_msg) @classmethod - def _prepare_for_scrubbing(cls, vdisks, storagedriver, fio_bin_location, is_ee): + def _prepare_for_scrubbing(cls, vdisks, storagedriver, fio_bin_location, is_ee, api): """ Writes data to the vdisks :param vdisks: list of vdisks @@ -152,6 +152,10 @@ def _prepare_for_scrubbing(cls, vdisks, storagedriver, fio_bin_location, is_ee): edge_configuration=edge_configuration, screen=False, loop_screen=False) + for vdisk in vdisks: # Snapshot to give the volumedriver a point of reference to scrub towards + VDiskSetup.create_snapshot(snapshot_name='{}_snapshot01'.format(vdisk.name), + vdisk_name=vdisk.name, + vpool_name=vdisk.vpool.name, api=api, consistent=False, sticky=False) stored_map = {} for vdisk in vdisks: stored_map[vdisk.guid] = vdisk.statistics['stored']