From: Sage Weil <sage@redhat.com>
Date: Fri, 31 Jan 2020 14:52:25 +0000 (-0600)
Subject: cephadm: chown block symlink targets
X-Git-Tag: v15.1.1~561^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=da9d40f0cc49418dee4820cda2eb31ea8bda6ba5;p=ceph.git

cephadm: chown block symlink targets

Again, these need to match the container's uid/gid, not the host's.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index c91c0ebbff80..90f2cc5b2746 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -2319,6 +2319,12 @@ def command_adopt():
             if num_renamed:
                 logger.info('Renamed %d leveldb *.ldb files to *.sst',
                             num_renamed)
+        if daemon_type == 'osd':
+            for n in ['block', 'block.db', 'block.wal']:
+                p = os.path.join(data_dir_dst, n)
+                if os.path.exists(p):
+                    logger.info('Chowning %s...' % p)
+                    os.chown(p, uid, gid)
 
         # config
         config_src = '/etc/ceph/%s.conf' % (args.cluster)