From: Sage Weil <sage@redhat.com>
Date: Thu, 30 Jan 2020 19:06:12 +0000 (-0600)
Subject: cephadm: adopt: chown data content
X-Git-Tag: v15.1.1~561^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4ac58eb1e1e8eee1f8ef09b4e40057fc1b147c5d;p=ceph.git

cephadm: adopt: chown data content

The ceph uid/gid vary between distros.  Chown everything to match the
target distro.

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

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index f2a6c9884fcfe..3fffbe8e21401 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -2292,6 +2292,8 @@ def command_adopt():
         move_files(glob(os.path.join(data_dir_src, '*')),
                    data_dir_dst,
                    uid=uid, gid=gid)
+        logger.info('Chowning content...')
+        call_throws(['chown', '-c', '-R', '%d.%d' % (uid, gid), data_dir_dst])
         logger.debug('Remove dir \'%s\'' % (data_dir_src))
         if os.path.ismount(data_dir_src):
             call_throws(['umount', data_dir_src])