Skip to content

cephadm: cephfs-mirror#39640

Merged
sebastian-philipp merged 9 commits intoceph:masterfrom
sebastian-philipp:cephadm-cephfs-mirror
Mar 10, 2021
Merged

cephadm: cephfs-mirror#39640
sebastian-philipp merged 9 commits intoceph:masterfrom
sebastian-philipp:cephadm-cephfs-mirror

Conversation

@sebastian-philipp
Copy link
Contributor

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

https://tracker.ceph.com/issues/47261

DNM, cause this PR depends on changes in cephfs-mirror itself.

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 added the cephfs Ceph File System label Feb 23, 2021
@sebastian-philipp sebastian-philipp requested a review from a team as a code owner February 23, 2021 15:08
@sebastian-philipp
Copy link
Contributor Author

sebastian-philipp commented Feb 23, 2021 

AttributeError: type object 'Orchestrator' has no attribute 'add_mon'
Traceback (most recent call last):
  File "/home/jenkins-build/build/workspace/ceph-pr-docs/build-doc/virtualenv/lib/python3.6/site-packages/sphinx/util/inspect.py", line 325, in safe_getattr
    return getattr(obj, name, *defargs)
AttributeError: type object 'Orchestrator' has no attribute 'add_mon'

@sebastian-philipp
Copy link
Contributor Author

sebastian-philipp commented Feb 23, 2021 

NameError: name 'MgrCluster' is not defined
Traceback (most recent call last):
  File "../qa/tasks/vstart_runner.py", line 142, in 
    from tasks.mgr.mgr_test_case import MgrCluster
  File "/home/jenkins-build/build/workspace/ceph-api/qa/tasks/mgr/mgr_test_case.py", line 7, in 
    from tasks.ceph_test_case import CephTestCase
  File "/home/jenkins-build/build/workspace/ceph-api/qa/tasks/ceph_test_case.py", line 16, in 
    class CephTestCase(unittest.TestCase):
  File "/home/jenkins-build/build/workspace/ceph-api/qa/tasks/ceph_test_case.py", line 30, in CephTestCase
    mgr_cluster: Optional[MgrCluster] = None

@sebastian-philipp
Copy link
Contributor Author

sebastian-philipp commented Feb 23, 2021 

orchestrator/module.py:873:9: F841 local variable 'daemon_type' is assigned to but never used
1     F841 local variable 'daemon_type' is assigned to but never used

