From 673394702b725ff3f26d13b54d909208daa56d89 Mon Sep 17 00:00:00 2001 From: Steve Taylor Date: Tue, 10 Jun 2014 12:42:55 -0600 Subject: [PATCH] Fix for bug #6700 When preparing OSD disks with colocated journals, the intialization process fails when using dmcrypt. The kernel fails to re-read the partition table after the storage partition is created because the journal partition is already in use by dmcrypt. This fix unmaps the journal partition from dmcrypt and allows the partition table to be read. Signed-off-by: Stephen F Taylor --- src/ceph-disk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/ceph-disk b/src/ceph-disk index 9af749ad9045c..d47758ad8e53f 100755 --- a/src/ceph-disk +++ b/src/ceph-disk @@ -1224,6 +1224,9 @@ def prepare_dev( LOG.debug('OSD data device %s is a partition', data) rawdev = data else: + if journal_dmcrypt is not None: + dmcrypt_unmap(journal) + LOG.debug('Creating osd partition on %s', data) try: if data_size is None: @@ -1327,6 +1330,8 @@ def prepare_dev( finally: if rawdev != dev: dmcrypt_unmap(osd_uuid) + if journal_dmcrypt is not None: + dmcrypt_unmap(journal) if not is_partition(data): try: -- 2.39.5