]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
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 [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 )
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>
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>
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>
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 )
Yuri Weinstein [Thu, 13 Jan 2022 15:50:19 +0000 (07:50 -0800)]
Merge pull request #44296 from batrick/i53445
pacific: mds: opening connection to up:replay/up:creating daemon causes message drop
Reviewed-by: Milind Changire <mchangir@redhat.com>
Yuri Weinstein [Thu, 13 Jan 2022 15:49:50 +0000 (07:49 -0800)]
Merge pull request #44272 from nmshelke/wip-53332-pacific
pacific: doc: prerequisites fix for cephFS mount
Reviewed-by: Milind Changire <mchangir@redhat.com>
Yuri Weinstein [Thu, 13 Jan 2022 15:49:25 +0000 (07:49 -0800)]
Merge pull request #44168 from cfsnyder/wip-50851-pacific
pacific: mds: PurgeQueue.cc fix for 32bit compilation
Reviewed-by: Milind Changire <mchangir@redhat.com>
Yuri Weinstein [Thu, 13 Jan 2022 15:48:30 +0000 (07:48 -0800)]
Merge pull request #43979 from lxbsz/wip-53218
pacific: qa: increase the timeout value to wait a litte longer
Reviewed-by: Nikhilkumar Shelke <nshelke@redhat.com>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Sage Weil [Mon, 29 Nov 2021 20:51:26 +0000 (15:51 -0500)]
pacific: mgr/cephadm: avoid repeated calls to get_module_option
We already stash these as MgrModule members.
Signed-off-by: Sage Weil <sage@newdream.net>
Conflicts:
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/serve.py
src/pybind/mgr/cephadm/services/cephadmservice.py
Alfonso Martínez [Mon, 3 Jan 2022 16:43:07 +0000 (17:43 +0100)]
mgr/dashboard: add test coverage for API docs (SwaggerUI)
Fixes: https://tracker.ceph.com/issues/53756
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit
7363bc3af1613f2b06eaf34ea8c57ee8f4583537 )
Adam King [Fri, 19 Nov 2021 00:43:35 +0000 (19:43 -0500)]
mgr/orchestrator: add filtering and count option for orch host ls
Filter orch host ls output for only hosts whose name
contains a certain substring or who have a certain label
Add a count flag that causes the command to return the number
of hosts found (either overall or matching the substring and/or
label) instead of a list of all the matching hosts
Fixes: https://tracker.ceph.com/issues/47774
Fixes: https://tracker.ceph.com/issues/53452
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
edd9bf38c3f07f5fdb6714e7f66515820c736d2e )
Sebastian Wagner [Thu, 16 Dec 2021 15:40:08 +0000 (16:40 +0100)]
mgr/cephadm: Fix test_facts
Wasn't executed before
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
a03a34a01a70ce4d4ac8927a37d27e9853e46f8a )
Sebastian Wagner [Mon, 13 Dec 2021 11:54:22 +0000 (12:54 +0100)]
cephadm: make extract_uid_gid errors more readable
Avoid dumping a traceback
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
d732a51df3a8d6b9edc340251edcd024b0e70f09 )
John Mulligan [Fri, 10 Dec 2021 13:19:59 +0000 (08:19 -0500)]
python-common: add test inputs verifying count & count-per-host >= 1
This adds unit new test inputs, local to python-common that verify the
correct error messages are raised when count == 0 and count_per_host ==
0.
Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit
0eb4e7dd56f3db6448080b0e9b880927c1bb7e04 )
John Mulligan [Fri, 10 Dec 2021 13:16:19 +0000 (08:16 -0500)]
python-common: make count & count-per-host >= 1 checks consistent
The previous version of the validate function had a incorrect error
statement that suggested the count must be >1 when it should have
been >=1. This confusion was possibly due to using "n < 1" on
one line and "n <= 0" on another line. Since both values are supposed
to be integers this change corrects the error message and makes
the comparisons on the lines both use "n < 1" (since I find it easier
to see that the check "n < 1" is the inverse of the error text
asserting "n >= 1").
Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit
6169eb7f8e2462eb58338d6fc312b1347858b47f )
John Mulligan [Wed, 8 Dec 2021 20:37:11 +0000 (15:37 -0500)]
python-common: add unit test func for invalid yaml inputs
I didn't find a preexisting test function for this so I added a
new test that is fed yaml snippets and expected error messages.
This verifies some of the recently added validation for
count and cound_per_host under the placement spec.
Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit
068d37d95762bce4d11668a838c6e85f6098723a )
John Mulligan [Wed, 8 Dec 2021 20:33:54 +0000 (15:33 -0500)]
python-common: add int value validation for count and count_per_host
Add additional validation for the count and count_per_host fields
sourced from YAML.
Fixes: https://tracker.ceph.com/issues/50524
Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit
a9ad2a50fe83ea3342b7c1bbcfb942789e965cb4 )
Sage Weil [Sat, 20 Nov 2021 14:53:36 +0000 (09:53 -0500)]
mgr/cephadm: less log noise when config checks fail
We are already raising health alerts--there is no need to spam the log
every few seconds when these checks are evaluated.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
f2a2e2d92ca21700aeffc78cce4a3d3c5949fd3f )
Foad Lind [Tue, 14 Dec 2021 13:01:58 +0000 (14:01 +0100)]
doc/cephadm/upgrade: correct example command
Update the ceph version used in the example upgrade command to match the one mentioned in the text above it.
Signed-off-by: Foad Lind <foad.lind@citynetwork.eu>
(cherry picked from commit
5077eef37844c1fc25c444a5b54d44a37052875c )
Sebastian Wagner [Thu, 25 Nov 2021 14:52:20 +0000 (15:52 +0100)]
doc/cephadm: host location: add link to types
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
ee7ed53df865cfd1b88216cc7d27029172b935ef )
Brian_P [Mon, 29 Nov 2021 14:13:17 +0000 (14:13 +0000)]
doc: fix typo in cephadm host management
(cherry picked from commit
22ca9ce373efd527d838a58ed25617ce4e7dcd91 )
Sebastian Wagner [Tue, 11 Jan 2022 10:36:46 +0000 (11:36 +0100)]
Merge pull request #44446 from sebastian-philipp/pacific-backport-43827-43894-42906-43095-43929-43969-43873-43888-44092-44080-
pacific: cephadm: November batch 2
Reviewed-by: Adam King <adking@redhat.com>
Alfonso Martínez [Fri, 7 Jan 2022 11:32:46 +0000 (12:32 +0100)]
Merge pull request #44468 from rhcs-dashboard/wip-53716-pacific
pacific: mgr/dashboard: fix timeout error in dashboard cephadm e2e job
Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Yuri Weinstein [Thu, 6 Jan 2022 22:19:14 +0000 (14:19 -0800)]
Merge pull request #44171 from cfsnyder/wip-52073-pacific
pacific: rgw: user stats showing 0 value for "size_utilized" and "size_kb_utilized" fields
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Thu, 6 Jan 2022 22:18:50 +0000 (14:18 -0800)]
Merge pull request #44166 from cfsnyder/wip-53289-pacific
pacific: rgw: fix `bi put` not using right bucket index shard
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Thu, 6 Jan 2022 22:18:24 +0000 (14:18 -0800)]
Merge pull request #43968 from cfsnyder/wip-53256-pacific
pacific: librgw: treat empty root path as "/" on mount
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Thu, 6 Jan 2022 22:17:58 +0000 (14:17 -0800)]
Merge pull request #43966 from cfsnyder/wip-53225-pacific
pacific: qa/rgw: bump tempest version to resolve dependency issue
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Thu, 6 Jan 2022 22:17:28 +0000 (14:17 -0800)]
Merge pull request #43951 from cfsnyder/wip-53098-pacific
pacific: qa/rgw: Fix vault token file access.
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Thu, 6 Jan 2022 22:17:00 +0000 (14:17 -0800)]
Merge pull request #43946 from cfsnyder/wip-53271-pacific
pacific: rgw/beast: optimizations for request timeout
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Nizamudeen A [Thu, 30 Dec 2021 08:28:58 +0000 (13:58 +0530)]
mgr/dashboard: stabilizing the cephadm dashboard e2e
Reordering the tests and adding some more tests to verify the cluster is
healthy before proceeding to do some complex tasks like maintenance and
drain host
Fixes: https://tracker.ceph.com/issues/53742
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit
fbc9f46459537d0799c448e27f80623d7d4805c8 )
Nizamudeen A [Fri, 24 Dec 2021 05:39:37 +0000 (11:09 +0530)]
mgr/dashboard: dashboard cephadm e2e improvement
Fixes: https://tracker.ceph.com/issues/53742
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit
26f86f6cd32fc86297e250472e3205d4d65744fb )
Nizamudeen A [Mon, 20 Dec 2021 09:14:29 +0000 (14:44 +0530)]
mgr/dashboard: fix timeout error in dashboard cephadm e2e job
1. Fix the timeout error happening in the dashboard e2e job
2. Take care of the flaky force maintenance check
Most of the time our test is getting timed out while searching for an item
in the table. Its because `.clear().type()` is not clearing the content
in the search field sometimes and that creates a wrong data to be
entered into the search field and it starts searching based on this
wrong name. To avoid this I am explicitly clearing the search area
before typing.
Fixes: https://tracker.ceph.com/issues/53672
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit
fed358d7c5a21cc76cae7042975f7e47ac3f8d50 )
Nizamudeen A [Thu, 23 Dec 2021 10:53:31 +0000 (16:23 +0530)]
mgr/dashboard: fix orchestrator/02-hosts-inventory.e2e failed.
I removed the `02-hosts-inventory.e2e` file because it is a duplicate
test of one of the test in the `01-hosts.e2e` file and fixed the error
from that file.
Also, in the inventory Identify test, we test for an element to be not
visible. According to the latest cypress docs, this should be not.exist
instead of not.visible since the cd-modal will not even be present in
the DOM
Fixes: https://tracker.ceph.com/issues/53499
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit
7b9fb258c46f4a93ca53a5864a8eb4363147bcdc )
Alfonso Martínez [Tue, 4 Jan 2022 08:52:40 +0000 (09:52 +0100)]
Merge pull request #44105 from rhcs-dashboard/wip-52571-pacific
pacific: mgr/dashboard: use -f for npm ci to skip fsevents error
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 [Mon, 3 Jan 2022 15:58:27 +0000 (16:58 +0100)]
Merge pull request #44382 from rhcs-dashboard/wip-53690-pacific
pacific: mgr/dashboard: cephadm e2e job: improvements
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Sage Weil [Tue, 30 Nov 2021 04:25:43 +0000 (23:25 -0500)]
python-common/ceph/deployment/drive_group: fix 'orch ls --format yaml'
In
f76c02a658ed1de54a380381932bb58b6ab91d41 we may leave out the placement
key when it is empty. If we take that path, we need to tolerate specs
that are missing that key.
Fixes: f76c02a658ed1de54a380381932bb58b6ab91d41
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
7e51fe6227a92b92640d37216bdd99824c84769a )
Adam King [Wed, 24 Nov 2021 22:23:01 +0000 (17:23 -0500)]
cephadm: only infer conf from mon if fsid matches
fixes: https://tracker.ceph.com/issues/53394
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
f64b8a34c4808af5f09ddc5de8085d78b50a9666 )
Sebastian Wagner [Fri, 26 Nov 2021 10:15:51 +0000 (11:15 +0100)]
mgr/cephadm: grafana.ini: Set `cookie_secure = true`
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
e90433b8f9bb4d60b5a6da636d880ce0b7b8b243 )
Sebastian Wagner [Fri, 16 Jul 2021 14:20:32 +0000 (16:20 +0200)]
mgr/cephadm: Add GrafanaSpec.initial_admin_password
By default, we're not creating any admin accout for Grafana now,
but we're adding an option to set the grafana password manually using:
```yaml
service_type: grafana
spec:
initial_admin_password: mypassword
```
Users can then easily log into Grafana with the given password.
Fixes: https://tracker.ceph.com/issues/48291
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
fdae665a2fe645d3f76b212f440ffe2c96281bc0 )
Conflicts:
src/pybind/mgr/cephadm/tests/test_services.py
Sebastian Wagner [Fri, 23 Jul 2021 01:20:43 +0000 (03:20 +0200)]
python-common: Reparent AlertManagerSpec to MonitoringSpec
And remove duplicated members
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
f2b0b451766c94505674cc1e315989c52b6bcaf5 )
Sebastian Wagner [Fri, 23 Jul 2021 01:15:53 +0000 (03:15 +0200)]
python-common: Move AlertManagerSpec below MonitoringSpec
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
208ce50b9232b83f80ad68bd71681c9d3781a76f )
Sebastian Wagner [Fri, 23 Jul 2021 07:05:59 +0000 (09:05 +0200)]
python-common: test_yaml(): add a few tests
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
e7035f1a54c8b48d918c7579dfcf5665ae351dbc )
Sebastian Wagner [Fri, 23 Jul 2021 00:59:59 +0000 (02:59 +0200)]
python-common: prettify `yaml.dump(MonitoringSpec())`
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
f76c02a658ed1de54a380381932bb58b6ab91d41 )
Sebastian Wagner [Fri, 23 Jul 2021 00:36:27 +0000 (02:36 +0200)]
pyhton-common: move some tests from cephadm/test_spec.py
Cause they don't have any dependencies to cephadm
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
6f90f0fa2efc830eec07373b94534e3c96f24945 )
Adam King [Thu, 18 Nov 2021 18:44:02 +0000 (13:44 -0500)]
python-common: add string representation for Device and DeviceSelection classes
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
5b60b8e75889208a0c43e6cf7e9a6abcd849bd9f )
Sage Weil [Tue, 23 Nov 2021 23:59:28 +0000 (18:59 -0500)]
mgr/cephadm: skip osd_stats check if osd removal queue is empty
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
0bbbe5d31d834d5626c11fd9c49b572b111ead8f )
Sage Weil [Tue, 23 Nov 2021 18:38:50 +0000 (13:38 -0500)]
mgr/cephadm: drop osdspec_affinity tracking
We identify which drivespec legacy OSDs belong(ed) to by metadata they
report to the mgr. Modern cephadm does this instead by looking at the
'service' property in the unit.meta file. Having cephadm query the osd
metadata is expensive for large clusters, so let's avoid this and rely
entirely on unit.meta.
Worst case, some upgraded clusters will show OSDs as service 'osd' instead
of service 'osd.whatever' for whatever drivespec created them.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
9c2b8f557ef374212b5d11464b04f443cb8d84e6 )
Conflicts:
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/serve.py
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
Sebastian Wagner [Fri, 26 Nov 2021 17:00:10 +0000 (18:00 +0100)]
mgr/cephadm: simplify HostCache.get_daemon_types
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
32fdb84956afe926253bc6f390701bbf56b1aaa7 )
Sebastian Wagner [Fri, 26 Nov 2021 16:53:14 +0000 (17:53 +0100)]
mgr/cephadm: Inventory: Fix `dictionary changed size during iteration`
Use `.copy()` for that.
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
d770bb5c45d6f45c80543b6873c450922f3a13e5 )
Conflicts:
src/pybind/mgr/cephadm/inventory.py
Sage Weil [Wed, 24 Nov 2021 00:32:26 +0000 (19:32 -0500)]
mgr/cephadm: record when finished with scheduled daemon action
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
124ac26c27467e28d99e8d89ce1d7e0f1832c147 )
Melissa [Tue, 26 Oct 2021 06:46:37 +0000 (02:46 -0400)]
doc/cephadm: deployment scenarios single host and isolated environment
This PR adds a deployment scenarios section to the cephadm docs to document the single-host-defaults flag, and explain how to deploy in an isolated environment.
Signed-off-by: Melissa Li <melissali@redhat.com>
(cherry picked from commit
e6e034498102625ebd777bacb770b15a6c575824 )
Melissa [Tue, 26 Oct 2021 06:46:37 +0000 (02:46 -0400)]
doc/cephadm: isolated environment and other deployment scenarios
This PR adds a section to the cephadm docs to describe how to install cephadm in different deployment scenarios (set cluster on single host, and deployment in an isolated environment or private network).
Signed-off-by: Melissa Li <melissali@redhat.com>
(cherry picked from commit
a311e837d61f7677999eba7887b77d0752909834 )
Michael Fritch [Thu, 11 Nov 2021 15:05:39 +0000 (08:05 -0700)]
cephadm: fixup expect-hostname message
show either a success or a failure message
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
ff3dd995b5f07d1a4d48e1f62d5054dadea9eb72 )
Guillaume Abrioux [Wed, 10 Nov 2021 15:08:13 +0000 (16:08 +0100)]
cephadm: add --shared_ceph_folder to shell cmd
It can be useful to share ceph src when running the `cephadm shell`
command in order to do quick tests.
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit
37ea06cfd0937df6230383d16de9fbda9a5a6f3f )
Sebastian Wagner [Tue, 16 Nov 2021 15:59:29 +0000 (16:59 +0100)]
doc/cephadm: core dumps
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
223af588a994eabc75b9f6d2bb33df761d6944b8 )
Sage Weil [Mon, 15 Nov 2021 15:46:01 +0000 (10:46 -0500)]
qa/suites/orch/cephadm: verify /var/log/ceph/$fsid ownership
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
4f71cbba1a41426e3a858b11f03fd0c5f795dc95 )
Sage Weil [Mon, 15 Nov 2021 15:43:32 +0000 (10:43 -0500)]
cephadm: only make_log_dir for ceph daemons
For non-ceph daemons, (1) they don't log to /var/log/ceph, and (2) the
container image isn't a ceph image, which means the uid/gid extraction
won't have the correct uid/gid and we'll end up with a log directory that
ceph daemons no longer have write permissions for.
Fixes: https://tracker.ceph.com/issues/53257
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
393960c164bf84b21ffee6af65c19d968b416fb2 )
Sebastian Wagner [Wed, 10 Nov 2021 12:46:48 +0000 (13:46 +0100)]
mgr/cephadm: check_for_moved_osds: don't run post_remove
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
70d27f24f837f2d962ce7d1f2672b0d71f5f2f7a )
Sebastian Wagner [Wed, 10 Nov 2021 11:11:48 +0000 (12:11 +0100)]
mgr/cephadm: test_cephadm: make use of with_osd_daemon
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
91574d47e9ba6cd0426370bf16a68017cb00f8c4 )
Conflicts:
src/pybind/mgr/cephadm/tests/test_cephadm.py
Sebastian Wagner [Thu, 9 Sep 2021 11:29:56 +0000 (13:29 +0200)]
mgr/cephadm: check_for_moved_osds: verify OSDs are up
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
47dd258cf56039d510c8d8a0d275c9104b9f49eb )
Sebastian Wagner [Thu, 9 Sep 2021 10:30:42 +0000 (12:30 +0200)]
mgr/orch: Add DaemonDescriptionStatus `starting` and `unknown`
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
501ecf035e982af6f2020b3bb77d0ac505313b73 )
Sebastian Wagner [Wed, 8 Sep 2021 14:58:14 +0000 (16:58 +0200)]
mgr/cephadm: test_cephadm: Add some more tests for OrchestratorEvent
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
7d1bea2bb8777ac6c4d08b9042af1f6597ed2906 )
Sebastian Wagner [Wed, 8 Sep 2021 14:23:32 +0000 (16:23 +0200)]
mgr/cephadm: check_for_moved_osds: Add OrchEvent
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
25d27fb6c1bd3520564e624965fa3b6f81a21ac0 )