From: Sage Weil <sage@redhat.com>
Date: Sat, 15 Feb 2020 14:55:16 +0000 (-0600)
Subject: cephadm: error out on filestore OSDs
X-Git-Tag: v15.1.1~371^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33395%2Fhead;p=ceph.git

cephadm: error out on filestore OSDs

We do not currently support filestore OSDs.

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

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 71ca3c338032..72b21f783dcd 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -2339,6 +2339,15 @@ def command_adopt():
             call_throws(['systemctl', 'disable', unit_name])
 
         # data
+        os_type = None
+        if os.path.exists(os.path.join(data_dir_src, 'type')):
+            with open(os.path.join(data_dir_src, 'type')) as f:
+                os_type = f.read().strip()
+        else:
+            raise Error('"type" file missing for OSD data dir')
+        logger.info('objectstore_type is %s' % os_type)
+        if os_type == 'filestore':
+            raise Error('FileStore is not supported by cephadm')
         logger.info('Moving data...')
         data_dir_dst = make_data_dir(fsid, daemon_type, daemon_id,
                                      uid=uid, gid=gid)