Skip to content

mgr/cephadm: Activate existing OSDs#39639

Merged
sebastian-philipp merged 3 commits intoceph:masterfrom
sebastian-philipp:cephadm-deploy-daemon-units-for-existing-osds
Mar 5, 2021
Merged

mgr/cephadm: Activate existing OSDs#39639
sebastian-philipp merged 3 commits intoceph:masterfrom
sebastian-philipp:cephadm-deploy-daemon-units-for-existing-osds

Conversation

@sebastian-philipp
Copy link
Contributor

@sebastian-philipp sebastian-philipp commented Feb 23, 2021 •
edited
Loading

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

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 api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox

@sebastian-philipp sebastian-philipp requested a review from a team as a code owner February 23, 2021 11:25
mgfritch
mgfritch approved these changes Feb 24, 2021
View reviewed changes
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.

seems ok in general, but what about pre-octopus OSDs? ... should we prevent using this in that case and force an adopt?

src/pybind/mgr/cephadm/module.py Outdated
Comment on lines +1108 to +1109


Copy link
Contributor

@mgfritch mgfritch Feb 24, 2021

Choose a reason for hiding this comment

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

Suggested change

E303 too many blank lines (2)

@github-actions
Copy link

github-actions bot commented Feb 26, 2021

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

@sebastian-philipp sebastian-philipp force-pushed the cephadm-deploy-daemon-units-for-existing-osds branch from 9665292 to 2a438a9 Compare March 1, 2021 12:37
@sebastian-philipp sebastian-philipp added the wip-swagner-testing My Teuthology tests label Mar 1, 2021
@sebastian-philipp
Copy link
Contributor Author

sebastian-philipp commented Mar 2, 2021 

>           raise AssertionError(_error_message()) from cause
E           AssertionError: Expected call: _run_cephadm('test', 'osd', 'ceph-volume', ['--', 'lvm', 'list', '--format', 'json'])
E           Actual call: _run_cephadm('test', 'osd', 'ceph-volume', ['--', 'lvm', 'list', '--format', 'json'], image='', no_fsid=False)

/usr/lib/python3.6/unittest/mock.py:814: AssertionError
------------------------------ Captured log call -------------------------------
ERROR    cephadm.services.osd:osd.py:315 Cannot decode JSON: ''
Traceback (most recent call last):
  File "/home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr/cephadm/services/osd.py", line 313, in find_destroyed_osds
    tree = json.loads(out)
  File "/usr/lib/python3.6/json/__init__.py", line 354, in loads
    return _default_decoder.decode(s)
  File "/usr/lib/python3.6/json/decoder.py", line 339, in decode
    obj, end = self.raw_decode(s, idx=_w(s, 0).end())
  File "/usr/lib/python3.6/json/decoder.py", line 357, in raw_decode
    raise JSONDecodeError("Expecting value", s, err.value) from None
json.decoder.JSONDecodeError: Expecting value: line 1 column 1 (char 0)
=========================== short test summary info ============================
FAILED cephadm/tests/test_cephadm.py::TestCephadm::test_apply_osd_save_non_collocated

@sebastian-philipp
mgr/cephadm: osd: Use _run_cephadm_json()
555cada 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
@sebastian-philipp
mgr/cephadm: Activate existing OSDs
50295a6 
Adds `ceph cephadm osd activate`

Fixes: https://tracker.ceph.com/issues/49159
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
@sebastian-philipp
mgr/cephadm/osd: PEP-8 fix
bf9d5cb 
Otherwise `tox -e fix` will continue to
create this hunk

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
@sebastian-philipp sebastian-philipp force-pushed the cephadm-deploy-daemon-units-for-existing-osds branch from 2a438a9 to bf9d5cb Compare March 2, 2021 11:23
@sebastian-philipp
Copy link
Contributor Author

sebastian-philipp commented Mar 2, 2021

changelog:

  • PEP-8
  • fix make check

@sebastian-philipp
Copy link
Contributor Author

sebastian-philipp commented Mar 2, 2021

https://pulpito.ceph.com/swagner-2021-03-02_10:27:34-rados:cephadm-wip-swagner-testing-2021-03-01-1657-distro-basic-smithi/

@sebastian-philipp
Copy link
Contributor Author

sebastian-philipp commented Mar 2, 2021

jenkins test make check

@sebastian-philipp sebastian-philipp added ready-to-merge and removed wip-swagner-testing My Teuthology tests labels Mar 2, 2021
@sebastian-philipp sebastian-philipp merged commit 2844026 into ceph:master Mar 5, 2021
@liewegas liewegas mentioned this pull request Mar 15, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mgfritch mgfritch mgfritch approved these changes

Assignees

No one assigned

Labels

cephadm documentation pybind ready-to-merge

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@sebastian-philipp @mgfritch