21ab4e
From 1e1f9b950d1ee7f22fad457f6158dc91faf63b89 Mon Sep 17 00:00:00 2001
21ab4e
From: Milind Changire <mchangir@redhat.com>
21ab4e
Date: Fri, 4 Aug 2017 12:41:22 +0530
21ab4e
Subject: [PATCH 593/593] packaging: /var/lib/glusterd/options should be
21ab4e
 %config(noreplace)
21ab4e
21ab4e
/var/lib/glusterd/options is where cluster.enabled-shared-storage is
21ab4e
persisted. If the file is removed as part of an uninstall/reinstall
21ab4e
or update then the state of shared storage could be lost.
21ab4e
21ab4e
mainline:
21ab4e
> BUG: 1476861
21ab4e
> Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
21ab4e
> Reviewed-on: https://review.gluster.org/17930
21ab4e
> Smoke: Gluster Build System <jenkins@build.gluster.org>
21ab4e
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
21ab4e
> Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
21ab4e
> Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
21ab4e
(cherry picked from commit f17eefb6d9a91cfccc3bef3aa3ba08a9128b046e)
21ab4e
21ab4e
Change-Id: Ie18c3d883df71c1857fd6996d9c03ab247580b70
21ab4e
BUG: 1476867
21ab4e
Signed-off-by: Milind Changire <mchangir@redhat.com>
21ab4e
Reviewed-on: https://code.engineering.redhat.com/gerrit/114355
21ab4e
Reviewed-by: Niels de Vos <ndevos@redhat.com>
21ab4e
---
21ab4e
 glusterfs.spec.in | 5 ++++-
21ab4e
 1 file changed, 4 insertions(+), 1 deletion(-)
21ab4e
21ab4e
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
21ab4e
index b1feedc..3e816ae 100644
21ab4e
--- a/glusterfs.spec.in
21ab4e
+++ b/glusterfs.spec.in
21ab4e
@@ -1455,7 +1455,7 @@ exit 0
21ab4e
 %ghost      %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/nfs-server.vol
21ab4e
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs/run
21ab4e
 %ghost      %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid
21ab4e
-%ghost      %attr(0600,-,-) %{_sharedstatedir}/glusterd/options
21ab4e
+%config(noreplace) %ghost      %attr(0600,-,-) %{_sharedstatedir}/glusterd/options
21ab4e
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/peers
21ab4e
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/quotad
21ab4e
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/scrub
21ab4e
@@ -2102,6 +2102,9 @@ end
21ab4e
 %endif
21ab4e
 
21ab4e
 %changelog
21ab4e
+* Fri Aug 04 2017 Kaleb S. KEITHLEY <kkeithle@rehat.com>
21ab4e
+- /var/lib/glusterd/options made config(noreplace) to avoid losing shared state info
21ab4e
+
21ab4e
 * Tue Jul 04 2017 Milind Changire <mchangir@redhat.com>
21ab4e
 - moved %{_sbindir}/gf_attach from glusterfs-fuse to glusterfs-server
21ab4e
 
21ab4e
-- 
21ab4e
1.8.3.1
21ab4e