]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Adam King [Mon, 20 Dec 2021 06:39:08 +0000 (01:39 -0500)]
mgr/cephadm: allow miscellaneous container args at service level
Fixes: https://tracker.ceph.com/issues/51566
Signed-off-by: Adam King <adking@redhat.com>
Conflicts:
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/tests/test_services.py
Ernesto Puerta [Thu, 27 Jan 2022 10:27:06 +0000 (11:27 +0100)]
Merge pull request #44727 from cfsnyder/wip-51825-pacific
pacific: qa/run-tox-mgr-dashboard: Do not write to /tmp/test_sanitize_password…
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Cory Snyder <csnyder@iland.com>
Reviewed-by: kevinzs2048 <NOT@FOUND>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Yuri Weinstein [Wed, 26 Jan 2022 23:39:24 +0000 (15:39 -0800)]
Merge pull request #44540 from kamoltat/wip-ksirivad-backport-pacific-43716
pacific: mgr/autoscaler: Introduce noautoscale flag
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Vikhyat Umrao <vikhyat@redhat.com>
Adam King [Wed, 26 Jan 2022 14:50:37 +0000 (09:50 -0500)]
Merge pull request #44660 from sebastian-philipp/pacific-backport-44647
pacific: doc/cephadm: remove duplicate deployment scenario section
Reviewed-by: Adam King <adking@redhat.com>
Adam King [Wed, 26 Jan 2022 14:46:08 +0000 (09:46 -0500)]
Merge pull request #44636 from sebastian-philipp/pacific-backport-44510
pacific: doc/cephadm: improve the development doc a bit
Reviewed-by: Adam King <adking@redhat.com>
Yuri Weinstein [Wed, 26 Jan 2022 00:27:11 +0000 (16:27 -0800)]
Merge pull request #44584 from vumrao/wip-vumrao-53876
pacific: osd/PeeringState: separate history's pruub from pg's
Reviewed-by: Neha Ojha <nojha@redhat.com>
Kamoltat [Wed, 22 Dec 2021 21:42:52 +0000 (21:42 +0000)]
docs: Added noautoscale to docs + release notes
Updated the docs in
https://docs.ceph.com/en/latest/rados/operations/placement-groups/
and updated the release notes to reflect noautoscale flag.
Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit
9baed0394e03de41f1921693bb33badd1922fa97 )
Conflicts:
PendingReleaseNotes - trivial fix
Yuri Weinstein [Tue, 25 Jan 2022 19:53:58 +0000 (11:53 -0800)]
Merge pull request #44513 from batrick/i53714
pacific: mds: fails to reintegrate strays if destdn's directory is full (ENOSPC)
Reviewed-by: Milind Changire <mchangir@redhat.com>
Kamoltat [Wed, 8 Dec 2021 15:15:50 +0000 (15:15 +0000)]
qa: Added workunit test for noautoscale flag
set and unset the noautoscale flag,
evaluate if the results are what
we expected. As well as, evaluate
if the flag is correct when we
create new pools.
Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit
bb42c71e7e059be2cc4d1d4408e475b15b1c6340 )
Conflicts:
test-noautoscale-flag.yaml
- modified pre-mgr-command to not create
device health monitor
Kamoltat [Wed, 8 Dec 2021 15:13:38 +0000 (15:13 +0000)]
pybind/mgr/autoscaler: Introduce noautoscale flag
`noautoscale` flag is a feature where the
user can choose to flip the switch between
turning autoscale `on` and `off` for all
pools with a single command.
`osd pool set noautoscale` will turn all
autoscale mode`off` for all pools.
`osd pool unset noautoscale` will turn all
autoscale mode `on` for all pools.
Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit
be17f041bab90d8f93c3e52df74cdf6c28b44ef2 )
Conflicts:
src/pybind/mgr/pg_autoscaler/module.py - trivial fix
Yuri Weinstein [Tue, 25 Jan 2022 16:04:50 +0000 (08:04 -0800)]
Merge pull request #44642 from vshankar/wip-53458
pacific: qa: wait for purge queue operations to finish
Reviewed-by: Milind Changire <mchangir@redhat.com>
Yuri Weinstein [Tue, 25 Jan 2022 16:04:15 +0000 (08:04 -0800)]
Merge pull request #44639 from vshankar/wip-53912
pacific: qa: adjust for MDSs to get deployed before verifying their availability
Reviewed-by: Milind Changire <mchangir@redhat.com>
Yuri Weinstein [Tue, 25 Jan 2022 16:03:47 +0000 (08:03 -0800)]
Merge pull request #44623 from lxbsz/wip-53908
pacific: mds: remove the duplicated or incorrect respond
Reviewed-by: Milind Changire <mchangir@redhat.com>
Yuri Weinstein [Tue, 25 Jan 2022 16:03:21 +0000 (08:03 -0800)]
Merge pull request #44622 from lxbsz/wip-53860
pacific: mds: dump tree '/' when the path is empty
Reviewed-by: Kotresh HR khiremat@redhat.com
Reviewed-by: Milind Changire <mchangir@redhat.com>
Yuri Weinstein [Tue, 25 Jan 2022 16:02:37 +0000 (08:02 -0800)]
Merge pull request #44621 from lxbsz/wip-53861
pacific: qa: do not use any time related suffix for *_op_timeouts
Reviewed-by: Kotresh HR khiremat@redhat.com
Reviewed-by: Milind Changire <mchangir@redhat.com>
Yuri Weinstein [Tue, 25 Jan 2022 16:01:47 +0000 (08:01 -0800)]
Merge pull request #44620 from lxbsz/wip-53864
pacific: mds: directly return just after responding the link request
Reviewed-by: Milind Changire <mchangir@redhat.com>
Reviewed-by: Kotresh HR khiremat@redhat.com
Yuri Weinstein [Tue, 25 Jan 2022 16:00:51 +0000 (08:00 -0800)]
Merge pull request #44516 from nmshelke/wip-53777-pacific
pacific: mgr/stats: exception handling for ceph fs perf stats command
Reviewed-by: Milind Changire <mchangir@redhat.com>
Yuri Weinstein [Tue, 25 Jan 2022 16:00:19 +0000 (08:00 -0800)]
Merge pull request #44514 from batrick/i53736
pacific: mds: recursive scrub does not trigger stray reintegration
Reviewed-by: Milind Changire <mchangir@redhat.com>
Yuri Weinstein [Tue, 25 Jan 2022 15:59:05 +0000 (07:59 -0800)]
Merge pull request #44512 from MrFreezeex/wip-52631-pacific
pacific: mds: add mds_dir_max_entries config option
Reviewed-by: Milind Changire <mchangir@redhat.com>
Guillaume Abrioux [Mon, 24 Jan 2022 12:39:15 +0000 (13:39 +0100)]
Merge pull request #44708 from guits/wip-53962-pacific
pacific: ceph-volume: show RBD devices as not available
Ernesto Puerta [Fri, 21 Jan 2022 19:44:47 +0000 (20:44 +0100)]
Merge pull request #44534 from rhcs-dashboard/wip-53834-pacific
pacific: mgr/dashboard: Update Angular version to 12
Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Kevin Zhao [Thu, 22 Jul 2021 06:58:20 +0000 (07:58 +0100)]
qa/run-tox-mgr-dashboard: Do not write to /tmp/test_sanitize_password.txt file
To allow running multiple instances of the same tests.
Fixes: https://tracker.ceph.com/issues/51792
Signed-off-by: Kevin Zhao <kevin.zhao@linaro.org>
(cherry picked from commit
d04ef800abd671a564795eba198ca976619b4cc7 )
Guillaume Abrioux [Fri, 21 Jan 2022 12:48:04 +0000 (13:48 +0100)]
Merge pull request #44701 from guits/wip-53955-pacific
pacific: ceph-volume: don't use MultiLogger in find_executable_on_host()
Michael Fritch [Tue, 18 Jan 2022 22:15:45 +0000 (15:15 -0700)]
ceph-volume: filter RBD devices from the device inventory
Avoid running `blkid` or deploying OSDs on RBD devices by ensuring they
do not appear in the `ceph-volume inventory`
Fixes: https://tracker.ceph.com/issues/53846
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
47325ec3ec5ce1d53c5eae2952f631e95b7135fe )
Adam King [Thu, 20 Jan 2022 19:51:04 +0000 (14:51 -0500)]
Merge pull request #44681 from guits/split-cephadm-distros
qa: split distro for rados/cephadm/smoke tests
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Guillaume Abrioux [Wed, 19 Jan 2022 14:04:20 +0000 (15:04 +0100)]
ceph-volume: don't use MultiLogger in find_executable_on_host()
This generates a lot of unnecessary messages on the terminal.
Fixes: https://tracker.ceph.com/issues/53934
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit
3be55621600be3ebc9c70295a3a351dab426b3a3 )
Ernesto Puerta [Thu, 20 Jan 2022 17:22:54 +0000 (18:22 +0100)]
Merge pull request #44480 from rhcs-dashboard/wip-53616-pacific
pacific: mgr/prometheus: expose ceph healthchecks as metrics
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Paul Cuzner <pcuzner@redhat.com>
Reviewed-by: sebastian-philipp <NOT@FOUND>
Guillaume Abrioux [Thu, 20 Jan 2022 10:29:52 +0000 (11:29 +0100)]
qa: split distro for rados/cephadm/smoke tests
There was a difference between master and pacific.
The hwe kernel modification for Ubuntu 20.04 should be done
only for cephadm tests. Modifying `qa/distros/all/ubuntu_20.04.yaml` broke
many tests.
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
Sebastian Wagner [Thu, 20 Jan 2022 10:09:29 +0000 (11:09 +0100)]
Merge pull request #44635 from sebastian-philipp/pacific-backport-44506
pacific: qa/suites/orch/cephadm: Also run the rbd/iscsi suite
Reviewed-by: Adam King <adking@redhat.com>
Yuri Weinstein [Wed, 19 Jan 2022 22:05:38 +0000 (14:05 -0800)]
Merge pull request #44596 from idryomov/wip-xfstests-qemu-cert-pacific
pacific: qa/run_xfstests_qemu.sh: stop reporting success without actually running any tests
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Yuri Weinstein [Wed, 19 Jan 2022 22:04:47 +0000 (14:04 -0800)]
Merge pull request #44594 from idryomov/wip-diff-iterate-parent-fix-pacific
pacific: librbd: restore diff-iterate include_parent functionality in fast-diff mode
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Yuri Weinstein [Wed, 19 Jan 2022 22:04:06 +0000 (14:04 -0800)]
Merge pull request #44547 from cfsnyder/wip-53839-pacific
pacific: librbd: diff-iterate reports incorrect offsets in fast-diff mode
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Sebastian Wagner [Wed, 19 Jan 2022 15:11:53 +0000 (16:11 +0100)]
Merge pull request #44626 from sebastian-philipp/pacific-backport-42905
pacific: python-common: improve OSD spec error messages
Reviewed-by: Michael Fritch <mfritch@suse.com>
Melissa Li [Tue, 18 Jan 2022 21:53:04 +0000 (16:53 -0500)]
doc/cephadm: remove duplicate deployment scenario section
Signed-off-by: Melissa Li <melissali@redhat.com>
(cherry picked from commit
2222f26a37137a2f70b3f736ffad16c51a6b4e44 )
Sebastian Wagner [Wed, 19 Jan 2022 12:35:41 +0000 (13:35 +0100)]
Merge pull request #44644 from guits/wip-53916-pacific
pacific: ceph-volume: fix regression introcuded via #43536
Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
Ernesto Puerta [Wed, 19 Jan 2022 12:14:59 +0000 (13:14 +0100)]
Merge pull request #44652 from rhcs-dashboard/wip-53921-pacific
pacific: mgr/dashboard: Refactoring dashboard cephadm checks
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Ernesto Puerta [Wed, 19 Jan 2022 12:03:24 +0000 (13:03 +0100)]
Merge pull request #44650 from aaSharma14/wip-53828-pacific
pacific: mgr/dashboard: monitoring:Implement BlueStore onode hit/miss counters into the dashboard
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Sebastian Wagner [Thu, 25 Nov 2021 16:38:35 +0000 (17:38 +0100)]
python-common/tests: Remove filstore tests in test_disk_selector.py
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
1c40ca1e37e5e798cfd9cf317f39b11dd22ea086 )
Sebastian Wagner [Wed, 10 Nov 2021 14:54:42 +0000 (15:54 +0100)]
python-common: Don't valiate ServiceSpec.from_json() in `orch ls`
unfortunately `ceph orch ls` may return invalid OSD specs for
OSDs not associated to and specs.
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
3f38583b7189d99be360d8475fe6ef8cd53dee7c )
Conflicts:
src/pybind/mgr/orchestrator/module.py
Sebastian Wagner [Wed, 22 Sep 2021 11:46:52 +0000 (13:46 +0200)]
python-common: HostSpec: add `validate()`
Adjust HostSpec interface to ServiceSpec
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
7c6d922dead8480cd1f2cd05be7ccd1d8d5b7dd8 )
Conflicts:
src/python-common/ceph/deployment/service_spec.py
Sebastian Wagner [Wed, 1 Sep 2021 13:46:12 +0000 (15:46 +0200)]
python-common: DriveGroupSpec: move pacement validation to validate()
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
311860412e840e6b31e04b80a9de5e9ae05e7fb7 )
Sebastian Wagner [Wed, 1 Sep 2021 13:36:01 +0000 (15:36 +0200)]
pyhton-common: DriveGroupSpec: Allow unnamed OSD specs
Cause it never actually worked as expected.
Remove duplicated service_id check, cause it's already
verified by parent method.
Fixes: https://tracker.ceph.com/issues/46253
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
8b567e132d75711179febac126c5ec8a250b8952 )
Conflicts:
src/python-common/ceph/deployment/service_spec.py
Sebastian Wagner [Tue, 24 Aug 2021 12:57:27 +0000 (14:57 +0200)]
python-common: Improve DriveSelection error messages
Fixes: https://tracker.ceph.com/issues/50685
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
74f29b97ea3331d43391cd40fe843104a2c15c3d )
Sebastian Wagner [Tue, 24 Aug 2021 10:56:21 +0000 (12:56 +0200)]
python-common: OSD specs: Improve quality of error messages
Fixes: https://tracker.ceph.com/issues/47401
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
4142c52d7406bb67042d9ad7b26d8e84f5a734ba )
Conflicts:
src/python-common/ceph/deployment/drive_group.py
Sebastian Wagner [Tue, 24 Aug 2021 12:31:56 +0000 (14:31 +0200)]
python-common: Remove duplicated DriveGroupSpec.__repr__ and __eq__
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
b91f81801af40c213adfbc88c8fd148b4edf3ede )
Conflicts:
src/python-common/ceph/deployment/drive_group.py
Sebastian Wagner [Wed, 22 Sep 2021 12:20:24 +0000 (14:20 +0200)]
mgr/orch: re-raise to make debugging easier
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
38b52f715fa581f3540ad6fc4c595ab0ede83ece )
Sebastian Wagner [Wed, 19 Jan 2022 10:39:36 +0000 (11:39 +0100)]
Merge pull request #44627 from sebastian-philipp/pacific-backport-44228
pacific: mgr/cephadm: fix 'cephadm osd activate' on existing osd devices
Reviewed-by: Adam King <adking@redhat.com>
Sebastian Wagner [Wed, 19 Jan 2022 10:39:13 +0000 (11:39 +0100)]
Merge pull request #44625 from sebastian-philipp/pacific-backport-43149
pacific: mgr/cephadm: Add client.admin keyring when upgrading from older version
Reviewed-by: Michael Fritch <mfritch@suse.com>
Guillaume Abrioux [Fri, 14 Jan 2022 17:20:10 +0000 (18:20 +0100)]
qa/cephadm: install hwe kernel only for focal
Let's install hwe kernel only on Ubuntu focal, otherwise we only shift the
problem on Ubuntu bionic given that the hwe kernel for bionic is 5.4.
Fixes: https://tracker.ceph.com/issues/53863
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit
5c0f0698a5b8db75ae9bcdca311a68a1589ee0a5 )
Guillaume Abrioux [Thu, 13 Jan 2022 21:46:03 +0000 (22:46 +0100)]
qa/nvme_loop: fix an issue on ubuntu 18.04
The following command:
```
echo /dev/sda | tee /sys/kernel/config/nvmet/subsystems/sda/namespaces/1/device_path
```
makes nvme_loop fail because fascinatingly, it adds an unexpected newline.
See:
```
/dev/sda
/dev/sda
1
tee: /sys/kernel/config/nvmet/subsystems/sda/namespaces/1/enable: No such file or directory
/dev/sda
1
```
Other distros don't have the same behavior:
```
CentOS 8
/dev/sda
/dev/sda
1
Ubuntu 20.04
/dev/sda
/dev/sda
1
```
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit
f8e22fb3da9bfbdc75d88beb66543716afb19511 )
Guillaume Abrioux [Mon, 10 Jan 2022 09:21:53 +0000 (10:21 +0100)]
ceph-volume: fix regression introcuded via #43536
The recent changes from PR #43536 introduced a regeression preventing from
running ceph-volume in a containerized context on Ubuntu 18.04.
Given that the path for the binary `lvs` differs between CentOS 8 and Ubuntu 18.04.
(`/usr/sbin/lvs` and `/sbin/lvs` respictively). It means that ceph-volume running
in the container on CentOS 8 sees the `lvs` binary at `/usr/sbin/lvs` and try to
run it with `nsenter` on the host which is running Ubuntu 18.04.
Fixes: https://tracker.ceph.com/issues/53812
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit
95e88cda3df76b59b548ae808df0ef7f19db1f63 )
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit
3c93ffdc92d4d03b9ae7415b548192a572cfc5ea )
Nizamudeen A [Thu, 13 Jan 2022 12:58:56 +0000 (18:28 +0530)]
mgr/dashboard: Refactoring dashboard cephadm checks
I isolated all the tests suites into there respective files
so that in future it is easier to add more tests to it.
I also given priority to the host actions.
Create OSD checks are now written in a way that OSDs
are created only on the intended hosts. This will make
the host draining process easier and less time consuming.
Also tried to address the flaky force maintenance checks.
Removed some duplicated codes
Service creation part improved to reduce the time taken
for its completion
Fixes: https://tracker.ceph.com/issues/53905
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit
b6759b75c9fc4d3fb565201aa6bbe0c2473fd3d4 )
Ernesto Puerta [Thu, 13 Jan 2022 16:21:12 +0000 (17:21 +0100)]
qa/dashboard: ensure node 16 is installed
For Ubuntu: https://github.com/nodesource/distributions#manual-installation
Fixes: https://tracker.ceph.com/issues/53843
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit
7225b68e46173350954beb418ecd43e9eca4d179 )
Aashish Sharma [Mon, 13 Dec 2021 12:03:02 +0000 (17:33 +0530)]
mgr/dashboard: monitoring:Implement BlueStore onode hit/miss counters into the dashboard
Provide the details pulled from Bluestore stats in order to display the onode hit/miss counters
Fixes: https://tracker.ceph.com/issues/53577
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit
15aa4dffa91b325014024d3e35603d88330b87cc )
Ernesto Puerta [Tue, 18 Jan 2022 20:01:51 +0000 (21:01 +0100)]
Merge pull request #44467 from rhcs-dashboard/wip-53780-pacific
pacific: mgr/dashboard: fix orchestrator/02-hosts-inventory.e2e failure
Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Reviewed-by: Yuri Weinstein <yweins@redhat.com>
Ernesto Puerta [Tue, 18 Jan 2022 19:58:47 +0000 (20:58 +0100)]
Merge pull request #44533 from rhcs-dashboard/wip-53825-pacific
pacific: mgr/dashboard: add test coverage for API docs (SwaggerUI)
Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Sebastian Wagner [Tue, 18 Jan 2022 13:55:31 +0000 (14:55 +0100)]
Merge pull request #44529 from sebastian-philipp/pacific-backport-43901-44341
pacific: mgr/cephadm: Add snmp-gateway service support
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Paul Cuzner <pcuzner@redhat.com>
Venky Shankar [Tue, 23 Nov 2021 09:37:01 +0000 (04:37 -0500)]
qa: wait for purge queue operations to finish
TestFragmentation.test_deep_split relies on `num_strays`
to reach zero expecting that the purge threads would
have deleted the directory entries. However, checking
`num_strays` cannot be relied on since PurqeQueue merely
journals the purge item (see PurgeQueue::push) followed
by the StrayManager marking the stray as removed thereby
accounting `num_strays`.
So, add an additional condition to check if the purge
threads have finished processing items.
Fixes: http://tracker.ceph.com/issues/52487
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit
d9c79983230a9237422998771db4b4c450aed949 )
Venky Shankar [Tue, 11 Jan 2022 09:05:03 +0000 (14:35 +0530)]
qa: adjust for MDSs to get deployed before verifying their availability
The check happens when some MDSs are *just* deployed by cephadm causing
jobs to fail with:
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
403bfcae -706b-11ec-8c32-
001a4aab830c \
-- bash -c \'ceph --format=json mds versions | jq -e ". | add == 4"\''
Fixes: http://tracker.ceph.com/issues/53857
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit
8939d8c14b911e8f57a46c442e31185ce3ca5d63 )
Radoslaw Zarzynski [Mon, 10 Jan 2022 14:10:33 +0000 (14:10 +0000)]
doc/cephadm: improve the developer's guide a bit
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit
4c58d71d2bcd6b89e1578b844d8092b692cec4b2 )
Radoslaw Zarzynski [Tue, 4 Jan 2022 15:39:13 +0000 (15:39 +0000)]
doc/cephadm: fix a typo in developing-cephadm.rst
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit
e513869fd36459518178ac321e8dda61836d4631 )
Sebastian Wagner [Mon, 10 Jan 2022 09:45:36 +0000 (10:45 +0100)]
qa/suites/orch/cephadm: Also run the rbd/iscsi suite
Adding a new workload test to our suite.
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
651192aacc4ac695a03f4ab0f7ffa045632d5d11 )
Sage Weil [Thu, 16 Dec 2021 15:00:05 +0000 (10:00 -0500)]
qa/suites/orch/cephadm/osds: test 'ceph cephadm osd activate'
Make sure this command behaves when the /var/lib/ceph osd.NNN dir is
removed.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
867bf04b74d510a544d9555afc56d5cd6657874d )
Sage Weil [Mon, 6 Dec 2021 15:19:57 +0000 (10:19 -0500)]
mgr/cephadm/services/osd: skip found osds that already have daemons
If we are trying to deploy new or newly-found osds, we can skip the ones
that already have cephadm daemons deployed.
Fixes: https://tracker.ceph.com/issues/53491
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
dc3d45bbe8c3bfedee57da619616c0be489cd233 )
Conflicts:
src/pybind/mgr/cephadm/services/osd.py
Sage Weil [Mon, 6 Dec 2021 15:19:16 +0000 (10:19 -0500)]
mgr/cephadm: allow activation of OSDs that have previously started
When this code was introduced way back in
ea987a0e56db106f7c76d11f86b3e602257f365e ,
for some reason I was focused only on freshly created OSDs. The
get_osd_uuid_map() helper is used by deploy_osd_daemons_for_existing_osds()
which is called not only by OSD creation but also by 'ceph cephadm
osd activate', which is meant to instantiate daemons for existing OSD
devices (e.g., devices that were reattached to a new server, or whose
/var/lib/ceph/$fsid/osd.$id directory was lost for some other reason.
However, if we ignore OSDs with up_from > 0, then we can't recreate a
daemon instance for such existing OSDs--arguably the most important ones,
since they may hold real data.
Fixes: https://tracker.ceph.com/issues/53491
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
40aeac7f52c80df0daa99bb664e3d672da3bc249 )
Sebastian Wagner [Mon, 20 Dec 2021 10:48:43 +0000 (11:48 +0100)]
python-common: move test_valid_snmp_gateway_spec from mgr/cephadm
We have to validate to_json() now as well, as we have spcial enums.
Otherwiese we might end up with !!python... representations.
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
303843b476b442d0d398680b23aa244633768f29 )
Sebastian Wagner [Mon, 20 Dec 2021 10:37:40 +0000 (11:37 +0100)]
python-common: move test_invalid_snmp_gateway_spec from mgr/cephadm
Let's keep the tests in the same package where the class is defined.
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
c652ae74795252f875594b09627064d97ff2a762 )
Sebastian Wagner [Thu, 16 Dec 2021 16:57:50 +0000 (17:57 +0100)]
mgr/cephadm: SNMP: don't write urls manually
this just broken for non-trivial urls. Don't be a bad example
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
3f47c2293b9ace730d6f76c613ef2106f274ea32 )
Sebastian Wagner [Thu, 16 Dec 2021 16:51:07 +0000 (17:51 +0100)]
mgr/cephadm: SNMP: Don't write default values into the store
Enable us to chage defaults in the future
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
5e3cc4d6c167b7d5bdd0f08aa90ed7e7d0779b25 )
Sebastian Wagner [Thu, 16 Dec 2021 16:43:47 +0000 (17:43 +0100)]
mgr/cephadm: SNMP: use of python3 enums
Little reason to duplicate things ourselves
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
0039accb2caedf99166b88cc5b75736b6a7fd5c2 )
Conflicts:
src/pybind/mgr/orchestrator/module.py
src/python-common/ceph/deployment/service_spec.py
src/python-common/ceph/tests/test_service_spec.py
Paul Cuzner [Fri, 12 Nov 2021 03:16:59 +0000 (16:16 +1300)]
mgr/cephadm: Add snmp-gateway service support
Add a new snmp-gateway service to provide a bridge between
Prometheus and an SNMP management platform. The gateway
service uses https://github.com/maxwo/snmp_notifier to provide
an SNMP v2c and SNMP V3 support.
The SNMP V3 support mandates at least authentication, and also
offers authentication and privacy (encryption).
Fixes: https://tracker.ceph.com/issues/52920
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
c2f5e105ca4870b2cb124db662537c20e6daadae )
Conflicts:
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/orchestrator/_interface.py
src/pybind/mgr/orchestrator/module.py
src/python-common/ceph/deployment/service_spec.py
Paul Cuzner [Fri, 12 Nov 2021 03:19:00 +0000 (16:19 +1300)]
mgr/cephadm: Add unit tests for snmp-gateway support
Adds tests to validate the deployed configuration given a known
input context, and check the parameters created based on input
various input scenarios
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
2ffa81bb91618eb70708073096f39bc1f8e2a8e6 )
Conflicts:
src/pybind/mgr/cephadm/tests/test_services.py
Paul Cuzner [Fri, 12 Nov 2021 03:17:52 +0000 (16:17 +1300)]
mgr/cephadm: Updated docs for snmp-gateway support
Updated docs to show snmp-gateway usage. docs provide
guidance on SNMP versions supported and show CLI and
yaml deployment examples.
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
91f35e1f5355bb4d1c9e7be4a943d564483f4e13 )
Paul Cuzner [Wed, 13 Oct 2021 23:35:31 +0000 (12:35 +1300)]
mgr/cephadm: provide initial snmp gateway support
This patch enables the cephadm binary
to deploy an SNMP gateway based on -
https://hub.docker.com/r/maxwo/snmp-notifier
Fixes: https://tracker.ceph.com/issues/52920
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
5c997ad355dea01b1bec0b977f4b4ac33407d8d5 )
Conflicts:
src/cephadm/cephadm
Sebastian Wagner [Mon, 29 Nov 2021 10:50:59 +0000 (11:50 +0100)]
mgr/cephadm: serve.py: put _write_client_files into it's own method
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
018807ef655068d699c70388e41284addee32040 )
Conflicts:
src/pybind/mgr/cephadm/serve.py
Sebastian Wagner [Mon, 29 Nov 2021 10:36:51 +0000 (11:36 +0100)]
mgr/cephadm: serve.py: put _calc_client_files into it's own method
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
fb2321ec6988075777d8fc838f1d19034855264a )
Conflicts:
src/pybind/mgr/cephadm/serve.py
Sebastian Wagner [Mon, 13 Sep 2021 14:05:03 +0000 (16:05 +0200)]
mgr/cephadm: Raise errors to properly set a cli status code
otherwise `ceph orch host rm` will return 0
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
1a87e5eaf54b30c1974ed02aa7e69656d0106c27 )
Sebastian Wagner [Mon, 13 Sep 2021 14:03:02 +0000 (16:03 +0200)]
mgr/cephadm: Add client.admin keyring when upgrading from older version
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
02c942a093a28376301b9b4c66d9c712345ff953 )
Conflicts:
src/pybind/mgr/cephadm/tests/test_migration.py
Sebastian Wagner [Mon, 13 Sep 2021 07:56:06 +0000 (09:56 +0200)]
mgr/cephadm/inventory: remove unused `filter_by_label`
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
8de88a1d0ac4f4747fa15d45d2a82b34d6b35a95 )
Sebastian Wagner [Tue, 18 Jan 2022 10:18:37 +0000 (11:18 +0100)]
Merge pull request #44527 from sebastian-philipp/pacific-backport-44267
pacific: python-common: add int value validation for count and count_per_host
Reviewed-by: John Mulligan <jmulligan@redhat.com>
Sebastian Wagner [Tue, 18 Jan 2022 08:52:03 +0000 (09:52 +0100)]
Merge pull request #44528 from sebastian-philipp/pacific-backport-44293
pacific: cephadm: make extract_uid_gid errors more readable
Reviewed-by: Adam King <adking@redhat.com>
Sebastian Wagner [Tue, 18 Jan 2022 08:50:13 +0000 (09:50 +0100)]
Merge pull request #44526 from sebastian-philipp/pacific-backport-44035
pacific: mgr/cephadm: less log noise when config checks fail
Reviewed-by: Adam King <adking@redhat.com>
Sebastian Wagner [Tue, 18 Jan 2022 08:49:59 +0000 (09:49 +0100)]
Merge pull request #44248 from guits/pacific-backport-44104
pacific: cephadm: pass `CEPH_VOLUME_SKIP_RESTORECON=yes` (backport)
Reviewed-by: Adam King <adking@redhat.com>
Sebastian Wagner [Tue, 18 Jan 2022 08:30:52 +0000 (09:30 +0100)]
Merge pull request #44525 from sebastian-philipp/pacific-backport-44129-44109-44309
pacific: doc/cephadm: Doc backport
Reviewed-by: Adam King <adking@redhat.com>
Sebastian Wagner [Tue, 18 Jan 2022 08:30:24 +0000 (09:30 +0100)]
Merge pull request #44535 from adk3798/backport-44134
pacific: mgr/cephadm: avoid repeated calls to get_module_option
Reviewed-by: Michael Fritch <mfritch@suse.com>
Sebastian Wagner [Tue, 18 Jan 2022 08:29:48 +0000 (09:29 +0100)]
Merge pull request #44531 from sebastian-philipp/pacific-backport-44020
pacific: mgr/orchestrator: add filtering and count option for orch host ls
Reviewed-by: Adam King <adking@redhat.com>
Xiubo Li [Tue, 7 Dec 2021 01:49:14 +0000 (09:49 +0800)]
mds: remove the duplicated or incorrect respond
The try_get_auth_inode() has already responded to the client or
forwarded to auth MDS if returning NULL.
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit
d75164fd60427aa38a144da2587a6c815253993b )
Xiubo Li [Wed, 5 Jan 2022 05:25:55 +0000 (13:25 +0800)]
qa: add test for dumpping subtrees
Fixes: https://tracker.ceph.com/issues/53726
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit
bbc4f4461ff8c043b10ab68c582a02ffec5c8816 )
Xiubo Li [Fri, 24 Dec 2021 04:50:23 +0000 (12:50 +0800)]
mds: dump tree '/' when the path is empty
The `get subtrees` will return the path '' for the '0x1', and if
we pass '' to the `dump tree ''` command, the MDS will crash.
Fixes: https://tracker.ceph.com/issues/53726
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit
cc80cea0db697ceec7a8c4d5dacc4840e661834e )
Xiubo Li [Wed, 15 Dec 2021 03:53:34 +0000 (11:53 +0800)]
mds: support '~mds{rank number}' for dump tree
The 'get subtrees' command will show the '~mdsdir' as '~mds{rank}'
instead. It's strange that 'dump tree ~mds{rank} depth' doesn't
work.
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit
6b0bfe2186b78c1dd17b4a21aef56dffdfec73fa )
Xiubo Li [Wed, 29 Dec 2021 04:31:48 +0000 (12:31 +0800)]
qa: do not use any time related suffix for *_op_timeouts
When testing the upgration, for the old version the *_op_timeouts
options' type is TYPE_FLOAT, but when parsing them by strict_strtod
it will failed with error:
strict_strtod: garbage at end of string. got: '15m'
This commit will remove the 'm' suffix by switch the time to 900,
thus the old version still could parse it successfully.
Introduced-by: d060c9a768c6974d3b68e4d408edf78bba9e0e85
https://tracker.ceph.com/issues/51705
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit
bff813671603c02fdd7e51e88c4d701c2b56983b )
Xiubo Li [Tue, 4 Jan 2022 03:18:53 +0000 (11:18 +0800)]
mds: directly return just after responding the link request
Fixes: https://tracker.ceph.com/issues/53750
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit
14f9840dbf5ad288ae71af3311e3283f8f3964a6 )
Sebastian Wagner [Mon, 17 Jan 2022 09:16:37 +0000 (10:16 +0100)]
Merge pull request #44530 from sebastian-philipp/pacific-backport-44336
pacific: mgr/cephadm: Fix test_facts
Reviewed-by: Adam King <adking@redhat.com>
Patrick Donnelly [Wed, 15 Dec 2021 15:00:29 +0000 (10:00 -0500)]
mds: skip directory size checks for reintegration
Directory size will not change.
Fixes: https://tracker.ceph.com/issues/53619
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
cdc7e67abcdedf33523e876431ad1abb2492a74d )
Conflicts:
src/mds/Server.cc: depends on #44512
Patrick Donnelly [Wed, 15 Dec 2021 15:06:34 +0000 (10:06 -0500)]
qa: test reintegration with directory limits
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
fe46985a638ee1588855ef41e617b3ef33cde82f )
Patrick Donnelly [Thu, 16 Dec 2021 15:44:40 +0000 (10:44 -0500)]
mds: trigger stray reintegration when loading dentry
During recursive scrub, the MDS will load a remote dentry into cache but
not necessarily check if reintegration is necessary. Before this commit,
it would only happen when the dentry is returned from a client request.
To effect global reintegration when there are too many strays, this
means a cluster admin would have to do `find` on the CephFS file system.
This is unsavory because of the cache / cap explosion involved.
Fixes: https://tracker.ceph.com/issues/53641
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
83f9a49dfddcba06ab3e0cd9b860523fafad4605 )
Patrick Donnelly [Thu, 16 Dec 2021 16:14:08 +0000 (11:14 -0500)]
qa: test that scrub causes reintegration
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
bf4168245dec531cb75086fc42f5cbfeb80ce365 )
Ernesto Puerta [Fri, 14 Jan 2022 17:24:05 +0000 (18:24 +0100)]
Merge pull request #44597 from rhcs-dashboard/wip-53881-pacific
pacific: mgr/dashboard: fix: get SMART data from single-daemon device
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Alfonso Martínez [Thu, 13 Jan 2022 14:20:48 +0000 (15:20 +0100)]
mgr/dashboard: fix: get SMART data from single-daemon device
Return SMART data even when a device is only associated with a single daemon.
Fixes: https://tracker.ceph.com/issues/53858
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit
6cd3729e2737f9012569cffc6fd69cc5eed287ed )
Ilya Dryomov [Tue, 11 Jan 2022 20:26:12 +0000 (21:26 +0100)]
qa/tasks/qemu: get the new Let's Encrypt root certificate
Fixes: https://tracker.ceph.com/issues/53841
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
b47965b5773d086eb64e7f91bdc05f483f562b00 )