ceph-disk: ceph-disk on FreeBSD should not use mpath-code

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>

diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py
index a9d21351506eff895a10572f12e406c93ba8ca71..bce10183b51cabf85cd034b046bc6f19bf16d69e 100755 (executable)
--- a/src/ceph-disk/ceph_disk/main.py
+++ b/src/ceph-disk/ceph_disk/main.py
@@ -206,15 +206,19 @@ class Ptype(object):
         return False
 
 
-DEFAULT_FS_TYPE = 'xfs'
 SYSFS = '/sys'
 
 if platform.system() == 'FreeBSD':
     FREEBSD = True
+    DEFAULT_FS_TYPE = 'zfs'
     PROCDIR = '/compat/linux/proc'
+    # FreeBSD does not have blockdevices any more
+    BLOCKDIR = '/dev'
 else:
     FREEBSD = False
+    DEFAULT_FS_TYPE = 'xfs'
     PROCDIR = '/proc'
+    BLOCKDIR = '/sys/block'
 
 """
 OSD STATUS Definition
@@ -232,7 +236,6 @@ MOUNT_OPTIONS = dict(
     # that user_xattr helped
     ext4='noatime,user_xattr',
     xfs='noatime,inode64',
-    zfs='atime=off',
 )
 
 MKFS_ARGS = dict(
@@ -250,6 +253,9 @@ MKFS_ARGS = dict(
         '-f',
         '-i', 'size=2048',
     ],
+    zfs=[
+        '-o', 'atime=off'
+    ],
 )
 
 INIT_SYSTEMS = [
@@ -456,7 +462,7 @@ def command(arguments, **kwargs):
     executables *will* be found and will error nicely otherwise.
 
     This returns the output of the command and the return code of the
-    process in a tuple: (output, returncode).
+    process in a tuple: (stdout, stderr, returncode).
     """
 
     arguments = list(map(_bytes2str, _get_command_executable(arguments)))
@@ -554,7 +560,7 @@ def platform_information():
         distro = platform.system()
         release = platform.version().split()[1]
         codename = platform.version().split()[3]
-        version = platform.version().split('-')[0]
+        version = platform.version().split('-')[0][:-1]
         major_version = version.split('.')[0]
         major, minor = release.split('.')
     else:
@@ -640,7 +646,7 @@ def is_mpath(dev):
     True if the path is managed by multipath
     """
     if FREEBSD:
-        return True
+        return False
     uuid = get_dm_uuid(dev)
     return (uuid and
             (re.match('part\d+-mpath-', uuid) or
@@ -651,7 +657,7 @@ def get_dev_name(path):
     """
     get device name from path.  e.g.::
 
-        /dev/sda -> sdas, /dev/cciss/c0d1 -> cciss!c0d1
+        /dev/sda -> sda, /dev/cciss/c0d1 -> cciss!c0d1
 
     a device "name" is something like::
 
@@ -734,7 +740,7 @@ def get_partition_dev(dev, pnum):
             partname = get_partition_mpath(dev, pnum)
         else:
             name = get_dev_name(os.path.realpath(dev))
-            sys_entry = os.path.join('/sys/block', name)
+            sys_entry = os.path.join(BLOCKDIR, name)
             error_msg = " in %s" % sys_entry
             for f in os.listdir(sys_entry):
                 if f.startswith(name) and f.endswith(str(pnum)):
@@ -763,7 +769,7 @@ def list_all_partitions():
     Return a list of devices and partitions
     """
     if not FREEBSD:
-        names = os.listdir('/sys/block')
+        names = os.listdir(BLOCKDIR)
         dev_part_list = {}
         for name in names:
             # /dev/fd0 may hang http://tracker.ceph.com/issues/6827
@@ -864,7 +870,7 @@ def is_partition(dev):
         raise Error('not a block device', dev)
 
     name = get_dev_name(dev)
-    if os.path.exists(os.path.join('/sys/block', name)):
+    if os.path.exists(os.path.join(BLOCKDIR, name)):
         return False
 
     # make sure it is a partition of something else
@@ -3374,20 +3380,27 @@ def stop_daemon(
         raise Error('ceph osd stop failed', e)
 
 
-def detect_fstype(
-    dev,
-):
-    fstype = _check_output(
-        args=[
-            '/sbin/blkid',
-            # we don't want stale cached results
-            '-p',
-            '-s', 'TYPE',
-            '-o', 'value',
-            '--',
-            dev,
-        ],
-    )
+def detect_fstype(dev):
+    if FREEBSD:
+        fstype = _check_output(
+            args=[
+                'fstyp',
+                '-u',
+                dev,
+            ],
+        )
+    else:
+        fstype = _check_output(
+            args=[
+                '/sbin/blkid',
+                # we don't want stale cached results
+                '-p',
+                '-s', 'TYPE',
+                '-o', 'value',
+                '--',
+                dev,
+            ],
+        )
     fstype = must_be_one_line(fstype)
     return fstype
 
@@ -4228,19 +4241,29 @@ def get_oneliner(base, name):
 
 
 def get_dev_fs(dev):
-    fscheck, _, _ = command(
-        [
-            'blkid',
-            '-s',
-            'TYPE',
-            dev,
-        ],
-    )
-    if 'TYPE' in fscheck:
-        fstype = fscheck.split()[1].split('"')[1]
-        return fstype
+    if FREEBSD:
+        fstype, _, ret = command(
+            [
+                'fstyp',
+                '-u',
+                dev,
+            ],
+        )
+        if ret == 0:
+            return fstype
     else:
-        return None
+        fscheck, _, _ = command(
+            [
+                'blkid',
+                '-s',
+                'TYPE',
+                dev,
+            ],
+        )
+        if 'TYPE' in fscheck:
+            fstype = fscheck.split()[1].split('"')[1]
+            return fstype
+    return None
 
 
 def split_dev_base_partnum(dev):
@@ -4586,11 +4609,11 @@ def list_zfs():
                  'fails.\n (Error: %s)' % e)
         raise
     lines = out.splitlines()
-    for line in lines[2:]:
+    for line in lines[1:]:
         vdevline = line.split()
         if os.path.exists(os.path.join(vdevline[1], 'active')):
             elems = os.path.split(vdevline[1])
-            print(vdevline[0], "ceph data, active, cluster ceph,", elems[5],
+            print(vdevline[0], "ceph data, active, cluster ceph,", elems[1],
                   "mounted on:", vdevline[1])
         else:
             print(vdevline[0] + " other, zfs, mounted on: " + vdevline[1])

diff --git a/src/ceph-disk/tests/test_main.py b/src/ceph-disk/tests/test_main.py
index 69a7dfd9493b13f7b00b9f7c1e83ad7716efe66f..45fe48a16905f23176d7f92478ac8f619b0f6730 100644 (file)
--- a/src/ceph-disk/tests/test_main.py
+++ b/src/ceph-disk/tests/test_main.py
@@ -465,6 +465,9 @@ class TestCephDisk(object):
                   main.PTYPE['regular']['journal']['ready'])
 
     def test_list_bluestore(self):
+        if platform.system() == "FreeBSD":
+            return
+
         self.list(main.PTYPE['plain']['osd']['ready'],
                   main.PTYPE['plain']['block']['ready'])
         self.list(main.PTYPE['luks']['osd']['ready'],