batrick
batrick reviewed Feb 24, 2021
View reviewed changes
src/pybind/mgr/cephadm/services/cephadmservice.py
ret, keyring, err = self.mgr.check_mon_command({
'prefix': 'auth get-or-create',
'entity': self.get_auth_entity(daemon_spec.daemon_id),
'caps': ['mon', 'allow r',
Copy link
Member

@batrick batrick Feb 24, 2021

Choose a reason for hiding this comment

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

FYI, this may become profile cephfs-mirror. See also: #39657 (review)

src/pybind/mgr/cephadm/services/cephadmservice.py
'caps': ['mon', 'allow r',
'mds', 'allow r',
'osd', 'allow rw tag cephfs metadata=*, allow r tag cephfs data=*',
'mgr', 'allow r'],
Copy link
Member

@batrick batrick Feb 24, 2021

Choose a reason for hiding this comment

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

@vshankar does cephfs-mirror require talking to the mgr?

Copy link
Contributor Author

@sebastian-philipp sebastian-philipp Feb 24, 2021

Choose a reason for hiding this comment

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

in any case, please keep the docs up to date: https://docs.ceph.com/en/latest/dev/cephfs-mirroring/#creating-users

Copy link
Contributor

@vshankar vshankar Mar 3, 2021

Choose a reason for hiding this comment

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

with the service daemon changes (PR #39408), mirror daemon registers itself as a service daemon with the manager and periodically forwards mirror stats to ceph-mgr.

@github-actions
Copy link

github-actions bot commented Feb 25, 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 added wip-swagner-testing My Teuthology tests and removed DNM labels Mar 1, 2021
@sebastian-philipp sebastian-philipp changed the title [DNM] cephadm: cephfs-mirror cephadm: cephfs-mirror Mar 1, 2021
@sebastian-philipp
Copy link
Contributor Author

sebastian-philipp commented Mar 1, 2021

removing DNM, as cephfs-mirror is happy when deployed even without the required parameters.

@github-actions
Copy link

github-actions bot commented Mar 2, 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 commented Mar 2, 2021
View reviewed changes
qa/tasks/cephadm_cases/test_cli.py
Comment on lines +58 to +63
def test_cephfs_mirror(self):
self._orch_cmd('apply', 'cephfs-mirror')
self.wait_until_true(lambda: 'cephfs-mirror' in self._orch_cmd('ps'), 30)
self.wait_for_health_clear(30)
self._orch_cmd('rm', 'cephfs-mirror')
self.wait_until_true(lambda: 'cephfs-mirror' not in self._orch_cmd('ps'), 30)
Copy link
Contributor Author

@sebastian-philipp sebastian-philipp Mar 2, 2021

Choose a reason for hiding this comment

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

works!

2021-03-02T19:44:23.056 INFO:teuthology.orchestra.run.smithi119.stdout:NAME                             HOST       STATUS         REFRESHED  AGE  VERSION                IMAGE NAME                                                                                         IMAGE ID      CONTAINER ID
2021-03-02T19:44:23.057 INFO:teuthology.orchestra.run.smithi119.stdout:cephfs-mirror.smithi119.ibwgsg   smithi119  running (2s)   0s ago     2s   17.0.0-1350-g66803909  quay.ceph.io/ceph-ci/ceph@sha256:af9d1955f9cd6de7664701020fcc2c1d662bbc71e97a2c9bbd6de81d42eccfad  9cb9ba24e77b  6584290460dc
2021-03-02T19:44:23.058 INFO:teuthology.orchestra.run.smithi119.stdout:mds.a.smithi119.mbsbao           smithi119  running (7m)   0s ago     7m   17.0.0-1350-g66803909  quay.ceph.io/ceph-ci/ceph@sha256:af9d1955f9cd6de7664701020fcc2c1d662bbc71e97a2c9bbd6de81d42eccfad  9cb9ba24e77b  f70354890707
2021-03-02T19:44:23.059 INFO:teuthology.orchestra.run.smithi119.stdout:mds.nfs-cephfs.smithi119.cspdll  smithi119  running (90s)  0s ago     90s  17.0.0-1350-g66803909  quay.ceph.io/ceph-ci/ceph@sha256:af9d1955f9cd6de7664701020fcc2c1d662bbc71e97a2c9bbd6de81d42eccfad  9cb9ba24e77b  31820a428e41
2021-03-02T19:44:23.059 INFO:teuthology.orchestra.run.smithi119.stdout:mgr.a                            smithi119  running (18s)  0s ago     10m  17.0.0-1350-g66803909  quay.ceph.io/ceph-ci/ceph:668039098c77157a4f5b86625878033d89b30dd2                                 9cb9ba24e77b  fe9f2793c1d0
2021-03-02T19:44:23.059 INFO:teuthology.orchestra.run.smithi119.stdout:mon.a                            smithi119  running (10m)  0s ago     10m  17.0.0-1350-g66803909  quay.ceph.io/ceph-ci/ceph:668039098c77157a4f5b86625878033d89b30dd2                                 9cb9ba24e77b  4387ac5efb2b
2021-03-02T19:44:23.060 INFO:teuthology.orchestra.run.smithi119.stdout:osd.0                            smithi119  running (9m)   0s ago     9m   17.0.0-1350-g66803909  quay.ceph.io/ceph-ci/ceph@sha256:af9d1955f9cd6de7664701020fcc2c1d662bbc71e97a2c9bbd6de81d42eccfad  9cb9ba24e77b  ac43728b9b17
2021-03-02T19:44:23.060 INFO:teuthology.orchestra.run.smithi119.stdout:osd.1                            smithi119  running (8m)   0s ago     8m   17.0.0-1350-g66803909  quay.ceph.io/ceph-ci/ceph@sha256:af9d1955f9cd6de7664701020fcc2c1d662bbc71e97a2c9bbd6de81d42eccfad  9cb9ba24e77b  51f64fc30e0b
2021-03-02T19:44:23.061 INFO:teuthology.orchestra.run.smithi119.stdout:osd.2                            smithi119  running (8m)   0s ago     8m   17.0.0-1350-g66803909  quay.ceph.io/ceph-ci/ceph@sha256:af9d1955f9cd6de7664701020fcc2c1d662bbc71e97a2c9bbd6de81d42eccfad  9cb9ba24e77b  221d1c3f3f39
2021-03-02T19:44:29.721 INFO:tasks.cephfs_test_runner:test_cephfs_mirror (tasks.cephadm_cases.test_cli.TestCephadmCLI) ... ok

@sebastian-philipp
Copy link
Contributor Author

sebastian-philipp commented Mar 3, 2021

https://pulpito.ceph.com/swagner-2021-03-02_17:23:47-rados:cephadm-wip-swagner3-testing-2021-03-02-1313-distro-basic-smithi/5927530

2021-03-02T18:18:46.643 INFO:tasks.ceph.mgr.x.smithi028.stderr:2021-03-02T18:18:46.641+0000 7fbccf801700 -1 Remote method threw exception: Traceback (most recent call last):
2021-03-02T18:18:46.644 INFO:tasks.ceph.mgr.x.smithi028.stderr:  File "/usr/share/ceph/mgr/orchestrator/_interface.py", line 1044, in add_daemon
2021-03-02T18:18:46.644 INFO:tasks.ceph.mgr.x.smithi028.stderr:    raise NotImplementedError()
2021-03-02T18:18:46.644 INFO:tasks.ceph.mgr.x.smithi028.stderr:NotImplementedError
2021-03-02T18:18:46.644 INFO:tasks.ceph.mgr.x.smithi028.stderr:
2021-03-02T18:18:46.645 INFO:tasks.ceph.mgr.x.smithi028.stderr:2021-03-02T18:18:46.641+0000 7fbccf801700 -1 mgr.server reply reply (2) No such file or directory This Orchestrator does not support `orch daemon add mds`

@sebastian-philipp sebastian-philipp mentioned this pull request Mar 3, 2021
Merged
3 tasks
@github-actions
Copy link

github-actions bot commented Mar 4, 2021

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

@sebastian-philipp
Copy link
Contributor Author

sebastian-philipp commented Mar 10, 2021

https://pulpito.ceph.com/swagner-2021-03-09_14:01:08-rados:cephadm-wip-swagner3-testing-2021-03-09-1022-distro-basic-smithi/

@github-actions
Copy link

github-actions bot commented Mar 10, 2021

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

@sebastian-philipp
mgr/cephadm: move CephadmExporter to new module
935a15f 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
@sebastian-philipp
mgr/cephadm: drop create_func arg from _add_daemon
2465f98 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
@sebastian-philipp
mgr/orch: replace def add_{type}(...) with generic add_daemon()
175ee83 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
@sebastian-philipp
mgr/cephadm: Add CephfsMirrorService
f2f9f51 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
@sebastian-philipp
mgr/orch: Add cephfs-mirror to enum
d9d8d71 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
@sebastian-philipp
qa/tasks: some type annotations
340281f 
Mostly for making my IDE aware of things

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
@sebastian-philipp
qa/cephadm: Add cephfs-mirror test
d4bf715 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
@sebastian-philipp
cephadm: Add cephfs-mirror
8fa941b 
Fixes: https://tracker.ceph.com/issues/47261
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
@sebastian-philipp
mgr/cephadm: add cephfs-mirror to CEPH_UPGRADE_ORDER
f885072 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
liewegas
liewegas approved these changes Mar 10, 2021
View reviewed changes
Copy link
Member

@liewegas liewegas left a comment

Choose a reason for hiding this comment

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

Yes! Let's merge this sooner rather than later as it conflicts with #39677 and #39979 at least

@sebastian-philipp sebastian-philipp merged commit 1d2009c into ceph:master Mar 10, 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

@batrick batrick batrick left review comments

@liewegas liewegas liewegas approved these changes

@vshankar vshankar Awaiting requested review from vshankar

Assignees

No one assigned

Labels

cephadm cephfs Ceph File System documentation mgr orchestrator pybind ready-to-merge tests

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@sebastian-philipp @vshankar @liewegas @batrick