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

pacific: python-common: improve OSD spec error messages #44626

Merged

Conversation

sebastian-philipp
Copy link
Contributor

Backport of #42905

@github-actions
Copy link

This pull request can no longer be automatically merged: a rebase is needed and changes have to be manually resolved

Copy link
Contributor

@mgfritch mgfritch left a comment

Choose a reason for hiding this comment

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

Do we care to backport #42727 and it's dependent PRs before this PR to avoid losing track of these lines?

if self.method not in [None, 'lvm', 'raw']:
raise DriveGroupValidationError(
self.service_id,
'method must be one of None, lvm, raw')
if self.method == 'raw' and self.objectstore == 'filestore':
raise DriveGroupValidationError(
self.service_id,
'method raw only supports bluestore')

otherwise, lgtm!

@sebastian-philipp
Copy link
Contributor Author

@sebastian-philipp
Copy link
Contributor Author

Do we care to backport #42727 and it's dependent PRs before this PR to avoid losing track of these lines?

I personally don't really care about raw osds in pacific. Do you?

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 38b52f7)
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit b91f818)

Conflicts:
	src/python-common/ceph/deployment/drive_group.py
Fixes: https://tracker.ceph.com/issues/47401

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 4142c52)

Conflicts:
	src/python-common/ceph/deployment/drive_group.py
Fixes: https://tracker.ceph.com/issues/50685
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 74f29b9)
Cause it never actually worked as expected.

Remove duplicated service_id check, cause it's already
verified by parent method.

Fixes: https://tracker.ceph.com/issues/46253

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 8b567e1)

Conflicts:
	src/python-common/ceph/deployment/service_spec.py
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 3118604)
Adjust HostSpec interface to ServiceSpec

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 7c6d922)

Conflicts:
  src/python-common/ceph/deployment/service_spec.py
unfortunately `ceph orch ls` may return invalid OSD specs for
OSDs not associated to and specs.

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 3f38583)

Conflicts:
	src/pybind/mgr/orchestrator/module.py
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 1c40ca1)
@sebastian-philipp
Copy link
Contributor Author

changelog:

  • fixed trivial import conflicts

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants