summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShwethaHP <spandura@redhat.com>2017-08-30 16:51:46 +0530
committerNigel Babu <nigelb@redhat.com>2017-09-11 10:16:30 +0000
commitb118d38feeac276441f0e1647f6a093a1bb08763 (patch)
tree9e0208cddfa3f4de4526c31131682af8daa0e31f
parentc16e9a6f88e2984718e01ee6c7b62c615f7d5913 (diff)
Do not validate the return code of the 'rebalance status' command when just loggingstable
the output Change-Id: I6ff7e363871607c2f9d4272be7198150db59af5d Signed-off-by: ShwethaHP <spandura@redhat.com>
-rw-r--r--glustolibs-gluster/glustolibs/gluster/volume_libs.py11
-rw-r--r--tests/functional/bvt/test_cvt.py10
2 files changed, 6 insertions, 15 deletions
diff --git a/glustolibs-gluster/glustolibs/gluster/volume_libs.py b/glustolibs-gluster/glustolibs/gluster/volume_libs.py
index 8a7806b..c628397 100644
--- a/glustolibs-gluster/glustolibs/gluster/volume_libs.py
+++ b/glustolibs-gluster/glustolibs/gluster/volume_libs.py
@@ -1461,15 +1461,10 @@ def shrink_volume(mnode, volname, subvol_num=None, replica_num=None,
bricks_list_to_remove, volname)
# remove-brick status
- g.log.info("Checking remove-brick status of bricks %s on the volume %s",
+ g.log.info("Logging remove-brick status of bricks %s on the volume %s",
bricks_list_to_remove, volname)
- ret, _, _ = remove_brick(mnode, volname, bricks_list_to_remove,
- option="status")
- if ret != 0:
- g.log.error("Failed to get status of remove-brick of bricks %s on "
- "volume %s", bricks_list_to_remove, volname)
- g.log.info("Successfully got remove-brick status of bricks %s on "
- "volume %s", bricks_list_to_remove, volname)
+ _, _, _ = remove_brick(mnode, volname, bricks_list_to_remove,
+ option="status")
# Wait for rebalance started by remove-brick to complete
_rc = False
diff --git a/tests/functional/bvt/test_cvt.py b/tests/functional/bvt/test_cvt.py
index e19adf8..ff6d3f2 100644
--- a/tests/functional/bvt/test_cvt.py
+++ b/tests/functional/bvt/test_cvt.py
@@ -212,13 +212,9 @@ class TestGlusterExpandVolumeSanity(GlusterBasicFeaturesSanityBaseClass):
g.log.info("Successfully started rebalance on the volume %s",
self.volname)
- # Check Rebalance status
- g.log.info("Checking Rebalance status")
- ret, _, _ = rebalance_status(self.mnode, self.volname)
- self.assertEqual(ret, 0, ("Failed to get rebalance status for the "
- "volume %s", self.volname))
- g.log.info("Successfully got rebalance status of 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")