From da9d40f0cc49418dee4820cda2eb31ea8bda6ba5 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Fri, 31 Jan 2020 08:52:25 -0600
Subject: [PATCH] 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>
---
 src/cephadm/cephadm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index c91c0ebbff8..90f2cc5b274 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)
-- 
2.39.5