]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: error out on filestore OSDs 33395/head
authorSage Weil <sage@redhat.com>
Sat, 15 Feb 2020 14:55:16 +0000 (08:55 -0600)
committerSage Weil <sage@redhat.com>
Tue, 18 Feb 2020 18:50:49 +0000 (12:50 -0600)
We do not currently support filestore OSDs.

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

index 71ca3c338032bedca018b61677eaa47f55b037a2..72b21f783dcd3651e4704cba3ee9e7fe1711dd2b 100755 (executable)
@@ -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)