From 32b5667f017e3206bd9d3b65074eecb7ddb84244 Mon Sep 17 00:00:00 2001
From: Jiffin Tony Thottan <jthottan@gmail.com>
Date: Thu, 17 Mar 2016 18:53:13 +0530
Subject: glusterd : skip non directories inside /var/lib/glusterd/vols

Right now glusterd won't come up if vols directory contains an invalid entry.
Instead of doing that with this change a message will be logged and then skip
that entry

Backport details:
>Change-Id: I665b5c35291b059cf054622da0eec4db44ec5f68
>BUG: 1318591
>Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
>Reviewed-on: http://review.gluster.org/13764
>Reviewed-by: Prashanth Pai <ppai@redhat.com>
>Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
>Smoke: Gluster Build System <jenkins@build.gluster.org>
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
(cherry picked from commit 720b63c24b07ee64e1338db28de602b9abbef0a1)

Change-Id: I665b5c35291b059cf054622da0eec4db44ec5f68
BUG: 1365265
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
Reviewed-on: http://review.gluster.org/15113
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Prashanth Pai <ppai@redhat.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
---
 .../bug-1318591-skip-non-directories-inside-vols.t | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 tests/bugs/glusterd/bug-1318591-skip-non-directories-inside-vols.t

(limited to 'tests')

diff --git a/tests/bugs/glusterd/bug-1318591-skip-non-directories-inside-vols.t b/tests/bugs/glusterd/bug-1318591-skip-non-directories-inside-vols.t
new file mode 100644
index 00000000000..c776b489957
--- /dev/null
+++ b/tests/bugs/glusterd/bug-1318591-skip-non-directories-inside-vols.t
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../env.rc
+. $(dirname $0)/../../snapshot.rc
+
+cleanup;
+
+TEST verify_lvm_version
+TEST glusterd
+TEST pidof glusterd
+
+TEST setup_lvm 1
+
+TEST $CLI volume create $V0 $H0:$L1
+TEST $CLI volume start $V0
+
+TEST $CLI volume status $V0;
+
+TEST touch $GLUSTERD_WORKDIR/vols/file
+
+TEST $CLI snapshot create snap1 $V0 no-timestamp
+
+TEST touch $GLUSTERD_WORKDIR/snaps/snap1/file
+
+TEST killall_gluster
+
+TEST glusterd
+
+cleanup;
-- 
cgit