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

nautilus: common/blkdev: fix some problems with smart scraping #33421

Merged
merged 5 commits into from Mar 20, 2020

Conversation

k0ste
Copy link
Contributor

@k0ste k0ste commented Feb 20, 2020

backport tracker: https://tracker.ceph.com/issues/44218


backport of #28848
parent tracker: https://tracker.ceph.com/issues/44210

this backport was staged using ceph-backport.sh version 15.1.0.437
find the latest version at https://github.com/ceph/ceph/blob/master/src/script/ceph-backport.sh

@tchaikov tchaikov added this to the nautilus milestone Feb 22, 2020
@BenoitKnecht
Copy link
Contributor

The conflict comes from 46d2c44, which is already incorporated into 70fa3cf, so it can safely be dropped from this PR.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 7ac955e)
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 9accb70)
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 43e6663)
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit cff30ce)
…code

Also make the error message a bit more informative.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit ef882d1)
@k0ste
Copy link
Contributor Author

k0ste commented Feb 26, 2020

@BenoitKnecht, thanks. Rebased.

@BenoitKnecht
Copy link
Contributor

I don't think the CI checks failed due to anything wrong in this PR; can someone rerun them?

@smithfarm
Copy link
Contributor

jenkins test make check

@smithfarm smithfarm added nautilus-batch-1 nautilus point releases needs-qa labels Mar 19, 2020
@yuriw
Copy link
Contributor

yuriw commented Mar 19, 2020

@yuriw yuriw merged commit 18d298d into ceph:nautilus Mar 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants