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

kraken: core: ceph-disk: Add fix subcommand kraken back-port #14345

Merged
merged 4 commits into from May 11, 2017

Conversation

b-ranto
Copy link
Contributor

@b-ranto b-ranto commented Apr 5, 2017

http://tracker.ceph.com/issues/19544

This back-ports quite cleanly (the only change is the doc format).

@b-ranto b-ranto requested review from a user and tchaikov April 5, 2017 13:24
@ktdreyer
Copy link
Member

ktdreyer commented Apr 7, 2017

Tracked via http://tracker.ceph.com/issues/19544

@smithfarm smithfarm added this to the kraken milestone Apr 22, 2017
@smithfarm
Copy link
Contributor

@b-ranto Next time please set the milestone so the PR gets picked up for integration testing.

Copy link
Contributor

@smithfarm smithfarm left a comment

Choose a reason for hiding this comment

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

@b-ranot Please re-do the cherry picks with -x so we get the nice "(cherry picked from . . .)" and "Conflicts: ..." lines. Thanks.

@smithfarm
Copy link
Contributor

@b-ranto Ping? Can you fix the cherry-picks please.

@smithfarm
Copy link
Contributor

This passed a ceph-disk suite at http://tracker.ceph.com/issues/19009#note-43

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

please cherry-pick -x, otherwise looks good

@b-ranto
Copy link
Contributor Author

b-ranto commented May 3, 2017

Redid with the cherry-pick -x.

@b-ranto
Copy link
Contributor Author

b-ranto commented May 10, 2017

jenkins test default

@smithfarm
Copy link
Contributor

Jenkins re-test this please

1 similar comment
@b-ranto
Copy link
Contributor Author

b-ranto commented May 10, 2017

Jenkins re-test this please

This subcommand will fix the SELinux labels and/or file permissions on
ceph data (/var/lib/ceph).

The command is also optimized to run the commands in parallel (per
sub-dir in /var/lib/ceph) and do restorecon and chown at the same time
to take advantage of the caching mechanisms.

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 6d5d30f)
This will simulate the command* functions to not actually run anything
thus excercising the python code directly. It also checks that the
proper (sub-strings) are in the output.

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 1ec53de)
It turns out I forgot several more directories that needs to be fixed by
this script. We need to fix /var/log/ceph, /var/run/ceph and /etc/ceph
as well.

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit ae13930)
This adds the ability to restore the labels of the underlying system
data in addition to ceph data.

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 8d81af4)
@b-ranto b-ranto merged commit ae0eab5 into kraken May 11, 2017
@b-ranto b-ranto deleted the wip-ceph-disk-fix-kraken branch May 11, 2017 06:06
@smithfarm smithfarm changed the title ceph-disk: Add fix subcommand kraken back-port kraken: core: ceph-disk: Add fix subcommand kraken back-port Aug 2, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants