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.

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

ceph-disk: dmcrypt activate must use the same cluster as prepare #13573

Merged
3 commits merged into from Feb 22, 2017
Merged

ceph-disk: dmcrypt activate must use the same cluster as prepare #13573

3 commits merged into from Feb 22, 2017

Conversation

ghost
Copy link

@ghost ghost commented Feb 21, 2017

When dmcrypt is used, the fsid cannot be retrieved from the data
partition because it is encrypted. Store the fsid in the lockbox to
enable dmcrypt activation using the same logic as regular activation.

The fsid is used to retrive the cluster name that was used during
prepare, reason why activation does not and must not have a --cluster
argument.

Fixes: http://tracker.ceph.com/issues/17821

Signed-off-by: Loic Dachary ldachary@redhat.com

Merged by mistake, teuthology ceph-disk fails

This reverts commit d98d4db.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
…luster name"

Merged by mistake, teuthology ceph-disk fails

This reverts commit 1c74747.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
@ghost ghost added bug-fix core labels Feb 21, 2017
@ghost ghost requested a review from leseb February 21, 2017 22:54
@ghost
Copy link
Author

ghost commented Feb 21, 2017

@ghost ghost changed the title revert dmcrypt ceph-disk ceph-disk: revert dmcrypt activate patch Feb 21, 2017
When dmcrypt is used, the fsid cannot be retrieved from the data
partition because it is encrypted. Store the fsid in the lockbox to
enable dmcrypt activation using the same logic as regular activation.

The fsid is used to retrive the cluster name that was used during
prepare, reason why activation does not and must not have a --cluster
argument.

Fixes: http://tracker.ceph.com/issues/17821

Signed-off-by: Loic Dachary <ldachary@redhat.com>
@ghost ghost changed the title ceph-disk: revert dmcrypt activate patch ceph-disk: dmcrypt activate must use the same cluster as prepare Feb 22, 2017
@ghost
Copy link
Author

ghost commented Feb 22, 2017

teuthology-suite -k distro --verbose --suite ceph-disk --ceph wip-17821-revert --machine-type vps 

pass http://pulpito.ceph.com/loic-2017-02-22_05:31:46-ceph-disk-wip-17821-revert-distro-basic-vps

@ghost ghost requested a review from tchaikov February 22, 2017 06:32
@ghost
Copy link
Author

ghost commented Feb 22, 2017

teuthology suite for ceph-disk passes #13573 (comment)

@ghost
Copy link
Author

ghost commented Feb 22, 2017

There are no specific tests for this change. But it modifies the code path used by every dmcrypt activation and I believe that's enough coverage, via the teuthology ceph-disk suite, to prove it does the right thing.

Copy link
Contributor

@tchaikov tchaikov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since the problem attacked by #11786 is a false problem, we should revert it.

@leseb
Copy link
Member

leseb commented Apr 4, 2017

@dachary @vumrao will this be in 10.2.7 by any chance?

@leseb
Copy link
Member

leseb commented Apr 4, 2017

@ktdreyer

@ktdreyer
Copy link
Member

ktdreyer commented Apr 4, 2017

@leseb the backport is in progress at #13496 . It looks like Loic has requested changes of the reviewer. If this needs to get into v10.2.7, please work with @shinobu-x on that. At this point in the schedule anything for v10.2.7 must have Pulpito links to successful Teuthology runs demonstrating that the change is safe to take in.

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants