Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for bug #6700 #1948

Merged
merged 1 commit into from Jun 12, 2014
Merged

Fix for bug #6700 #1948

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/ceph-disk
View file
Open in desktop
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down