From: Sage Weil <sage@redhat.com>
Date: Mon, 11 Aug 2014 22:58:15 +0000 (-0700)
Subject: Revert "Fix for bug #6700"
X-Git-Tag: v0.85~31^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2edf01ffa4a7425af2691b4e94bc5fd0bfab1e5b;p=ceph.git

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 <sage@redhat.com>
---

diff --git a/src/ceph-disk b/src/ceph-disk
index 51860d8de824..689c2bc13184 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: