From 8a8a9c35349d3f58d899afa1a9e219b99586bc9f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 11 Aug 2014 15:58:15 -0700 Subject: [PATCH] Revert "Fix for bug #6700" This reverts commit 673394702b725ff3f26d13b54d909208daa56d89. This appears to break things when the journal and data disk are *not* the same. And I can't seem to reproduce the original failure... Signed-off-by: Sage Weil (cherry picked from commit 2edf01ffa4a7425af2691b4e94bc5fd0bfab1e5b) --- src/ceph-disk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/ceph-disk b/src/ceph-disk index 219f37b26e7c7..8d805324d4d46 100755 --- a/src/ceph-disk +++ b/src/ceph-disk @@ -1224,9 +1224,6 @@ 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: command_check_call( @@ -1308,8 +1305,6 @@ 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