]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Yuri Weinstein [Mon, 9 May 2022 20:33:21 +0000 (13:33 -0700)]
Merge pull request #46038 from cbodley/wip-55455
quincy: rgw: OpsLogFile::stop() signals under mutex
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Ernesto Puerta [Fri, 6 May 2022 08:23:08 +0000 (10:23 +0200)]
Merge pull request #45679 from rhcs-dashboard/wip-54587-quincy
quincy: mgr/dashboard: highlight the search text in cluster logs
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Ernesto Puerta [Fri, 6 May 2022 08:16:12 +0000 (10:16 +0200)]
Merge pull request #45957 from votdev/wip-55379-quincy
quincy: mgr/dashboard: Imrove error message of '/api/grafana/validation' API endpoint
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Ernesto Puerta [Fri, 6 May 2022 08:15:26 +0000 (10:15 +0200)]
Merge pull request #45862 from rhcs-dashboard/wip-55274-quincy
quincy: mgr/dashboard: datatable in Cluster Host page hides wrong column on selection
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Ernesto Puerta [Fri, 6 May 2022 08:14:29 +0000 (10:14 +0200)]
Merge pull request #45867 from votdev/wip-55275-quincy
quincy: mgr/dashboard: RGW users and buckets tables are empty if the selected gateway is down
Reviewed-by: Sarthak0702 <NOT@FOUND>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Ernesto Puerta [Fri, 6 May 2022 08:13:58 +0000 (10:13 +0200)]
Merge pull request #45619 from votdev/wip-55007-quincy
quincy: mgr/dashboard: Language dropdown box is partly hidden on login page
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Adam King [Thu, 5 May 2022 19:04:27 +0000 (15:04 -0400)]
Merge pull request #46055 from adk3798/quincy-backport-april
quincy: Cephadm Batch Backport April
Reviewed-by: Michael Fritch <mfritch@suse.com>
Yuri Weinstein [Thu, 5 May 2022 15:22:17 +0000 (08:22 -0700)]
Merge pull request #46061 from ljflores/wip-55439-quincy
quincy: osd: return appropriate error if the object is not manifest
Reviewed-by: Myoungwon Oh <omwmw@sk.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Thu, 5 May 2022 15:20:13 +0000 (08:20 -0700)]
Merge pull request #45624 from ljflores/wip-55047-quincy
quincy: test: fix TierFlushDuringFlush to wait until dedup_tier is set on base pool
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Myoungwon Oh <omwmw@sk.com>
Laura Flores [Wed, 4 May 2022 16:06:58 +0000 (11:06 -0500)]
Merge pull request #46116 from zdover23/wip-doc-pr-46109-backport-to-quincy
Wip doc pr 46109 backport to quincy
Deepika Upadhyay [Wed, 4 May 2022 12:23:26 +0000 (17:53 +0530)]
Merge pull request #45700 from tserong/wip-55100-quincy
quincy: ceph.spec.in: Use libthrift-devel on SUSE distros
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Anthony D'Atri [Wed, 4 May 2022 06:41:25 +0000 (23:41 -0700)]
Merge pull request #46075 from bluikko/patch-5
doc/mgr/dashboard: Fix typo and double slash missing from URL
Adam King [Mon, 11 Apr 2022 20:57:51 +0000 (16:57 -0400)]
mgr/cephadm: retry mgr fail over in case of transient failure
Fixes: https://tracker.ceph.com/issues/55279
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
3fe2d7d553d475f1fe3840c98ee31d71f6188a1a )
windgmbh [Fri, 12 Nov 2021 15:51:03 +0000 (16:51 +0100)]
Apply sysctl.d migration from /usr/lib to /etc
A fix regarding the SYSCTL_DIR location (#53130) requires to migrate
sysctl.d/*.conf files from /usr/lib to /etc.
Signed-off-by: Lukas Mayer <lmayer@wind.gmbh>
(cherry picked from commit
a167a27f30536958e0f2c513d351642e81ba06d5 )
windgmbh [Wed, 3 Nov 2021 17:16:53 +0000 (18:16 +0100)]
Fix sysctl.d location FHS compliance
This fixes #53130
Containers should not write to '/usr/lib'.
That location could be read-only or overwritten.
Signed-off-by: Lukas Mayer <lmayer@wind.gmbh>
(cherry picked from commit
77afa812ea8b7e1e802246e4aa3a31e7b644a502 )
Ken Dreyer [Wed, 16 Feb 2022 14:48:59 +0000 (09:48 -0500)]
cephadm: add comment explaining docker.io grep test
Add a comment explain this docker.io grep count test, since it's
difficult to understand the purpose from simply reading the code.
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit
14c5538a311542e1466a9426c35108ce3e394338 )
Adam King [Thu, 24 Mar 2022 13:59:10 +0000 (09:59 -0400)]
cephadm: pass "--security-opt label=disable" to node-exporter container
in order to support setting '--path.procfs=/host/proc','--path.sysfs=/host/sys',
'--path.rootfs=/rootfs' for node-exporter we need to disable selinux separation
between the node-exporter container and the host to avoid selinux denials
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
6d4591723ba89dada9814118e2c14e08d4e4179a )
Adam King [Wed, 23 Mar 2022 17:22:51 +0000 (13:22 -0400)]
cephadm: Specify proc/sys path for node-exporter to use
Fixes: https://tracker.ceph.com/issues/55023
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
97373de71e080423a2321e2c889e6681b47bfc74 )
Adam King [Fri, 4 Mar 2022 02:47:47 +0000 (21:47 -0500)]
mgr/cephadm: offline host watcher
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
bd9eb596570cfcc7fea793c2b380bc66dd719439 )
Redouane Kachach [Tue, 29 Mar 2022 16:37:10 +0000 (18:37 +0200)]
mgr/cephadm: fallback to normal sorted if cannot import natsorted
Fixes: https://tracker.ceph.com/issues/55113
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
19c07de8207de5038df6f510a3c2ff41b10f7e08 )
Adam King [Tue, 22 Mar 2022 22:57:21 +0000 (18:57 -0400)]
mgr/cephadm: Reschedule nfs daemons from offline hosts
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
9febc21c14b7ad26e6d811444e7daf0b0a292afb )
Redouane Kachach [Thu, 17 Mar 2022 08:49:26 +0000 (09:49 +0100)]
mgr/cephadm: fixing natsort dependencies on debian
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
dadbd7299640b50949c4f5f37509831ee4824937 )
Conflicts:
debian/control
Redouane Kachach [Fri, 4 Feb 2022 11:22:50 +0000 (12:22 +0100)]
mgr/cephadm: Adding support for natural sorting
Fixes: https://tracker.ceph.com/issues/54026
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
28314cebef328a1e822dbc4c348995433af25fc2 )
Aashish Sharma [Wed, 2 Mar 2022 11:23:02 +0000 (16:53 +0530)]
mgr/cephadm: fix cephadm errors
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit
46902381306fd31a054f58c49af7f817833f8cc4 )
Aashish Sharma [Fri, 11 Feb 2022 09:10:17 +0000 (14:40 +0530)]
mgr/dashboard: fixing cephadm errors
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit
ba6efa121ab0e7b6949cf41219b68c38d1a77641 )
Avan Thakkar [Thu, 10 Feb 2022 10:29:03 +0000 (15:59 +0530)]
mgr/cephadm: adding loki and promtail monitoring services testing
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit
cf2734a74cde261d7c44830c8668622901ed18cc )
Avan Thakkar [Thu, 10 Feb 2022 09:23:15 +0000 (14:53 +0530)]
mgr/cephadm: fix loki grpc port and liniting errors
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit
a25738e49030ae77a105ea244843a7ab0b83aee6 )
Aashish Sharma [Thu, 3 Feb 2022 08:43:56 +0000 (14:13 +0530)]
mgr/dashboard: add grps port to loki
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
Co-authored-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit
f0fa000edc8af2896f66a5a95ec3e5f06cedf8e4 )
Avan Thakkar [Mon, 31 Jan 2022 12:05:31 +0000 (17:35 +0530)]
mgr/dashboard: add Loki to grafana datasources
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Co-authored-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit
66b2f03e8a028dd692ec95a0f97f3183a4bc8b56 )
Avan Thakkar [Tue, 25 Jan 2022 18:56:20 +0000 (00:26 +0530)]
mgr/cephadm: introducing orch apply daemon promtail
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Co-authored-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit
b576d95f8cf288cb9ca242375a99b6bc460ecb8b )
Conflicts:
src/cephadm/cephadm
Avan Thakkar [Mon, 24 Jan 2022 22:37:45 +0000 (04:07 +0530)]
mgr/cephadm: introducing orch apply daemon loki
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit
5dc96cb62165109338e6e13a259e5e6dc2b5a8ce )
Conflicts:
src/cephadm/cephadm
src/pybind/mgr/cephadm/module.py
Avan Thakkar [Mon, 24 Jan 2022 09:38:02 +0000 (15:08 +0530)]
mgr/cephadm: introduce loki and promtail containers
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit
ddccfdb5aa108631a6ce0bc9435a4ded1c12af7f )
Conflicts:
src/cephadm/cephadm
Redouane Kachach [Mon, 11 Apr 2022 14:13:05 +0000 (16:13 +0200)]
mgr/cephadm: fixing call method timeout handling
Fixes: https://tracker.ceph.com/issues/55265
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
55d42d0c31a5414cb2beac9273faa7123efb8709 )
Redouane Kachach [Tue, 12 Apr 2022 12:27:02 +0000 (14:27 +0200)]
mgr/cephadm: Adding support to store ceph conf per cluster fsid
Fixes: https://tracker.ceph.com/issues/55185
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
2ea76173a163a93bbfbf69d0faa732d46eaf05ba )
Adam King [Sun, 17 Apr 2022 16:21:44 +0000 (12:21 -0400)]
qa/suites/orch/cephadm: stop upgrade tests if failures are seen
Otherwise the tests may run forever. This was already done for
mds upgrade sequence, justadding it in the other two places here
Related to: https://tracker.ceph.com/issues/53939
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
017aa9cfe8362e8512a581e39850ce70bd1ce82f )
Redouane Kachach [Mon, 18 Apr 2022 13:42:39 +0000 (15:42 +0200)]
mgr/cephadm: fixing logging output for rm-cluster operation
Fixes: https://tracker.ceph.com/issues/51671
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
9756e3bf8ce6976d12245e1e6724838b03d70135 )
Redouane Kachach [Thu, 21 Apr 2022 10:01:44 +0000 (12:01 +0200)]
mgr/cephadm: do not add _admin label when no-minimize-config is provided
Fixes: https://tracker.ceph.com/issues/52727
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
01c8999d0354a71a7ef8526aab9b39e30d67c1bb )
Redouane Kachach [Wed, 13 Apr 2022 14:22:53 +0000 (16:22 +0200)]
mgr/cephadm: fixing upgrade candidate verions listing
Fixes: https://tracker.ceph.com/issues/53527
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
671442c4b445c4a0547978a6298645a5c2f5725f )
Redouane Kachach [Fri, 22 Apr 2022 13:53:34 +0000 (15:53 +0200)]
mgr/cephadm: Using '.ID' instead of '.Id' which is only supported by podman
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
6e7c0488389e7e8b85f0dbd6b71c8627a44b349e )
Redouane Kachach [Wed, 23 Mar 2022 17:24:01 +0000 (18:24 +0100)]
mgr/cephadm: Adding image tag and date to cephadm startup messages
Fixes: https://tracker.ceph.com/issues/55008
Fixes: https://tracker.ceph.com/issues/54373
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
92ecb58d46b6f75265a664f3165f4b3a0dd4993a )
Adam King [Wed, 6 Apr 2022 14:32:22 +0000 (10:32 -0400)]
mgr/cephadm: allow setting insecure_skip_verify for alertmanager
Add a "secure" parameter to alertmanager spec that will cause it
to deploy alertmanagers with insecure_skip_verify as true or false
depending on the value given for "secure".
NOTE: alertmanager must still be reconfigured after applying a yaml
with this option changed.
Fixes: https://tracker.ceph.com/issues/55272
Fixes: https://tracker.ceph.com/issues/55333
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
e583d4ef1ac23a7473d50d253e0edf70580542ae )
Moritz Röhrich [Mon, 21 Mar 2022 16:32:25 +0000 (17:32 +0100)]
cephadm: avoid crashing on expected non-zero exit
- Avoid crashing when a call out to an external program expectedly does
not return exit status zero.
There are programs that communicate other information than error/no
error through exit status. E.g. `systemctl status` will return different
exit codes depending on the actual status of the units in question.
In cases where this is expected crashing with a RuntimeError exception
is inappropriate and should be avoided.
Fixes: https://tracker.ceph.com/issues/55117
Signed-off-by: Moritz Röhrich <moritz.rohrich@suse.com>
(cherry picked from commit
a02be6f22fa18094cd8758700ab74581b6ce1701 )
Redouane Kachach [Mon, 11 Apr 2022 11:04:13 +0000 (13:04 +0200)]
mgr/cephadm: skip loopback devices when gathering facts
Fixes: https://tracker.ceph.com/issues/53528
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
a9eec9e3a7a53bd63d3bf9ced96e224fb752d9f7 )
Teoman ONAY [Wed, 6 Apr 2022 09:32:17 +0000 (11:32 +0200)]
ceph cephadm set-user does not reflect the user change in ssh-config
Fixes: https://tracker.ceph.com/issues/54618
Signed-off-by: Teoman ONAY <tonay@redhat.com>
(cherry picked from commit
071f72a734ce207e5cb2ff6d3d996e45396f5c7a )
Redouane Kachach [Fri, 1 Apr 2022 16:03:42 +0000 (18:03 +0200)]
mgr/cephadm: Adding cephadm networking configuration checks+refactoring
Fixes: https://tracker.ceph.com/issues/55174
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
e0bafe6b1da104782b29edf7035d7bc93f89e12f )
Redouane Kachach [Thu, 17 Feb 2022 12:48:08 +0000 (13:48 +0100)]
mgr/cephadm: Making default cephadm shell cmd easier
Fixes: https://tracker.ceph.com/issues/52042
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
dc201197639dcab471611ac3c4fefda74a74a94f )
Melissa Li [Wed, 23 Mar 2022 15:38:37 +0000 (11:38 -0400)]
cephadm: show error message if private registry credentials not provided
Raise UnauthorizedRegistryError in `_pull_image` if user tries to pull from a private registry without authentication, handle error in `command_bootstrap`, `commond_adopt`, `command_pull`
Fixes: https://tracker.ceph.com/issues/55015
Signed-off-by: Melissa Li <melissali@redhat.com>
(cherry picked from commit
4de0803ba893abf341ab634d1382208370de7c98 )
Redouane Kachach [Tue, 29 Mar 2022 11:30:37 +0000 (13:30 +0200)]
mgr/cephadm: improving logging to send errors to stderr
Fixes: https://tracker.ceph.com/issues/47905
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
7f09307a614b313908a545a1d26e28e3e704e321 )
Christoph Glaubitz [Thu, 31 Mar 2022 12:57:53 +0000 (12:57 +0000)]
mgr/cephadm: support non-root ssh-user w permissions
Restructured code, so that in case of non-root, the resulting file will
be created with permissions set to the ssh-user. This allows the
subsequent scp to be able to write the file. The remaining code kept the
same, so that file permissions are restored to the expected ones, but
just runs after the scp.
Fixes: https://tracker.ceph.com/issues/54620
Signed-off-by: Christoph Glaubitz <c.glaubitz@syseleven.de>
(cherry picked from commit
452e52a7e39409e3409d59940133333416b830bc )
Redouane Kachach [Wed, 30 Mar 2022 13:48:40 +0000 (15:48 +0200)]
mgr/cephadm: fixing public network conf parsing
Fixes: https://tracker.ceph.com/issues/55132
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
3ef6341e8ef5fe6a01f15c847f6bc9e2205d4d97 )
Guillaume Abrioux [Wed, 30 Mar 2022 14:18:26 +0000 (16:18 +0200)]
ceph-volume/tests: reject loop devices in lvm.conf
The current task doesn't works (typo?).
Otherwise api/lvm.py can't work properly, functions such as
`get_single_lv()` and many other don't return the expected results.
Indeed, lvm is confused because of the nvme_loop setup.
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit
a5fab15e44517ac63f3fd257989e81b8127b86d9 )
Guillaume Abrioux [Mon, 28 Mar 2022 22:01:39 +0000 (00:01 +0200)]
ceph-volume: do not leave pv when zapping osds
when zapping a device and no vg/lv are left, the pv should be
removed too.
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit
7f007e7fc75b4d6e7465c684f7e5b2458883dcc5 )
Guillaume Abrioux [Wed, 23 Mar 2022 09:04:45 +0000 (10:04 +0100)]
orchestrator: support complex osd creation
This adds the support of complex OSD creation with command
`orch daemon add osd`.
Any argument supported by `DriveGroupSpec()` can be passed on the command line.
Usage:
```
ceph orch daemon add osd host:data_devices=device1,device2,db_devices=device3,osds_per_device=2,...
```
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit
8aa2f4745adff0ba3c7a0731cf48ccc1c85b33f3 )
Guillaume Abrioux [Tue, 22 Mar 2022 15:35:58 +0000 (16:35 +0100)]
DriveSelection: skip unavailable devices
Cephadm shouldn't try to deploy a disk reported as unavailable by ceph-volume.
The idea here is to check the rejection reason so we can still use DB devices
in case of OSD replacement.
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit
3a88547559769f4dd438f6557cef22ef9004fa2a )
Guillaume Abrioux [Fri, 11 Mar 2022 09:29:35 +0000 (10:29 +0100)]
ceph-volume: various fixes in arg_validators
if a device with an FS is passed, ceph-volume should abort
the OSD creation.
Fixes: https://tracker.ceph.com/issues/54535
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit
9f4b830dcfb45eda81eabf18a8461ac4e1bf642e )
Guillaume Abrioux [Wed, 23 Mar 2022 09:07:05 +0000 (10:07 +0100)]
doc/cephadm: fix a typo
s/osd_crush_choose_leaf_type/osd_crush_chooseleaf_type
```
[ceph: root@adm-1 /]# ceph config set global osd_crush_choose_leaf_type 0
Error EINVAL: unrecognized config option 'osd_crush_choose_leaf_type'
[ceph: root@adm-1 /]# ceph config set global osd_crush_chooseleaf_type 0
[ceph: root@adm-1 /]#
```
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit
d43189c17b03420674ea5424666388b8272c2580 )
Guillaume Abrioux [Mon, 14 Mar 2022 14:40:47 +0000 (14:40 +0000)]
ceph-volume/tests: speed up tox tests
Let's use `--numprocesses=auto` in order to speed up the unit tests execution.
See the difference, without `--numprocesses=auto`:
```
... omitted output ...
real 1m22.884s
user 0m23.003s
sys 0m20.504s
```
with `--numprocesses=auto`:
```
... omitted output ...
real 0m18.767s
user 0m33.056s
sys 0m23.244s
```
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit
cd5eb7939ed92b584c45689a3169847811b8518d )
Adam King [Thu, 10 Mar 2022 17:43:28 +0000 (12:43 -0500)]
mgr/cephadm: generate one c-v raw prepare cmd per data device in raw mode
Fixes: https://tracker.ceph.com/issues/54522
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
b6556e5dbd21192c9207faf84c96f32bd8877d18 )
Redouane Kachach [Wed, 2 Mar 2022 11:38:42 +0000 (12:38 +0100)]
mgr/cephadm: check spec host when adding osd
Fixes: https://tracker.ceph.com/issues/47872
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
b87c966697d36ef51f1e62425d77200667e651ae )
Redouane Kachach [Mon, 7 Mar 2022 13:03:07 +0000 (14:03 +0100)]
mgr/cephadm: adding HostSpec validation
Fixes: https://tracker.ceph.com/issues/54342
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
15ba147a2a4cae8ca69437382136d328a1f416f2 )
Redouane Kachach [Fri, 11 Mar 2022 11:41:18 +0000 (12:41 +0100)]
mgr/cephadm: Show warning when user provides --fsid option
Fixes: https://tracker.ceph.com/issues/50804
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
8780aa04651fa2cddeec1d9d2dfcf4e08412d4ce )
wangyunqing [Wed, 30 Mar 2022 03:53:57 +0000 (11:53 +0800)]
doc/cephadm/operations.rst: fix typos
Signed-off-by: wangyunqing <wangyunqing@inspur.com>
(cherry picked from commit
92eb799a952db4f2fe2290aef56d2f66b8f64802 )
Adam King [Wed, 2 Mar 2022 05:23:52 +0000 (00:23 -0500)]
mgr/cephadm: fixing prometheus port handling
Fixes: https://tracker.ceph.com/issues/51072
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
8eb1397d77dace25f387e88137a1807993a0796d )
Redouane Kachach [Wed, 9 Mar 2022 13:19:02 +0000 (14:19 +0100)]
mgr/cephadm: checking service name before removal
Fixes: https://tracker.ceph.com/issues/54503
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
b26c114c8456941d6cccf7d4355445f21cb373a7 )
Adam King [Tue, 15 Mar 2022 18:33:52 +0000 (14:33 -0400)]
cephadm: respect --skip-firewalld flag
Fixes: https://tracker.ceph.com/issues/54137
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
d97057f8d7263cce8efc0857e3fe4a10faee30c8 )
Adam King [Tue, 15 Mar 2022 20:41:15 +0000 (16:41 -0400)]
cephadm: verify config file exists when inferring it
Fixes: https://tracker.ceph.com/issues/54571
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
1568875a281d56b413e75b244c9c75311cf353a0 )
Adam King [Mon, 21 Mar 2022 01:44:28 +0000 (21:44 -0400)]
python-common/drive_group: add extra_container_args to supported features
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
f036bdaf5a1e5f6b18a9591949be878fea8bb70d )
Adam King [Mon, 7 Mar 2022 22:22:56 +0000 (17:22 -0500)]
mgr/cephadm: add keep-alive requests to ssh connections
Fixes: https://tracker.ceph.com/issues/51733
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
445425ceccaab0cef9c04b795a8fe0236f56d9eb )
Joseph Sawaya [Fri, 11 Mar 2022 20:45:16 +0000 (15:45 -0500)]
doc: Add note to osds_per_device description about dual-actuator devices
This commit adds information about using dual-actuator devices with the
osds_per_device drive group option, letting users know they can create
an OSD for each actuator by setting this value to 2 in the drive group
they're using to apply OSDs to the device.
Signed-off-by: Joseph Sawaya <jsawaya@redhat.com>
(cherry picked from commit
882fc277189acd0f528dfb271268474a06d373a7 )
wangyunqing [Wed, 9 Mar 2022 08:55:13 +0000 (16:55 +0800)]
doc/cephadm/adoption.rst: fix typos
Signed-off-by: wangyunqing <wangyunqing@inspur.com>
(cherry picked from commit
e4db28f6b294909e0f177e82dbda8cfcc8129846 )
Redouane Kachach [Mon, 7 Mar 2022 16:03:08 +0000 (17:03 +0100)]
mgr/cephadm: fixing MDSSpec ctr
Fixes issue: https://tracker.ceph.com/issues/54487
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
eb4e3f2494e8706cbf5f7c60a37dcb13bca0d83f )
Matan Breizman [Tue, 15 Feb 2022 08:55:14 +0000 (08:55 +0000)]
qa/tasks/cephfs: increase timeout in test_nfs.py
Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit
44ad552093b4f0dc21563dd9f804974ade239440 )
Adam King [Fri, 25 Feb 2022 22:55:06 +0000 (17:55 -0500)]
mgr/cephadm: block draining last _admin host
Fixes: https://tracker.ceph.com/issues/54413
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
a0d21c7108e8f95b541bdb7653d2595f68e42520 )
Adam King [Tue, 1 Mar 2022 01:23:10 +0000 (20:23 -0500)]
mgr/cephadm: block removing last instance of _admin label
Fixes: https://tracker.ceph.com/issues/54425
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
fbe0c3fd23f9005986959bade149093c340f6238 )
Pere Diaz Bou [Mon, 7 Feb 2022 12:16:08 +0000 (13:16 +0100)]
cephadm/box: default add hosts
Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit
dd1b5eb38ce891c9d0786b48c42152c6cade9b62 )
Adam King [Wed, 23 Feb 2022 20:43:30 +0000 (15:43 -0500)]
mgr/cephadm: extend extra_container_args to other service types
Otherwise, without this change, this can only be used for mgr,
mon and crash (daemons without their own service spec class)
Fixes: https://tracker.ceph.com/issues/54390
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
d3c14a17dc5cafef199f4fc3ce657bab54d89b4a )
Adam King [Mon, 21 Feb 2022 21:34:47 +0000 (16:34 -0500)]
cephadm: still set container_image when --no-assimilate-config is provided
Fixes: https://tracker.ceph.com/issues/54141
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
59d004cb901eb6d84fb6907cb88314fd31b87904 )
Melissa Li [Wed, 23 Feb 2022 16:57:45 +0000 (11:57 -0500)]
mgr/cephadm: reduce log level for asyncssh error messages
Fixes: https://tracker.ceph.com/issues/54132
Signed-off-by: Melissa Li <melissali@redhat.com>
(cherry picked from commit
95d5db0f4297286c420057ac10f1b63d3116eace )
Redouane Kachach [Mon, 14 Feb 2022 14:17:31 +0000 (15:17 +0100)]
mgr/cephadm: Show an error when invalid format
Fixes: https://tracker.ceph.com/issues/54198
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
d2fa22fd77d4a20f5db0d9315e5efebb016de481 )
Redouane Kachach [Mon, 7 Feb 2022 18:17:55 +0000 (19:17 +0100)]
mgr/cephadm: using MDSSPec instead of ServiceSpec
Fixes: https://tracker.ceph.com/issues/54184
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
db765bd80608b7c6930a5111eb006b5d12f73de2 )
Redouane Kachach [Fri, 4 Feb 2022 12:28:51 +0000 (13:28 +0100)]
mgr/cephadm: Adding AGE field to device ls cmd
Fixes: https://tracker.ceph.com/issues/53540
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
1c5b3e86f9b8ae0ca3ae41798dfa18e9ffe9fcb7 )
Michael Fritch [Fri, 4 Feb 2022 18:11:05 +0000 (11:11 -0700)]
cephadm: chown the prometheus data dir during redeploy
some builds of prometheus run with a uid 65534 (nobody) where other
builds of prometheus run with a uid of 0 (root)
Fixes: https://tracker.ceph.com/issues/54159
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
21fb80aaab0b333d997d8241e17cf9749a37e065 )
Redouane Kachach [Wed, 16 Feb 2022 11:01:57 +0000 (12:01 +0100)]
mgr/cephadm: Delete ceph.target if last cluster
Fixes: https://tracker.ceph.com/issues/46655
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
f2a916b985ce3fef103fb1385159d57f3788c888 )
Patrick C. F. Ernzer [Sun, 13 Feb 2022 01:05:44 +0000 (02:05 +0100)]
doc/cephadm: Add CentOS Stream install instructions
Signed-off-by: Patrick C. F. Ernzer <pcfe@pcfe.net>.
(cherry picked from commit
7f243262f9d64768e3ee12a9328fc36245bb244f )
Redouane Kachach [Tue, 25 Jan 2022 17:27:56 +0000 (18:27 +0100)]
mgr/cephadm: Adding logic to cleanup several dirs after an rm-cluster
Fixes: https://tracker.ceph.com/issues/53010
https://tracker.ceph.com/issues/53815
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
0df6c04d8f99692a542b49c22bddbf12510801a5 )
Redouane Kachach [Thu, 27 Jan 2022 17:05:24 +0000 (18:05 +0100)]
doc/cephadm: fixing cluster purging section
https://tracker.ceph.com/issues/54018
ceph orch is not enough to stop all cephadm operations
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
5a4f5fb29ed88110f64ffed0187902ffa3368880 )
Adam King [Tue, 3 May 2022 00:47:39 +0000 (20:47 -0400)]
Merge pull request #46065 from adk3798/quincy-add-natsort
quincy: mgr/cephadm: Adding python natsort module
Reviewed-by: Redouane Kachach <rkachach@redhat.com>
Ville Ojamo [Mon, 2 May 2022 09:01:51 +0000 (16:01 +0700)]
doc/radosgw: fix pgcalc link
The pgcalc tool has moved to the "old" ceph site so update
the link to avoid a 404.
Signed-off-by: Ville Ojamo <14869000+bluikko@users.noreply.github.com>
(cherry picked from commit
7e1dc469648028d064a6c0faeabe9ecb3c11f32f )
Ville Ojamo [Mon, 2 May 2022 08:59:26 +0000 (15:59 +0700)]
doc/rados/operations: fix pgcalc link
The pgcalc tool has moved to the "old" ceph site so update
the link to avoid a 404.
Signed-off-by: Ville Ojamo <14869000+bluikko@users.noreply.github.com>
(cherry picked from commit
45f8d746acefe01e2416cedf92aadba1555c22f8 )
bluikko [Thu, 28 Apr 2022 10:07:23 +0000 (17:07 +0700)]
doc/mgr/dashboard: Fix typo and double-slash missing from URL
The document lists the format of URL with the slashes
missing after colon, also improved the language on it.
Also fixed a typo with extra "n" in "matchn".
Signed-off-by: Ville Ojamo <14869000+bluikko@users.noreply.github.com>
Yuri Weinstein [Fri, 29 Apr 2022 18:33:46 +0000 (11:33 -0700)]
Merge pull request #45901 from ivancich/wip-55043-quincy
quincy: cls/rgw: rgw_dir_suggest_changes detects race with completion
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 29 Apr 2022 15:52:17 +0000 (08:52 -0700)]
Merge pull request #45992 from idryomov/wip-make-check-enable-rbd-caches-quincy
quincy: run-make-check.sh: enable RBD persistent caches
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Yuri Weinstein [Fri, 29 Apr 2022 15:51:30 +0000 (08:51 -0700)]
Merge pull request #45966 from tchaikov/quincy-pr-45916
quincy: cmake/modules: always use the python3 specified in command line
Reviewed-by: David Galloway <dgallowa@redhat.com>
Yuri Weinstein [Fri, 29 Apr 2022 15:50:52 +0000 (08:50 -0700)]
Merge pull request #45913 from idryomov/wip-resurrect-mutex-debug-quincy
quincy: cmake: resurrect mutex debugging in all Debug builds
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Fri, 29 Apr 2022 15:49:23 +0000 (08:49 -0700)]
Merge pull request #45875 from ideepika/wip-ninja-default-quincy
quincy: ceph.spec: make ninja-build package install always
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Yuri Weinstein [Fri, 29 Apr 2022 15:48:13 +0000 (08:48 -0700)]
Merge pull request #45927 from kotreshhr/wip-55348-quincy
quincy: mgr/volumes: Show clone failure reason in clone status command
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Fri, 29 Apr 2022 15:46:44 +0000 (08:46 -0700)]
Merge pull request #45291 from joscollin/wip-54480-quincy
quincy: mgr/stats: be resilient to offline MDS rank-0
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Redouane Kachach [Wed, 23 Feb 2022 10:39:40 +0000 (11:39 +0100)]
mgr/cephadm: Adding python natsort module
Needed by: https://tracker.ceph.com/issues/54026
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
7e646d99589205633a21e19cbdc11b7999ae5da1 )
Conflicts:
debian/control
Yuri Weinstein [Wed, 27 Apr 2022 22:01:50 +0000 (15:01 -0700)]
Merge pull request #45896 from idryomov/wip-persistent-cache-status-quincy
quincy: rbd persistent cache UX improvements (status report, metrics, flush command)
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Yuri Weinstein [Wed, 27 Apr 2022 21:59:52 +0000 (14:59 -0700)]
Merge pull request #45766 from cbodley/wip-55175
quincy: cmake: WITH_SYSTEM_UTF8PROC defaults to OFF
Reviewed-by: Laura Flores <lflores@redhat.com>