From: Sage Weil <sage@redhat.com>
Date: Fri, 13 Jul 2018 14:56:48 +0000 (-0500)
Subject: rpm,deb: chown bluestore block* links to ceph.ceph on install/upgrade
X-Git-Tag: v12.2.7~4^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F23035%2Fhead;p=ceph.git

rpm,deb: chown bluestore block* links to ceph.ceph on install/upgrade

This works around https://tracker.ceph.com/issues/24903

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 58cde3fd793c037beca6645cc30b2ae1c30e2af1)
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 2f89a9bc1a13..004eb9bd41a0 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -1447,6 +1447,8 @@ fi
 %else
     /usr/lib/systemd/systemd-sysctl %{_sysctldir}/90-ceph-osd.conf > /dev/null 2>&1 || :
 %endif
+# work around https://tracker.ceph.com/issues/24903
+chown ceph:ceph /var/lib/ceph/osd/*/block* 2>&1 > /dev/null || :
 
 %preun osd
 %if 0%{?suse_version}
diff --git a/debian/ceph-osd.postinst b/debian/ceph-osd.postinst
index 5e44548fe826..6ae5349bce0e 100644
--- a/debian/ceph-osd.postinst
+++ b/debian/ceph-osd.postinst
@@ -25,6 +25,8 @@ case "$1" in
     configure)
 	[ -x /etc/init.d/procps ] && invoke-rc.d procps restart || :
 	[ -x /sbin/start ] && start ceph-osd-all || :
+	# work around https://tracker.ceph.com/issues/24903
+	chown ceph:ceph /var/lib/ceph/osd/*/block* 2>&1 > /dev/null || :
     ;;
     abort-upgrade|abort-remove|abort-deconfigure)
 	: