From 0d46f1b0519f93165a335bf264661054883b522f Mon Sep 17 00:00:00 2001 From: Avra Sengupta Date: Mon, 9 Nov 2015 13:37:53 +0530 Subject: snapshot/clone : Fix tier pause failure for snapshot clone On a tiered volume, snapshot clone fails while trying to pause tier, as we pass volname(snap) to the brick_op_phase module, which tries to look for the snap volume amongst regular volumes, and obviously doesn't find it and fail. Well as snapshot volumes are read only volume, and will not have tiering daemon acting upon them, there is really no need to pause tiereing while taking clone of snapshot volumes. Hence removing the code to pause and resume tiering during clone create. Change-Id: I2266aba589a830a13a806c0d8a56fd8855143ccd BUG: 1279327 Signed-off-by: Avra Sengupta Reviewed-on: http://review.gluster.org/12548 Tested-by: NetBSD Build System Tested-by: Gluster Build System Reviewed-by: Rajesh Joseph --- tests/bugs/snapshot/bug-1275616.t | 8 -------- tests/bugs/snapshot/bug-1279327.t | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 tests/bugs/snapshot/bug-1279327.t (limited to 'tests/bugs') diff --git a/tests/bugs/snapshot/bug-1275616.t b/tests/bugs/snapshot/bug-1275616.t index 23083c5a411..dcaeae30f90 100755 --- a/tests/bugs/snapshot/bug-1275616.t +++ b/tests/bugs/snapshot/bug-1275616.t @@ -3,14 +3,6 @@ . $(dirname $0)/../../include.rc . $(dirname $0)/../../snapshot.rc -function get_snap_brick_status() -{ - local snap=$1; - - $CLI snapshot status $snap | grep "Brick Running" | sed 's/.*: //'; -} - - cleanup; TEST verify_lvm_version; TEST glusterd; diff --git a/tests/bugs/snapshot/bug-1279327.t b/tests/bugs/snapshot/bug-1279327.t new file mode 100644 index 00000000000..fd5fec24471 --- /dev/null +++ b/tests/bugs/snapshot/bug-1279327.t @@ -0,0 +1,30 @@ +#!/bin/bash + +. $(dirname $0)/../../include.rc +. $(dirname $0)/../../snapshot.rc +. $(dirname $0)/../../volume.rc + +cleanup; +TEST verify_lvm_version; +TEST glusterd; +TEST pidof glusterd; + +TEST init_n_bricks 3 +TEST setup_lvm 3 + +TEST $CLI volume create $V0 $H0:$L1 +TEST $CLI volume start $V0 +TEST $CLI volume quota $V0 enable +TEST $CLI volume attach-tier $V0 replica 2 $H0:$L2 $H0:$L3 + +TEST $CLI snapshot create snap1 $V0 no-timestamp +TEST $CLI snapshot activate snap1 + +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Yes" get_snap_brick_status snap1 + +#Take a clone and verify it inherits snapshot's snap-max-hard-limit +TEST $CLI snapshot clone clone1 snap1 +TEST $CLI volume start clone1 +EXPECT 'Started' volinfo_field clone1 'Status'; + +cleanup; -- cgit