Skip to content

python-common: RGW service_id might not contain a zone#35838

Merged
sebastian-philipp merged 1 commit intoceph:masterfrom
mgfritch:cephadm-rgw-spec-validate
Jul 15, 2020
Merged

python-common: RGW service_id might not contain a zone#35838
sebastian-philipp merged 1 commit intoceph:masterfrom
mgfritch:cephadm-rgw-spec-validate

Conversation

@mgfritch
Copy link
Contributor

@mgfritch mgfritch commented Jun 30, 2020

also adds missing RGWSpec.validate()

Fixes: https://tracker.ceph.com/issues/46268
Signed-off-by: Michael Fritch mfritch@suse.com

Checklist

  • References tracker ticket
  • Updates documentation if necessary
  • Includes tests for new functionality or reproducer for bug
Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard backend
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox

@mgfritch mgfritch requested a review from a team as a code owner June 30, 2020 01:12
@mgfritch mgfritch mentioned this pull request Jun 30, 2020
Merged
3 tasks
@mgfritch
Copy link
Contributor Author

mgfritch commented Jul 1, 2020

https://pulpito.ceph.com/mgfritch-2020-07-01_01:35:47-rados-wip-mgfritch-testing-2020-06-30-1514-distro-basic-smithi/

@mgfritch
Copy link
Contributor Author

mgfritch commented Jul 1, 2020

retest this please

@sebastian-philipp
Copy link
Contributor

sebastian-philipp commented Jul 1, 2020

jenkins test make check

@sebastian-philipp
Copy link
Contributor

sebastian-philipp commented Jul 1, 2020

https://jenkins.ceph.com/job/ceph-pull-requests/54638/consoleFull#-1292402306e840cee4-f4a4-4183-81dd-42855615f2c1

cephadm/schedule.py:105: in place
    self.validate()
cephadm/schedule.py:68: in validate
    self.spec.validate()
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 

self = RGWSpec({'placement': PlacementSpec(count=4), 'service_type': 'rgw', 'service_id': 'None.None', 'unmanaged': False, 'r...r': None, 'rgw_frontend_port': None, 'rgw_frontend_ssl_certificate': None, 'rgw_frontend_ssl_key': None, 'ssl': False})

    def validate(self):
        super(RGWSpec, self).validate()
    
        if not self.rgw_realm:
            raise ServiceSpecValidationError(
>               'Cannot add RGW: No realm specified')
E           ceph.deployment.service_spec.ServiceSpecValidationError: Cannot add RGW: No realm specified

../../python-common/ceph/deployment/service_spec.py:659: ServiceSpecValidationError
=========================== short test summary info ============================
FAILED cephadm/tests/test_scheduling.py::test_node_assignment[rgw-placement2-hosts2-daemons2-expected2]

@mgfritch
python-common: RGW service_id might not contain a zone
b54a800 
also adds missing RGWSpec.validate()

Fixes: https://tracker.ceph.com/issues/46268
Signed-off-by: Michael Fritch <mfritch@suse.com>
@mgfritch mgfritch force-pushed the cephadm-rgw-spec-validate branch from 5b4a828 to b54a800 Compare July 1, 2020 14:27
@mgfritch
Copy link
Contributor Author

mgfritch commented Jul 1, 2020

jenkins test make check

1 similar comment
@sebastian-philipp
Copy link
Contributor

sebastian-philipp commented Jul 2, 2020

jenkins test make check

@sebastian-philipp
Copy link
Contributor

sebastian-philipp commented Jul 3, 2020

jenkins test make check

1 similar comment
@sebastian-philipp
Copy link
Contributor

sebastian-philipp commented Jul 14, 2020

jenkins test make check

@sebastian-philipp
Copy link
Contributor

sebastian-philipp commented Jul 15, 2020

https://pulpito.ceph.com/swagner-2020-07-15_10:39:40-rados:cephadm-wip-swagner-testing-2020-07-15-1019-distro-basic-smithi/

@sebastian-philipp sebastian-philipp merged commit 65e6a92 into ceph:master Jul 15, 2020
@sebastian-philipp sebastian-philipp mentioned this pull request Jul 23, 2020
Merged
@mgfritch mgfritch deleted the cephadm-rgw-spec-validate branch July 23, 2020 21:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@sebastian-philipp sebastian-philipp sebastian-philipp approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

cephadm needs-qa orchestrator wip-swagner-testing My Teuthology tests

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@mgfritch @sebastian-philipp