From 6746376747b0a06def2faff1b6af4b8bd624ed55 Mon Sep 17 00:00:00 2001
From: Mohammed Rafi KC <rkavunga@redhat.com>
Date: Tue, 1 Dec 2015 09:11:01 +0000
Subject: tier/glusterd: Check before starting tier daemon during volume start

We start tier daemon when volume is started without looking into the
previous status. The problem with that if detach-tier is started
and then volume force start is actually starting tier daemon.

This is also fixes a problem where tier daemon is not starting
after detach stop.

Back port of>
>Change-Id: I15b56a711e12f0e24f5ab123561258bd448621f7
>BUG: 1286974
>Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
>Reviewed-on: http://review.gluster.org/12833
>Tested-by: NetBSD Build System <jenkins@build.gluster.org>
>Tested-by: Gluster Build System <jenkins@build.gluster.com>
>Reviewed-by: Atin Mukherjee <amukherj@redhat.com>

(cherry picked from commit 28da53e26e88f23f8917810ce0177f2628aa7e9a)

Change-Id: I22c9ad0b2bc4488c15978d8bf85d05113e8b886e
BUG: 1289898
Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
Reviewed-on: http://review.gluster.org/12921
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
---
 tests/bugs/tier/bug-1286974.t | 72 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 tests/bugs/tier/bug-1286974.t

(limited to 'tests/bugs')

diff --git a/tests/bugs/tier/bug-1286974.t b/tests/bugs/tier/bug-1286974.t
new file mode 100644
index 00000000000..a2d8131a0da
--- /dev/null
+++ b/tests/bugs/tier/bug-1286974.t
@@ -0,0 +1,72 @@
+#!/bin/bash
+
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../tier.rc
+
+
+NUM_BRICKS=3
+DEMOTE_FREQ=5
+PROMOTE_FREQ=5
+
+
+
+# Creates a tiered volume with pure distribute hot and cold tiers
+# Both hot and cold tiers will have an equal number of bricks.
+
+function create_dist_tier_vol () {
+        mkdir $B0/cold
+        mkdir $B0/hot
+        TEST $CLI volume create $V0 disperse 6 disperse-data 4 $H0:$B0/cold/${V0}{1..12}
+        TEST $CLI volume set $V0 performance.quick-read off
+        TEST $CLI volume set $V0 performance.io-cache off
+        TEST $CLI volume set $V0 features.ctr-enabled on
+        TEST $CLI volume start $V0
+        TEST $CLI volume attach-tier $V0 replica 2 $H0:$B0/hot/${V0}{0..$1}
+        TEST $CLI volume set $V0 cluster.tier-demote-frequency $DEMOTE_FREQ
+        TEST $CLI volume set $V0 cluster.tier-promote-frequency $PROMOTE_FREQ
+        TEST $CLI volume set $V0 cluster.read-freq-threshold 0
+        TEST $CLI volume set $V0 cluster.write-freq-threshold 0
+        TEST $CLI volume set $V0 cluster.tier-mode test
+}
+
+function tier_task_name () {
+        local task_name=$1;
+        $CLI volume status $V0 task | grep "$task_name";
+        echo $?;
+}
+
+cleanup;
+
+#Basic checks
+TEST glusterd
+TEST pidof glusterd
+TEST $CLI volume info
+
+
+#Create and start a tiered volume
+create_dist_tier_vol $NUM_BRICKS
+
+# Mount FUSE
+TEST glusterfs -s $H0 --volfile-id $V0 $M0
+
+TEST touch /mnt/glusterfs/0/file{1..100};
+
+EXPECT "0" tier_task_name "Tier migration";
+
+TEST $CLI volume tier $V0 detach start
+
+EXPECT "0" tier_task_name "Detach tier";
+
+TEST $CLI volume stop $V0 force;
+
+TEST $CLI volume start $V0 force;
+
+EXPECT "0" tier_task_name "Detach tier";
+
+TEST $CLI volume tier $V0 detach stop
+
+EXPECT "0" tier_task_name "Tier migration";
+
+cleanup;
+
-- 
cgit