diff --git a/autotest.sh b/autotest.sh index c501f61d4..75425f8e0 100755 --- a/autotest.sh +++ b/autotest.sh @@ -187,7 +187,8 @@ if [ $SPDK_TEST_LVOL -eq 1 ]; then timing_enter lvol test_cases="1,50,51,52,53,100,101,102,150,200,201,250,251,252,253,254,255," test_cases+="300,301,450,451,452,550,600,601,650,651,652,654,655," - test_cases+="700,701,750,751,752,753,754,755,800,801,802,803,804,10000" + test_cases+="700,701,750,751,752,753,754,755,757," + test_cases+="800,801,802,803,804,10000" run_test ./test/lvol/lvol.sh --test-cases=$test_cases report_test_completion "lvol" timing_exit lvol diff --git a/test/lvol/lvol.sh b/test/lvol/lvol.sh index 6bb88f245..b52ce6eaf 100755 --- a/test/lvol/lvol.sh +++ b/test/lvol/lvol.sh @@ -64,6 +64,7 @@ function usage() { 753: 'snapshot_of_snapshot', 754: 'clone_bdev_only', 755: 'clone_writing_clone', + 757: 'clone_inflate', 800: 'rename_positive', 801: 'rename_lvs_nonexistent', 802: 'rename_lvs_EEXIST', diff --git a/test/lvol/rpc_commands_lib.py b/test/lvol/rpc_commands_lib.py index dd37e6d10..0f9cc36c9 100644 --- a/test/lvol/rpc_commands_lib.py +++ b/test/lvol/rpc_commands_lib.py @@ -215,3 +215,8 @@ class Commands_Rpc(object): print("INFO: RPC COMMAND clone_lvol_bdev") output, rc = self.rpc.clone_lvol_bdev(snapshot_name, clone_name) return rc + + def inflate_lvol_bdev(self, clone_name): + print("INFO: RPC COMMAND inflate_lvol_bdev") + output, rc = self.rpc.inflate_lvol_bdev(clone_name) + return rc diff --git a/test/lvol/test_cases.py b/test/lvol/test_cases.py index 6acef4aa1..a97b40325 100644 --- a/test/lvol/test_cases.py +++ b/test/lvol/test_cases.py @@ -133,6 +133,7 @@ def case_message(func): 753: 'snapshot_of_snapshot', 754: 'clone_bdev_only', 755: 'clone_writing_clone', + 757: 'clone_inflate', 800: 'rename_positive', 801: 'rename_lvs_nonexistent', 802: 'rename_lvs_EEXIST', @@ -1617,6 +1618,97 @@ class TestCases(object): return fail_count @case_message + def test_case757(self): + """ + clone_inflate + + + Test inflate rpc method + """ + fail_count = 0 + snapshot_name = "snapshot" + nbd_name = "/dev/nbd0" + + # Create malloc bdev + base_name = self.c.construct_malloc_bdev(self.total_size, + self.block_size) + + # Create lvol store + uuid_store = self.c.construct_lvol_store(base_name, + self.lvs_name, + self.cluster_size) + fail_count += self.c.check_get_lvol_stores(base_name, uuid_store, + self.cluster_size) + lvs = self.c.get_lvol_stores() + size = int(int(lvs[0][u'free_clusters'] * lvs[0]['cluster_size']) / 4 / MEGABYTE) + + # Construct thick provisioned lvol bdev + uuid_bdev0 = self.c.construct_lvol_bdev(uuid_store, + self.lbd_name, size, thin=False) + lvol_bdev = self.c.get_lvol_bdev_with_name(uuid_bdev0) + + # Fill bdev with data of knonw pattern + fail_count += self.c.start_nbd_disk(lvol_bdev['name'], nbd_name) + fill_size = size * MEGABYTE + fail_count += self.run_fio_test(nbd_name, 0, fill_size, "write", "0xcc", 0) + self.c.stop_nbd_disk(nbd_name) + + # Create snapshot of thick provisioned lvol bdev + fail_count += self.c.snapshot_lvol_bdev(lvol_bdev['name'], snapshot_name) + snapshot_bdev = self.c.get_lvol_bdev_with_name(self.lvs_name + "/" + snapshot_name) + + # Create two clones of created snapshot + lvol_clone = self.c.get_lvol_bdev_with_name(self.lvs_name + "/" + self.lbd_name) + if lvol_clone['driver_specific']['lvol']['thin_provision'] is not True: + fail_count += 1 + + # Fill part of clone with data of known pattern + fail_count += self.c.start_nbd_disk(lvol_clone['name'], nbd_name) + first_fill = 0 + second_fill = int(size * 3 / 4) + fail_count += self.run_fio_test(nbd_name, first_fill * MEGABYTE, + MEGABYTE, "write", "0xdd", 0) + fail_count += self.run_fio_test(nbd_name, second_fill * MEGABYTE, + MEGABYTE, "write", "0xdd", 0) + self.c.stop_nbd_disk(nbd_name) + + # Do inflate + fail_count += self.c.inflate_lvol_bdev(lvol_clone['name']) + lvol_clone = self.c.get_lvol_bdev_with_name(self.lvs_name + "/" + self.lbd_name) + if lvol_clone['driver_specific']['lvol']['thin_provision'] is not False: + fail_count += 1 + + # Delete snapshot + fail_count += self.c.delete_bdev(snapshot_bdev['name']) + + # Check data consistency + fail_count += self.c.start_nbd_disk(lvol_clone['name'], nbd_name) + fail_count += self.run_fio_test(nbd_name, first_fill * MEGABYTE, + MEGABYTE, "read", "0xdd") + fail_count += self.run_fio_test(nbd_name, (first_fill + 1) * MEGABYTE, + (second_fill - first_fill - 1) * MEGABYTE, + "read", "0xcc") + fail_count += self.run_fio_test(nbd_name, (second_fill) * MEGABYTE, + MEGABYTE, "read", "0xdd") + fail_count += self.run_fio_test(nbd_name, (second_fill + 1) * MEGABYTE, + (size - second_fill - 1) * MEGABYTE, + "read", "0xcc") + self.c.stop_nbd_disk(nbd_name) + + # Destroy lvol bdev + fail_count += self.c.delete_bdev(lvol_bdev['name']) + + # Destroy lvol store + fail_count += self.c.destroy_lvol_store(uuid_store) + + # Delete malloc + fail_count += self.c.delete_bdev(base_name) + + # Expected result: + # - calls successful, return code = 0 + # - no other operation fails + return fail_count + def test_case800(self): fail_count = 0