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.

Sign up for GitHub

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

Jump to bottom

mgr/cephadm: Add client.admin keyring when upgrading from older version #43149

Merged
merged 5 commits into from Dec 1, 2021
Merged

mgr/cephadm: Add client.admin keyring when upgrading from older version #43149

merged 5 commits into from Dec 1, 2021

Conversation

sebastian-philipp
Copy link
Contributor

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 cephadm
  • 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 September 13, 2021 14:05
liewegas
liewegas approved these changes Sep 13, 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.

looks reasonable to me!

@sebastian-philipp sebastian-philipp added wip-swagner-testing My Teuthology tests and removed wip-swagner-testing My Teuthology tests labels Sep 13, 2021
mgfritch
mgfritch reviewed Sep 13, 2021
View reviewed changes
src/pybind/mgr/cephadm/migrations.py Outdated Show resolved Hide resolved
src/pybind/mgr/cephadm/tests/test_cephadm.py Outdated Show resolved Hide resolved
src/pybind/mgr/cephadm/tests/test_cephadm.py Show resolved Hide resolved
@github-actions
Copy link

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 the wip-swagner-testing My Teuthology tests label Nov 10, 2021
@sebastian-philipp
Copy link
Contributor Author

rebased

@sebastian-philipp
Copy link
Contributor Author 

teuthology.exceptions.CommandFailedError: Command failed on smithi016 with status 1: "sudo /home/ubuntu/cephtest/cephadm --image docker.io/ceph/ceph:v16.2.4 shell -c /etc/ceph/ceph.conf -k /etc/ceph/ceph.client.admin.keyring --fsid b99d5e34-46dc-11ec-8c2c-001a4aab830c -- bash -c 'ceph config get mgr mgr/cephadm/migration_current | grep 3'"

@sebastian-philipp
Copy link
Contributor Author

Just saw this also:

2021-11-16T16:51:41.673 INFO:journalctl@ceph.mon.smithi084.smithi084.stdout:Nov 16 16:51:41 smithi084 ceph-mon[105090]: unable to calc client keyring client.admin placement PlacementSpec(label='_admin'): Cannot 
place <ServiceSpec for service_name=mon>: No matching hosts for label _admin
2021-11-16T16:51:41.673 INFO:journalctl@ceph.mon.smithi084.smithi084.stdout:Nov 16 16:51:41 smithi084 ceph-mon[105090]: from='mgr.34104 172.21.15.84:0/2500387284' entity='mgr.smithi084.rrvvbg'
2021-11-16T16:51:41.673 INFO:journalctl@ceph.mon.smithi084.smithi084.stdout:Nov 16 16:51:41 smithi084 ceph-mon[105090]: from='mgr.34104 172.21.15.84:0/2500387284' entity='mgr.smithi084.rrvvbg'
2021-11-16T16:51:41.673 INFO:journalctl@ceph.mon.smithi084.smithi084.stdout:Nov 16 16:51:41 smithi084 ceph-mon[105090]: pgmap v261: 129 pgs: 129 active+clean; 207 MiB data, 906 MiB used, 714 GiB / 715 GiB avail;
 170 B/s rd, 0 op/s
2021-11-16T16:51:42.874 DEBUG:teuthology.orchestra.run.smithi084:> sudo /home/ubuntu/cephtest/cephadm --image docker.io/ceph/ceph:v16.2.5 shell -c /etc/ceph/ceph.conf -k /etc/ceph/ceph.client.admin.keyring --fsi
d 2fe7eeb0-46fb-11ec-8c2c-001a4aab830c -e sha1=d00da0dae00bf2c237888193c6222945bdd44895 -- bash -c 'ceph orch ps'
2021-11-16T16:51:42.900 INFO:journalctl@ceph.mon.smithi084.smithi084.stdout:Nov 16 16:51:42 smithi084 ceph-mon[105090]: pgmap v262: 129 pgs: 129 active+clean; 207 MiB data, 906 MiB used, 714 GiB / 715 GiB avail; 341 B/s rd, 0 op/s
2021-11-16T16:51:43.177 INFO:teuthology.orchestra.run.smithi084.stderr:ERROR: [Errno 2] No such file or directory: '/etc/ceph/ceph.conf'
2021-11-16T16:51:43.195 DEBUG:teuthology.orchestra.run:got remote process result: 1

This was referenced Nov 17, 2021
Merged
Merged
@github-actions
Copy link

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

@sebastian-philipp sebastian-philipp removed the wip-swagner-testing My Teuthology tests label Nov 18, 2021
@sebastian-philipp sebastian-philipp added the wip-swagner-testing My Teuthology tests label Nov 18, 2021
@sebastian-philipp
Copy link
Contributor Author

failed: https://pulpito.ceph.com/swagner-2021-11-18_15:21:11-orch:cephadm-wip-swagner-testing-2021-11-18-1159-distro-default-smithi/

2021-11-18T17:16:49.238 DEBUG:teuthology.orchestra.run.smithi073:> sudo /home/ubuntu/cephtest/cephadm --image docker.io/ceph/ceph:v16.2.5 shell -c /etc/ceph/ceph.conf -k /etc/ceph/ceph.client.admin.keyring --fsid f183e858-4890-11ec-8c2c-001a4aab830c -e sha1=80382af1ea5f62daedbd7945c24ea56590dddd99 -- bash -c 'ceph orch ps'
2021-11-18T17:16:49.543 INFO:teuthology.orchestra.run.smithi073.stderr:ERROR: [Errno 2] No such file or directory: '/etc/ceph/ceph.conf'
2021-11-18T17:16:49.561 DEBUG:teuthology.orchestra.run:got remote process result: 1

https://pulpito.ceph.com/swagner-2021-11-18_15:21:11-orch:cephadm-wip-swagner-testing-2021-11-18-1159-distro-default-smithi/6512016

@sebastian-philipp sebastian-philipp removed the wip-swagner-testing My Teuthology tests label Nov 22, 2021
@sebastian-philipp
mgr/cephadm/inventory: remove unused filter_by_label
8de88a1 
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
@sebastian-philipp
mgr/cephadm: Add client.admin keyring when upgrading from older version
02c942a 
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
@sebastian-philipp
mgr/cephadm: Raise errors to properly set a cli status code
1a87e5e 
otherwise `ceph orch host rm` will return 0

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
@sebastian-philipp
mgr/cephadm: serve.py: put _calc_client_files into it's own method
fb2321e 
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
@sebastian-philipp
mgr/cephadm: serve.py: put _write_client_files into it's own method
018807e 
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
@sebastian-philipp
Copy link
Contributor Author

https://pulpito.ceph.com/swagner-2021-12-01_08:46:48-orch:cephadm-wip-swagner-testing-2021-11-30-1105-distro-default-smithi/

(unrelated) We now have an ugly bug preventing the nfs upgrade from completing: https://tracker.ceph.com/issues/53424

@sebastian-philipp
Copy link
Contributor Author

jenkins test api

@sebastian-philipp sebastian-philipp added ready-to-merge and removed wip-swagner-testing My Teuthology tests labels Dec 1, 2021
@sebastian-philipp sebastian-philipp merged commit 4898706 into ceph:master Dec 1, 2021
@sebastian-philipp sebastian-philipp mentioned this pull request Jan 18, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adk3798 adk3798 adk3798 left review comments

@liewegas liewegas liewegas approved these changes

@mgfritch mgfritch mgfritch approved these changes

Assignees
No one assigned
Labels
cephadm needs-qa pybind ready-to-merge
Projects
None yet
Milestone
No milestone
4 participants
@sebastian-philipp @liewegas @mgfritch @adk3798