From: Andrew Schoen <aschoen@redhat.com>
Date: Tue, 30 Jan 2018 17:39:05 +0000 (-0600)
Subject: ceph-volume: prepare_* methods do not need to recreate fsid or osd_id
X-Git-Tag: wip-pdonnell-testing-20180317.202121~430^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7c809166aed82298b1fe1581f0e28174a535574f;p=ceph-ci.git

ceph-volume: prepare_* methods do not need to recreate fsid or osd_id

The prepare_filestore and prepare_bluestore methods do not need to
attempt to recreate osd_id or fsid because this happens in prepare
already.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/src/ceph-volume/ceph_volume/devices/lvm/prepare.py b/src/ceph-volume/ceph_volume/devices/lvm/prepare.py
index abb72937848..1e0d3c3a982 100644
--- a/src/ceph-volume/ceph_volume/devices/lvm/prepare.py
+++ b/src/ceph-volume/ceph_volume/devices/lvm/prepare.py
@@ -37,7 +37,7 @@ def prepare_dmcrypt(key, device, device_type, tags):
     return '/dev/mapper/%s' % uuid
 
 
-def prepare_filestore(device, journal, secrets, tags, id_=None, fsid=None):
+def prepare_filestore(device, journal, secrets, tags, osd_id, fsid):
     """
     :param device: The name of the logical volume to work with
     :param journal: similar to device but can also be a regular/plain disk
@@ -46,11 +46,6 @@ def prepare_filestore(device, journal, secrets, tags, id_=None, fsid=None):
     :param fsid: The OSD fsid, also known as the OSD UUID
     """
     cephx_secret = secrets.get('cephx_secret', prepare_utils.create_key())
-    json_secrets = json.dumps(secrets)
-    # allow re-using an existing fsid, in case prepare failed
-    fsid = fsid or system.generate_uuid()
-    # reuse a given ID if it exists, otherwise create a new ID
-    osd_id = prepare_utils.check_id(id_) or prepare_utils.create_id(fsid, json_secrets)
 
     # encryption-only operations
     if secrets.get('dmcrypt_key'):
@@ -84,7 +79,7 @@ def prepare_filestore(device, journal, secrets, tags, id_=None, fsid=None):
         )
 
 
-def prepare_bluestore(block, wal, db, secrets, tags, id_=None, fsid=None):
+def prepare_bluestore(block, wal, db, secrets, tags, osd_id, fsid):
     """
     :param block: The name of the logical volume for the bluestore data
     :param wal: a regular/plain disk or logical volume, to be used for block.wal
@@ -94,7 +89,6 @@ def prepare_bluestore(block, wal, db, secrets, tags, id_=None, fsid=None):
     :param fsid: The OSD fsid, also known as the OSD UUID
     """
     cephx_secret = secrets.get('cephx_secret', prepare_utils.create_key())
-    json_secrets = json.dumps(secrets)
     # encryption-only operations
     if secrets.get('dmcrypt_key'):
         # If encrypted, there is no need to create the lockbox keyring file because
@@ -107,10 +101,6 @@ def prepare_bluestore(block, wal, db, secrets, tags, id_=None, fsid=None):
         wal = prepare_dmcrypt(key, wal, 'wal', tags)
         db = prepare_dmcrypt(key, db, 'db', tags)
 
-    # allow re-using an existing fsid, in case prepare failed
-    fsid = fsid or system.generate_uuid()
-    # allow re-using an id, in case a prepare failed
-    osd_id = prepare_utils.check_id(id_) or prepare_utils.create_id(fsid, json_secrets)
     # create the directory
     prepare_utils.create_osd_path(osd_id, tmpfs=True)
     # symlink the block
@@ -283,8 +273,8 @@ class Prepare(object):
                 journal_device,
                 secrets,
                 tags,
-                id_=self.osd_id,
-                fsid=osd_fsid,
+                self.osd_id,
+                osd_fsid,
             )
         elif args.bluestore:
             block_lv = self.get_lv(args.data)
@@ -308,8 +298,8 @@ class Prepare(object):
                 db_device,
                 secrets,
                 tags,
-                id_=self.osd_id,
-                fsid=osd_fsid,
+                self.osd_id,
+                osd_fsid,
             )
 
     def main(self):