From e5c261bdffe069ff2b50b94f16d8dc3341d2657f Mon Sep 17 00:00:00 2001 From: Vitalii Koriakov Date: Thu, 9 Aug 2018 15:02:05 +0300 Subject: Fixes for test_replica3_to_arbiter Change-Id: Ib0f279fc03bbab23b458220db9ccd55b4b1bdcab Signed-off-by: Vitalii Koriakov --- .../brick_cases/test_replica3_to_arbiter.py | 122 +++++++-------------- 1 file changed, 39 insertions(+), 83 deletions(-) mode change 100644 => 100755 tests/functional/arbiter/brick_cases/test_replica3_to_arbiter.py (limited to 'tests') diff --git a/tests/functional/arbiter/brick_cases/test_replica3_to_arbiter.py b/tests/functional/arbiter/brick_cases/test_replica3_to_arbiter.py old mode 100644 new mode 100755 index 8d4130d1f..33e92e9ee --- a/tests/functional/arbiter/brick_cases/test_replica3_to_arbiter.py +++ b/tests/functional/arbiter/brick_cases/test_replica3_to_arbiter.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015-2016 Red Hat, Inc. +# Copyright (C) 2015-2018 Red Hat, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,11 +19,8 @@ from glusto.core import Glusto as g from glustolibs.gluster.gluster_base_class import (GlusterBaseClass, runs_on) from glustolibs.gluster.volume_libs import ( - log_volume_info_and_status, expand_volume, wait_for_volume_process_to_be_online, - verify_all_process_of_volume_are_online, shrink_volume) -from glustolibs.gluster.rebalance_ops import ( - rebalance_start, rebalance_status, wait_for_rebalance_to_complete) + verify_all_process_of_volume_are_online, shrink_volume, get_subvols) from glustolibs.gluster.exceptions import ExecutionError @@ -44,135 +41,94 @@ class GlusterArbiterVolumeTypeClass(GlusterBaseClass): cls.volume['voltype'] = { 'type': 'replicated', 'replica_count': 3, - 'dist_count': 3, 'transport': 'tcp'} def setUp(self): """ - - Setup Volume and Mount Volume + Setup Volume """ # Calling GlusterBaseClass setUpClass GlusterBaseClass.setUpClass.im_func(self) - # Setup Volume and Mount Volume - g.log.info("Starting to Setup Volume and Mount Volume") - ret = self.setup_volume_and_mount_volume(mounts=self.mounts) + # Setup Volume + g.log.info("Starting to Setup Volume") + ret = self.setup_volume() if not ret: - raise ExecutionError("Failed to Setup_Volume and Mount_Volume") - g.log.info("Successful in Setup Volume and Mount Volume") + raise ExecutionError("Failed to Setup_Volume") + g.log.info("Successful in Setup Volume") - def tearDown(self): + self.subvols = get_subvols(self.mnode, self.volname)['volume_subvols'] - # Unmount Volume and Cleanup Volume + def tearDown(self): + # Cleanup Volume g.log.info("Starting to Unmount Volume and Cleanup Volume") - ret = self.unmount_volume_and_cleanup_volume(mounts=self.mounts) + ret = self.cleanup_volume() if not ret: - raise ExecutionError("Failed to Unmount Volume and Cleanup Volume") - g.log.info("Successful in Unmount Volume and Cleanup Volume") + raise ExecutionError("Failed to Cleanup Volume") + g.log.info("Successful Cleanup Volume") # Calling GlusterBaseClass tearDown GlusterBaseClass.tearDown.im_func(self) + # Clearing bricks + for subvol in self.subvols: + for brick in subvol: + g.log.info('Clearing brick %s', brick) + node, brick_path = brick.split(':') + ret, _, err = g.run(node, 'rm -rf %s' % brick_path) + self.assertFalse(ret, err) + g.log.info('Clearing brick %s is successful', brick) + g.log.info('Clearing for all brick is successful') + def test_replicated_to_arbiter_volume(self): """ Description:- Reduce the replica count from replica 3 to arbiter """ # pylint: disable=too-many-statements - # Log Volume Info and Status - g.log.info("Logging volume info and Status") - ret = log_volume_info_and_status(self.mnode, self.volname) - self.assertTrue(ret, ("Logging volume info and status failed on " - "volume %s", self.volname)) - g.log.info("Successful in logging volume info and status of volume %s", - self.volname) - # Remove brick to reduce the replica count from replica 3 g.log.info("Removing bricks to form replica 2 volume") - subvol_num = 1 - replica_num = 1 - reduce_count = {'replica_count': 2, 'distribute_count': 1} - ret = shrink_volume(self.mnode, self.volname, subvol_num, - replica_num, force=True, **reduce_count) - self.assertTrue(ret, ("Logging volume info and status failed on " - "volume %s", self.volname)) - g.log.info("Successful in logging volume info and status of volume %s", - self.volname) - - # Log Volume Info and Status after changin - # replicate 3 to replica 2 - g.log.info("Logging volume info and Status after changing to " - "arbitered volume") - ret = log_volume_info_and_status(self.mnode, self.volname) - self.assertTrue(ret, ("Logging volume info and status failed on " - "volume %s", self.volname)) - g.log.info("Successful in logging volume info and status of volume %s", - self.volname) + ret = shrink_volume(self.mnode, self.volname, replica_num=0) + self.assertTrue(ret, "Failed to remove brick on volume %s" + % self.volname) + g.log.info("Successfully removed brick on volume %s", self.volname) # Wait for volume processes to be online g.log.info("Wait for volume processes to be online") ret = wait_for_volume_process_to_be_online(self.mnode, self.volname) - self.assertTrue(ret, ("Volume %s process not online despite waiting " - "for 300 seconds", self.volname)) + self.assertTrue(ret, "Volume %s process not online despite waiting " + "for 300 seconds" % self.volname) g.log.info("Successful in waiting for volume %s processes to be " "online", self.volname) # Verifying all bricks online g.log.info("Verifying volume's all process are online") ret = verify_all_process_of_volume_are_online(self.mnode, self.volname) - self.assertTrue(ret, ("Volume %s : All process are not online", - self.volname)) + self.assertTrue(ret, "Volume %s : All process are not online" + % self.volname) g.log.info("Volume %s : All process are online", self.volname) # Adding the bricks to make arbiter brick g.log.info("Adding bricks to convert to Arbiter Volume") - replica_arbiter = {'replica_count': 3, 'arbiter_count': 1} - ret = expand_volume(self.mnode, self.volname, self.servers[2:], + replica_arbiter = {'replica_count': 1, 'arbiter_count': 1} + ret = expand_volume(self.mnode, self.volname, self.servers, self.all_servers_info, add_to_hot_tier=False, **replica_arbiter) - self.assertTrue(ret, ("Failed to expand the volume %s", self.volname)) + self.assertTrue(ret, "Failed to expand the volume %s" % self.volname) g.log.info("Changing volume to arbiter volume is successful %s", self.volname) - # Log Volume Info and Status after expanding the volume - g.log.info("Logging volume info and Status after expanding volume") - ret = log_volume_info_and_status(self.mnode, self.volname) - self.assertTrue(ret, ("Logging volume info and status failed on " - "volume %s", self.volname)) - g.log.info("Successful in logging volume info and status of volume %s", - self.volname) - # Wait for volume processes to be online g.log.info("Wait for volume processes to be online") ret = wait_for_volume_process_to_be_online(self.mnode, self.volname) - self.assertTrue(ret, ("Failed to wait for volume %s processes to " - "be online", self.volname)) + self.assertTrue(ret, "Failed to wait for volume %s processes " + "to be online" % self.volname) g.log.info("Successful in waiting for volume %s processes to be " "online", self.volname) # Verify volume's all process are online g.log.info("Verifying volume's all process are online") ret = verify_all_process_of_volume_are_online(self.mnode, self.volname) - self.assertTrue(ret, ("Volume %s : All process are not online", - self.volname)) + self.assertTrue(ret, "Volume %s : All process are not online" + % self.volname) g.log.info("Volume %s : All process are online", self.volname) - - # Start Rebalance - g.log.info("Starting Rebalance on the volume") - ret, _, _ = rebalance_start(self.mnode, self.volname) - self.assertEqual(ret, 0, ("Failed to start rebalance on the volume " - "%s", self.volname)) - g.log.info("Successfully started rebalance on the volume %s", - self.volname) - - # Log Rebalance status - g.log.info("Log Rebalance status") - _, _, _ = rebalance_status(self.mnode, self.volname) - - # Wait for rebalance to complete - g.log.info("Waiting for rebalance to complete") - ret = wait_for_rebalance_to_complete(self.mnode, self.volname) - self.assertTrue(ret, ("Rebalance is not yet complete on the volume " - "%s", self.volname)) - g.log.info("Rebalance is successfully complete on the volume %s", - self.volname) -- cgit