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: ceph-disk list fails on /dev/cciss!c0d0 #6879

Merged
8 commits merged into from Jan 6, 2016
Merged

ceph-disk: ceph-disk list fails on /dev/cciss!c0d0 #6879

8 commits merged into from Jan 6, 2016

Conversation

ghost
Copy link

@ghost ghost commented Dec 9, 2015

@ghost ghost added bug-fix core labels Dec 9, 2015
@ghost
Copy link
Author

ghost commented Dec 9, 2015

Passed the ceph-disk suite on ubuntu infernalis because http://tracker.ceph.com/issues/13988 breaks the ceph-disk suite on master.

@ghost ghost changed the title ceph-disk: fix regression in cciss devices names DNM: ceph-disk: ceph-disk list fails on /dev/cciss!c0d0 Dec 12, 2015
@ghost ghost changed the title DNM: ceph-disk: ceph-disk list fails on /dev/cciss!c0d0 ceph-disk: ceph-disk list fails on /dev/cciss!c0d0 Jan 4, 2016
@ghost
Copy link
Author

ghost commented Jan 4, 2016

cw ceph-qa-suite --verbose --ceph-qa-suite-git-url http://github.com/ceph/ceph-qa-suite --suite-branch master --ceph-git-url http://github.com/dachary/ceph --ceph wip-13970-ceph-disk-cciss --suite ceph-disk --upload

Signed-off-by: Loic Dachary <loic@dachary.org>
Signed-off-by: Loic Dachary <loic@dachary.org>
The details about a device that mapped via dmcrypt are directly
available. Do not try to fetch them from the device entry describing the
devicemapper entry.

http://tracker.ceph.com/issues/14230 Fixes: #14230

Signed-off-by: Loic Dachary <loic@dachary.org>
If the journal is not unmapped, ceph-disk destroy will fail to zap the
corresponding devices because it is still held by devicemapper.

A consequence of this modification is that

   ceph-disk activate --dmcrypt --reactivate

no longer works from the command line, because it does not map the
dmcrypted journal. The --reactivate option is added to activate-journal
which will map both the journal and the data devices, if necessary.

http://tracker.ceph.com/issues/14233 Fixes: #14233

Signed-off-by: Loic Dachary <loic@dachary.org>
The ceph-disk list subcommand now accepts /dev/sda as well as sda.
The filtering is done on the full list of devices instead of restricting
the number of devices explored. Always obtaining the full list of
devices makes things simpler when trying to match a dmcrypted device to
the corresponding raw device.

Signed-off-by: Loic Dachary <loic@dachary.org>
Signed-off-by: Loic Dachary <loic@dachary.org>
The cciss driver has device paths such as /dev/cciss/c0d1 with a
matching /sys/block/cciss!c0d1. The general case is that whenever a
device name is found in /sys/block, the / is replaced by the !.

When refactoring the ceph-disk list subcommand, this conversion was
overlooked in a few places. All explicit concatenation of /dev with a
device name are replaced with a call to get_dev_name which does the same
but also converts all ! in /.

http://tracker.ceph.com/issues/13970 Fixes: #13970

Signed-off-by: Loic Dachary <loic@dachary.org>
Retry a cryptsetup remove ten times. After the ceph-osd terminates, the
device is released asyncrhonously and an attempt to cryptsetup remove
will may fail because it is considered busy. Although a few attempts are
made before giving up, the number of attempts / the duration of the
attempts cannot be controlled with a cryptsetup option. The workaround
is to increase this by trying a few times.

If cryptsetup remove fails for a reason that is unrelated to timeout,
the error will be repeated a few times. There is no undesirable side
effect. It will not hide a problem.

Signed-off-by: Loic Dachary <loic@dachary.org>
@ghost
Copy link
Author

ghost commented Jan 6, 2016

cw ceph-qa-suite --verbose --ceph-qa-suite-git-url http://github.com/ceph/ceph-qa-suite --suite-branch master --ceph-git-url http://github.com/dachary/ceph --ceph wip-13970-ceph-disk-cciss --suite ceph-disk --upload

@ghost ghost assigned liewegas Jan 6, 2016
@ghost
Copy link
Author

ghost commented Jan 6, 2016

@liewegas it passes the ceph-disk suite ( http://teuthology-logs.public.ceph.com/ubuntu-2016-01-06_13%3a04%3a03-ceph-disk-wip-13970-ceph-disk-cciss---basic-openstack/ ) and fixes a few stability issues (that show up frequently during testing but are probably rare in reality).

@liewegas
Copy link
Member

liewegas commented Jan 6, 2016

👍

ghost pushed a commit that referenced this pull request Jan 6, 2016
ceph-disk: ceph-disk list fails on /dev/cciss!c0d0

Reviewed-by: Sage Weil <sage@redhat.com>
@ghost ghost merged commit 8b7e5d7 into ceph:master Jan 6, 2016
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
3 participants