Skip to content

Cephadm Pacific Batch Backport March#45716

Merged
yuriw merged 15 commits intoceph:pacificfrom
adk3798:pacific-backport-march
Apr 8, 2022
Merged

Cephadm Pacific Batch Backport March#45716
yuriw merged 15 commits intoceph:pacificfrom
adk3798:pacific-backport-march

Conversation

@adk3798
Copy link
Contributor

@adk3798 adk3798 commented Mar 30, 2022 •
edited
Loading

Backport of #45113 #44965 #45039 #45527 #45401 #45399 #45314 #45241 #44343 #45702 #45275 #45217 #45248 #45310

Changelog: Added #45361
Changelog: Dropped #45534

Checklist

  • Tracker (select at least one)
    • References tracker ticket
    • Very recent bug; references commit where it was introduced
    • New feature (ticket optional)
    • Doc update (no ticket needed)
    • Code cleanup (no ticket needed)
  • Component impact
    • Affects Dashboard, opened tracker ticket
    • Affects Orchestrator, opened tracker ticket
    • No impact that needs to be tracked
  • Documentation (select at least one)
    • Updates relevant documentation
    • No doc update is appropriate
  • Tests (select at least one)
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
  • jenkins test windows

@adk3798 adk3798 requested review from a team as code owners March 30, 2022 21:04
@github-actions github-actions bot added this to the pacific milestone Mar 30, 2022
@adk3798 adk3798 force-pushed the pacific-backport-march branch from bb3d791 to 74ceb65 Compare March 30, 2022 21:53
adk3798 and others added 14 commits April 5, 2022 16:10
@adk3798
qa/tasks/cephadm_cases: increase timeouts in test_cli.py
c939e1a 
These seem to be failing sometimes but in my testing
sometimes these events are happening a few seconds after
we hit the timeout. Trying to see if this makes the tests
more consistent. No need to mark the test as failed
if we report something up in 34 seconds vs 25 especially
when cephadm works on a cyclic daemon refresh.

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 46f939f)

Conflicts:
	qa/tasks/cephadm_cases/test_cli.py
@adk3798
cephadm: still set container_image when --no-assimilate-config is pro…
18e007b 
…vided

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

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 59d004c)
@inspur-wyq @adk3798
doc/cephadm/adoption.rst: fix typos
ce8b0ee 
Signed-off-by: wangyunqing <wangyunqing@inspur.com>
(cherry picked from commit e4db28f)
@rkachach @adk3798
mgr/cephadm: adding HostSpec validation
6ef1900 
Fixes: https://tracker.ceph.com/issues/54342

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 15ba147)
@adk3798
cephadm: verify config file exists when inferring it
864d93a 
Fixes: https://tracker.ceph.com/issues/54571

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 1568875)
@rkachach @adk3798
mgr/cephadm: checking service name before removal
66c56a0 
Fixes: https://tracker.ceph.com/issues/54503

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit b26c114)
@adk3798
mgr/cephadm: Reschedule nfs daemons from offline hosts
84a650d 
In order to improve nfs availability, if there are other
hosts we can place an nfs daemon on or if there is a host
with a lower rank nfs daemon when a higher rank one is on
an offline host, we should reschedule the nfs daemons

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 9febc21)

 Conflicts:
	src/pybind/mgr/cephadm/utils.py
@adk3798
mgr/cephadm: offline host watcher
2f58f78 
To be able to detect if certain offline hosts go
offline quicker. Could be useful for the NFS
HA feature as this requires moving nfs daemons from
offline hosts within 90 seconds.

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit bd9eb59)

Conflicts:
	src/pybind/mgr/cephadm/module.py
	src/pybind/mgr/cephadm/ssh.py
	src/pybind/mgr/cephadm/tests/fixtures.py
	src/pybind/mgr/cephadm/utils.py
@rkachach @adk3798
mgr/cephadm: check spec host when adding osd
9c0bbe2 
Fixes: https://tracker.ceph.com/issues/47872

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit b87c966)

Conflicts:
	src/pybind/mgr/orchestrator/module.py
@inspur-wyq @adk3798
doc/cephadm/operations.rst: fix typos
b616efd 
Signed-off-by: wangyunqing <wangyunqing@inspur.com>
(cherry picked from commit 92eb799)
@adk3798
python-common/drive_group: add extra_container_args to supported feat…
2a70a72 
…ures

Should have been added when extending extra container args
to all the services but was missed

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit f036bda)

Conflicts:
	src/python-common/ceph/deployment/drive_group.py
@Matan-B @adk3798
qa/tasks/cephfs: increase timeout in test_nfs.py
8efa508 
Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 44ad552)
@adk3798
cephadm: respect --skip-firewalld flag
11d250e 
Fixes: https://tracker.ceph.com/issues/54137

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit d97057f)
@adk3798
mgr/cephadm: fixing prometheus port handling
b9fe739 
Fixes: https://tracker.ceph.com/issues/51072

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 8eb1397)

Conflicts:
	src/pybind/mgr/prometheus/module.py
@adk3798
qa/suites/fs: stop looping in mds upgrade test if upgrade failed
a4423a7 
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 37019aa)
@adk3798 adk3798 force-pushed the pacific-backport-march branch from e9f862c to a4423a7 Compare April 5, 2022 20:12
@yuriw yuriw merged commit ac97883 into ceph:pacific Apr 8, 2022
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

ceph-volume cephadm cephfs Ceph File System documentation monitoring needs-qa nfs orchestrator pybind tests wip-yuri2-testing

Projects

None yet

Milestone

pacific

Development

Successfully merging this pull request may close these issues.

6 participants

@adk3798 @mgfritch @yuriw @inspur-wyq @rkachach @Matan-B