]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
15 months agoqa/vstart_runner: increase timeout for vstart.sh command 56999/head
Rishabh Dave [Thu, 18 Apr 2024 08:59:15 +0000 (14:29 +0530)]
qa/vstart_runner: increase timeout for vstart.sh command

Since the timeout bug was fixed (https://tracker.ceph.com/issues/65533)
"Ceph API tests" sometimes fails because vstart.sh command had to be
aborted due to timeout.

Currently, "timeout" is set to 300 seconds which sometimes is not enough
for vstart.sh to run successfully for "Ceph API tests" CI job. 180
seconds usually suffices for vstart.sh to run successfully when used for
CephFS.

Increase value of "timeout" to avoid such failures on "Ceph API tests" CI.

Fixes: https://tracker.ceph.com/issues/65565
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit f779b428689ea245aa0c978732c468860520c609)
(cherry picked from commit 5a8a9df401663ca48b0031104d00ea0e4b636165)

 Conflicts:
qa/tasks/vstart_runner.py
  - accept the incoming changes

15 months agomgr/dashboard: pin xmlsec to 1.3.13
Nizamudeen A [Thu, 18 Apr 2024 05:41:44 +0000 (11:11 +0530)]
mgr/dashboard: pin xmlsec to 1.3.13

xmlsec is an inner dependency used by python3-saml. A newer release of
it broke the import.
https://github.com/xmlsec/python-xmlsec/issues/314

Fixes: https://tracker.ceph.com/issues/65571
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit ac656f0437d651ae85daf39821f8eb12e132cb6a)

15 months agoMerge pull request #56676 from cbodley/wip-squid-dencoder
Casey Bodley [Thu, 18 Apr 2024 19:01:56 +0000 (20:01 +0100)]
Merge pull request #56676 from cbodley/wip-squid-dencoder

squid: dencoder: update ceph-object-corpus submodule for 18.2.0 coverage

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
15 months agoMerge pull request #56814 from Matan-B/wip-65306-squid
Yuri Weinstein [Thu, 18 Apr 2024 15:34:06 +0000 (08:34 -0700)]
Merge pull request #56814 from Matan-B/wip-65306-squid

squid: osd/SnapMapper: fix _lookup_purged_snap

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
15 months agoMerge pull request #56697 from NitzanMordhai/wip-65312-squid
Yuri Weinstein [Thu, 18 Apr 2024 15:33:34 +0000 (08:33 -0700)]
Merge pull request #56697 from NitzanMordhai/wip-65312-squid

squid: cls/cas/cls_cas_internal: Initialize 'hash' value before decoding

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
15 months agoMerge pull request #56482 from ronen-fr/wip-65072-squid
Yuri Weinstein [Thu, 18 Apr 2024 15:32:58 +0000 (08:32 -0700)]
Merge pull request #56482 from ronen-fr/wip-65072-squid

squid: osd/scrub: no "slow response" warning for queued reservations

Reviewed-by: Laura Flores <lflores@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
15 months agoMerge pull request #56474 from amathuria/wip-65140-squid
Yuri Weinstein [Thu, 18 Apr 2024 15:31:50 +0000 (08:31 -0700)]
Merge pull request #56474 from amathuria/wip-65140-squid

squid: osd: Change PG Deletion cost for mClock

Reviewed-by: Laura Flores <lflores@redhat.com>
Reviewed-by: Sridhar Seshasayee <sseshasa@redhat.com>
15 months agoMerge pull request #56457 from ljflores/wip-65117-squid
Yuri Weinstein [Thu, 18 Apr 2024 15:30:55 +0000 (08:30 -0700)]
Merge pull request #56457 from ljflores/wip-65117-squid

squid: qa/workunits: opt in to new collection after upgrade from reef to main

Reviewed-by: Yaarit Hatuka <yaarithatuka@gmail.com>
15 months agoMerge pull request #56432 from Matan-B/wip-65097-squid
Yuri Weinstein [Thu, 18 Apr 2024 15:29:57 +0000 (08:29 -0700)]
Merge pull request #56432 from Matan-B/wip-65097-squid

squid: mon/OSDMonitor: fix rmsnap command

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
15 months agoMerge pull request #56671 from batrick/wip-65295-squid
Yuri Weinstein [Thu, 18 Apr 2024 15:03:33 +0000 (08:03 -0700)]
Merge pull request #56671 from batrick/wip-65295-squid

squid: mds: skip sr moves when target is an unlinked dir

Reviewed-by: Venky Shankar <vshankar@redhat.com>
15 months agoMerge pull request #56665 from batrick/wip-65106-squid
Yuri Weinstein [Thu, 18 Apr 2024 15:03:05 +0000 (08:03 -0700)]
Merge pull request #56665 from batrick/wip-65106-squid

squid: qa/cephfs: add probabilistic ignorelist for pg_health

Reviewed-by: Venky Shankar <vshankar@redhat.com>
15 months agoMerge pull request #56663 from batrick/wip-65275-squid
Yuri Weinstein [Thu, 18 Apr 2024 15:02:19 +0000 (08:02 -0700)]
Merge pull request #56663 from batrick/wip-65275-squid

squid:  mds: some request errors come from errno.h rather than fs_types.h

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
15 months agoMerge pull request #56945 from afreen23/wip-65542-squid
Nizamudeen A [Thu, 18 Apr 2024 09:49:12 +0000 (15:19 +0530)]
Merge pull request #56945 from afreen23/wip-65542-squid

squid: mgr/dashboard: Support Description and AccountId in rgw roles

Reviewed-by: ivoalmeida <NOT@FOUND>
15 months agoMerge pull request #56967 from zdover23/wip-doc-2024-04-18-backport-56879-to-squid
Anthony D'Atri [Wed, 17 Apr 2024 20:58:13 +0000 (16:58 -0400)]
Merge pull request #56967 from zdover23/wip-doc-2024-04-18-backport-56879-to-squid

squid: doc/cephfs: improve ceph-fuse command

15 months agodoc/cephfs: improve ceph-fuse command 56967/head
Zac Dover [Mon, 15 Apr 2024 07:43:23 +0000 (17:43 +1000)]
doc/cephfs: improve ceph-fuse command

Instruct readers to use "mkdir /mnt/cephfs1" to create a mountpoint
before using "ceph-fuse" to mount a filesystem, if "/mnt/cephfs1"
doesn't already exist. cf.
https://github.com/ceph/ceph/pull/56831#discussion_r1561102227

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit bdfee45d3a8267db97fc697c369a3c8a945ae993)

15 months agoMerge pull request #56949 from cbodley/wip-65543-squid
Casey Bodley [Wed, 17 Apr 2024 16:12:28 +0000 (17:12 +0100)]
Merge pull request #56949 from cbodley/wip-65543-squid

squid: rgw: increase log level on abort_early

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
15 months agorgw: increase log level on abort_early 56949/head
Seena Fallah [Fri, 12 Apr 2024 19:59:41 +0000 (21:59 +0200)]
rgw: increase log level on abort_early

The function is typically invoked on client errors like NoSuchBucket. Logging these errors with level 1 may initially suggest a significant issue, when in fact it's just a client error. Consider raising the logging level to 20 for better clarity.

Fixes: https://tracker.ceph.com/issues/65469
Signed-off-by: Seena Fallah <seenafallah@gmail.com>
(cherry picked from commit 302e3c459acdffe51fb73e902f2b3c828faa23e0)

15 months agomgr/dashboard: Support Description and AccountId in rgw roles 56945/head
Afreen [Tue, 16 Apr 2024 11:42:44 +0000 (17:12 +0530)]
mgr/dashboard: Support Description and AccountId in rgw roles

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

Rgw roles list page is crashing due to these new fields coming from api but not supported in dashboard frontend.

This will also fix failing CI tests.

Signed-off-by: Afreen <afreen23.git@gmail.com>
(cherry picked from commit bfa85ecd8a3799143b6afbac2a302e4d6b3b4a24)

15 months agoMerge pull request #56920 from afreen23/wip-65505-squid
Ivo Almeida [Wed, 17 Apr 2024 09:53:02 +0000 (10:53 +0100)]
Merge pull request #56920 from afreen23/wip-65505-squid

squid: mgr/dashboard: Move features to advanced section and expand by default rbd config section

Reviewed-by: ivoalmeida <NOT@FOUND>
15 months agoMerge pull request #56902 from adk3798/wip-65415-squid
Adam King [Tue, 16 Apr 2024 19:59:43 +0000 (15:59 -0400)]
Merge pull request #56902 from adk3798/wip-65415-squid

squid: cephadm: add idmap.conf to nfs sample file

Reviewed-by: John Mulligan <jmulligan@redhat.com>
15 months agoMerge pull request #56901 from adk3798/wip-65382-squid
Adam King [Tue, 16 Apr 2024 19:58:30 +0000 (15:58 -0400)]
Merge pull request #56901 from adk3798/wip-65382-squid

squid: mgr/cephadm: Allows enabling NFS Ganesha NLM

Reviewed-by: John Mulligan <jmulligan@redhat.com>
15 months agoMerge pull request #56898 from adk3798/squid-cephadm-smb-backport
Adam King [Tue, 16 Apr 2024 19:57:21 +0000 (15:57 -0400)]
Merge pull request #56898 from adk3798/squid-cephadm-smb-backport

squid: cephadm: add a new SMB service to the mgr module

Reviewed-by: John Mulligan <jmulligan@redhat.com>
15 months agoMerge pull request #56897 from adk3798/squid-cephadm-log-only-match
Adam King [Tue, 16 Apr 2024 19:56:33 +0000 (15:56 -0400)]
Merge pull request #56897 from adk3798/squid-cephadm-log-only-match

squid: qa/cephadm: only fail on CEPHADM_ error in logs

Reviewed-by: John Mulligan <jmulligan@redhat.com>
15 months agoMerge pull request #56826 from NitzanMordhai/wip-65414-squid
Adam King [Tue, 16 Apr 2024 19:55:20 +0000 (15:55 -0400)]
Merge pull request #56826 from NitzanMordhai/wip-65414-squid

squid: suites/rados/cephadm: adding OSD_DOWN to the log-ignorelist

Reviewed-by: Adam King <adking@redhat.com>
15 months agoMerge pull request #56769 from adk3798/squid-node-proxy-service-size
Adam King [Tue, 16 Apr 2024 19:46:08 +0000 (15:46 -0400)]
Merge pull request #56769 from adk3798/squid-node-proxy-service-size

squid: mgr/cephadm: fix node-proxy service size

Reviewed-by: John Mulligan <jmulligan@redhat.com>
15 months agoMerge pull request #56768 from adk3798/squid-no-osd-upgrade
Adam King [Tue, 16 Apr 2024 19:45:18 +0000 (15:45 -0400)]
Merge pull request #56768 from adk3798/squid-no-osd-upgrade

squid: mgr/cephadm: handle setting required osd release with no OSDs during upgrade

Reviewed-by: John Mulligan <jmulligan@redhat.com>
15 months agoMerge pull request #56491 from adk3798/wip-64990-squid
Adam King [Tue, 16 Apr 2024 19:43:06 +0000 (15:43 -0400)]
Merge pull request #56491 from adk3798/wip-64990-squid

squid: cephadm: fix `cephadm shell --name <daemon-name>` for stopped/failed daemon

Reviewed-by: John Mulligan <jmulligan@redhat.com>
15 months agoMerge pull request #56488 from adk3798/squid-rgw-bootstrap-hostname
Adam King [Tue, 16 Apr 2024 19:42:44 +0000 (15:42 -0400)]
Merge pull request #56488 from adk3798/squid-rgw-bootstrap-hostname

squid: mgr/cephadm: update rgw zonegroup w/ zonegroup_hostnames from rgw spec

Reviewed-by: John Mulligan <jmulligan@redhat.com>
15 months agoMerge pull request #56301 from adk3798/squid-only-bind-to-network
Adam King [Tue, 16 Apr 2024 19:42:02 +0000 (15:42 -0400)]
Merge pull request #56301 from adk3798/squid-only-bind-to-network

squid: mgr/cephadm: allow grafana and prometheus to only bind to specific network

Reviewed-by: John Mulligan <jmulligan@redhat.com>
15 months agoMerge pull request #56820 from cbodley/wip-65411-squid
Casey Bodley [Tue, 16 Apr 2024 19:25:06 +0000 (20:25 +0100)]
Merge pull request #56820 from cbodley/wip-65411-squid

squid: qa/rgw: barbican uses branch stable/2023.1

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
15 months agoMerge pull request #56918 from rhcs-dashboard/wip-65501-squid
Ivo Almeida [Tue, 16 Apr 2024 19:00:59 +0000 (20:00 +0100)]
Merge pull request #56918 from rhcs-dashboard/wip-65501-squid

squid: mgr/dashboard: remove minutely from retention

Reviewed-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
15 months agoMerge pull request #56824 from soumyakoduri/squid
Casey Bodley [Tue, 16 Apr 2024 17:04:00 +0000 (18:04 +0100)]
Merge pull request #56824 from soumyakoduri/squid

[Squid] rgw/cloud: Handle RGWRESTStreamS3PutObj initialization failures

Reviewed-by: Casey Bodley <cbodley@redhat.com>
15 months agoMerge pull request #56318 from adk3798/wip-64631-squid
Adam King [Tue, 16 Apr 2024 16:59:15 +0000 (12:59 -0400)]
Merge pull request #56318 from adk3798/wip-64631-squid

squid: doc: adding documentation for secure monitoring stack configuration

Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
Reviewed-by: John Mulligan <jmulligan@redhat.com>
15 months agoMerge pull request #56840 from cbodley/wip-65427-squid
Casey Bodley [Tue, 16 Apr 2024 15:05:43 +0000 (16:05 +0100)]
Merge pull request #56840 from cbodley/wip-65427-squid

squid: rgw: ignore SIGXFSZ, which apparently can triggered by heavy ops-log …

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
15 months agoMerge pull request #56913 from zdover23/wip-doc-2024-04-16-backport-56905-to-squid
Anthony D'Atri [Tue, 16 Apr 2024 12:14:47 +0000 (08:14 -0400)]
Merge pull request #56913 from zdover23/wip-doc-2024-04-16-backport-56905-to-squid

squid: doc/security: remove old GPG information

15 months agomgr/dashboard: Move features to advanced section 56920/head
Afreen [Thu, 4 Apr 2024 07:41:11 +0000 (13:11 +0530)]
mgr/dashboard: Move features to advanced section

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

- Moves "features" section in rbd image create form to "Advanced" section.
- makes rbd configuration section to be expanded by default rather than
  being collapsed as it has only single section. This will improve user experience as it will not
require two clicks.
- updates e2e test

Signed-off-by: Afreen <afreen23.git@gmail.com>
(cherry picked from commit 921a5249fd1b1b2828d055bc92abf2fa428875ce)

15 months agomgr/dashboard: remove minutely from retention dd 56918/head
Ivo Almeida [Mon, 15 Apr 2024 15:50:41 +0000 (16:50 +0100)]
mgr/dashboard: remove minutely from retention dd

Removed "minutely" from retention policy dropdown

Fixes: https://tracker.ceph.com/issues/65493
Signed-off-by: Ivo Almeida <ialmeida@redhat.com>
(cherry picked from commit 406f48d1c18858d5e6894c6aa521b395e8697ae4)

15 months agodoc/security: remove old GPG information 56913/head
Zac Dover [Mon, 15 Apr 2024 15:45:10 +0000 (01:45 +1000)]
doc/security: remove old GPG information

Remove a GPG key that was lost in a server upgrade, and remove the text
that describes it.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 95ec06a59a29ad2528471312ebc2931f7097213b)

15 months agoMerge pull request #56675 from kchheda3/wip-64954-squid
Casey Bodley [Mon, 15 Apr 2024 22:29:21 +0000 (23:29 +0100)]
Merge pull request #56675 from kchheda3/wip-64954-squid

squid: rgw/notification: Fix the notification FilterRule to emit unique key name in json & Log successful delivery of notification event.

Reviewed-by: Yuval Lifshitz <ylifshit@ibm.com>
15 months agoMerge pull request #56720 from ivancich/wip-65339-squid
Casey Bodley [Mon, 15 Apr 2024 22:28:56 +0000 (23:28 +0100)]
Merge pull request #56720 from ivancich/wip-65339-squid

squid: rgw: update options yaml file so LDAP uri isn't an invalid example

Reviewed-by: Casey Bodley <cbodley@redhat.com>
15 months agoMerge pull request #56822 from cbodley/wip-65412-squid
Casey Bodley [Mon, 15 Apr 2024 22:28:18 +0000 (23:28 +0100)]
Merge pull request #56822 from cbodley/wip-65412-squid

squid: rgw/multisite: x-rgw-replicated-at uses dump_time_header()

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
15 months agoMerge pull request #56863 from cbodley/wip-65467-squid
Casey Bodley [Mon, 15 Apr 2024 15:48:00 +0000 (16:48 +0100)]
Merge pull request #56863 from cbodley/wip-65467-squid

squid: rgw: user accounts implementation

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
15 months agocephadm: add idmap.conf to nfs sample file 56902/head
Adam King [Tue, 26 Mar 2024 13:34:07 +0000 (09:34 -0400)]
cephadm: add idmap.conf to nfs sample file

Otherwise deployment using this sample will fail with
"ERROR: required file missing from config-json: idmap.conf"

Fixes: https://tracker.ceph.com/issues/65155
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 79b1dd5b30f8556aacc9a7536366694ba901795e)

15 months agomgr/cephadm: Allows enabling NFS Ganesha NLM 56901/head
Teoman ONAY [Tue, 26 Mar 2024 08:34:16 +0000 (09:34 +0100)]
mgr/cephadm: Allows enabling NFS Ganesha NLM

Enable_NLM was harcoded to "false" which prevented enabling file
locking. It can now be enabled using enable_nlm in spec file

Fixes: https://tracker.ceph.com/issues/65144
Signed-off-by: Teoman ONAY <tonay@ibm.com>
(cherry picked from commit 29331919df222e136ce7b0788376859b3a9cb2aa)

15 months agoqa/suites/orch: add minimal smb non-AD test 56898/head
Shachar Sharon [Wed, 13 Mar 2024 14:43:29 +0000 (16:43 +0200)]
qa/suites/orch: add minimal smb non-AD test

Test minimal SMB deployment over CephFS, using local users (non-AD).
Upon successful deployment run minima smbclient command ('ls') to probe
Samba's share liveness.

Co-authored-by: John Mulligan <jmulligan@redhat.com>
Signed-off-by: Shachar Sharon <ssharon@redhat.com>
Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 8bb5fb69648f497da80c97011e171dff23c5130d)

15 months agoqa/tasks: add a cephadm samba container helper func independent of AD DC
John Mulligan [Fri, 15 Mar 2024 17:48:35 +0000 (13:48 -0400)]
qa/tasks: add a cephadm samba container helper func independent of AD DC

To have the standalone (non-AD) server test function similarly to the AD
member server test we need to set a variable for samba client container
command similar to how the AD setup command does it.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit b2197e43b5eeb326b2e5498a06a2e13f4a532b87)

15 months agoqa/suites/orch: add a new smb service cephadm sub-suite and test
John Mulligan [Sat, 24 Feb 2024 15:52:53 +0000 (10:52 -0500)]
qa/suites/orch: add a new smb service cephadm sub-suite and test

Start a new subdir under cephadm suite for the new smb service
that cephadm can deploy. Add one new test that checks that a
smb service with domain membership can be deployed and connect
to it with smbclient from the samba client container image.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 1f3001eef670a6bd1ff47cc11e459058a523b388)

15 months agoqa/tasks: add error condition to exec functions
John Mulligan [Tue, 27 Feb 2024 14:48:25 +0000 (09:48 -0500)]
qa/tasks: add error condition to exec functions

Looking at the code that expands `all-roles` and `all-hosts` there's no
proper error checking for when these values appear but there are >1
top-level roles in the task config. If a user does this it'll fail
but in a somewhat unclear manner. Add a new condition that raises a
clear exception in this case hopefully saving someone future debugging
time.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 96704903f273ca0ee597dd819d9aadd1616625ed)

15 months agoqa/tasks: reduce duplicated code
John Mulligan [Tue, 27 Feb 2024 14:44:51 +0000 (09:44 -0500)]
qa/tasks: reduce duplicated code

All `exec`-style function in teuthology appear to have a transformation
block that expands names like `all-roles` and `all-hosts`. With the new
cephadm.exec task that block appeared twice in cephadm.py. This change
removes the duplication by creating an _expand_roles function that
can be called from the command executing functions.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit bf1607a4a14e92a745cd8d7e743e5f81b7d407b7)

15 months agoqa/tasks: add a template filter to map a role name to a remote
John Mulligan [Mon, 26 Feb 2024 21:17:22 +0000 (16:17 -0500)]
qa/tasks: add a template filter to map a role name to a remote

Add a `role_to_remote` template filter function that has the ability to
map a role name to a remote. Attributes of the remote can then be
used to get the actual node ip or name.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 361cbd46b9c5431452c742edd3ca7f0280e4161b)

15 months agoqa/tasks: a new cephadm exec task similar to vip.exec but generalized
John Mulligan [Mon, 26 Feb 2024 21:16:57 +0000 (16:16 -0500)]
qa/tasks: a new cephadm exec task similar to vip.exec but generalized

Add a new cephadm.exec task that works similarly to the existing
vip.exec but instead of only considering VIP related string replacements
it uses that templating feature that was recently added to the
cephadm module for generalized string templating.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 1ed66542ef27f5382d82b7cc60e76c2fe6d30fc9)

15 months agoqa/tasks: add a cephadm.exclude role
John Mulligan [Mon, 26 Feb 2024 18:47:04 +0000 (13:47 -0500)]
qa/tasks: add a cephadm.exclude role

Add a cephadm.exclude role that excludes a test node from cluster setup
and related commands. I need this as I have  test node that will be set
up as an AD Domain Controller for testing Samba and do not want that
node to be have *any* other services running on it.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 3ec0bfa9eb5daf6b8b0101a50d0323918cdb7d31)

15 months agoqa/tasks: allow passing stdin string to cephadm shell commands
John Mulligan [Sat, 24 Feb 2024 19:26:36 +0000 (14:26 -0500)]
qa/tasks: allow passing stdin string to cephadm shell commands

There are cases where I want to pass some large-ish strings to ceph
commands executed via cephadm shell. Allow items within the commands
list to be dicts containing a command (as before) and an optional
stdin variable. This change also supports possible future extensions as
well.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 2a917e23ca6b3d2a4b90a40a07a1b5ae299b3924)

15 months agoqa/tasks: add a new cephadm task for setting up samba ad dc
John Mulligan [Tue, 20 Feb 2024 23:28:58 +0000 (18:28 -0500)]
qa/tasks: add a new cephadm task for setting up samba ad dc

Add a new task function to cephadm.py that sets up a container running
the Samba based domain controller on a node using podman or docker.
Much of the function actually deals with disabling systemd-resolved
because that service conflicts with the DNS server component of the DC.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit a99dc99589a0b81792abab1d14db6aad3ef9f2b8)

15 months agodoc/cephadm: add a file documenting the smb service
John Mulligan [Sat, 10 Feb 2024 14:06:53 +0000 (09:06 -0500)]
doc/cephadm: add a file documenting the smb service

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 4e897de3225aa8624c3e0188236f85f523088ea2)

15 months agomgr/cephadm: add some tests for the new smb service
John Mulligan [Thu, 14 Dec 2023 00:36:46 +0000 (19:36 -0500)]
mgr/cephadm: add some tests for the new smb service

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 9a58843dde69d2016be019d3e501d70022720e11)

15 months agomgr/cephadm: simplify _get_container_image a bit
John Mulligan [Fri, 5 Jan 2024 15:45:08 +0000 (10:45 -0500)]
mgr/cephadm: simplify _get_container_image a bit

Because the "if-ladder" was only ever assigning a single variable with
a value it can be directly replaced by a dict & dict-lookup which is
much more succinct.
Also take the opportunity to sort the (non-comment) lines as there's
no meaning to the previous order and this makes it easier for a reader
to scan through.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 0847ee2ee4531f2bb02ee3cc2a290c4c10fe4330)

15 months agomgr/cephadm: add the samba container image for smb daemons
John Mulligan [Fri, 15 Dec 2023 18:15:19 +0000 (13:15 -0500)]
mgr/cephadm: add the samba container image for smb daemons

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 3985325e6983e3440ebb73a5b328071c096ac027)

15 months agomgr/cepahdm: add various touch points to enable smb service
John Mulligan [Thu, 4 Jan 2024 21:38:08 +0000 (16:38 -0500)]
mgr/cepahdm: add various touch points to enable smb service

Add the smb service by name or by type to one of the many, many touch
points in the orchestrator and cephadm packages needed to get the
orchestrator aware of smb.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit c5e4912fd5fd43e21525952ca1d295dac10e2bbe)

15 months agomgr/cephadm: add a new smb ceph service subclass
John Mulligan [Wed, 13 Dec 2023 21:10:11 +0000 (16:10 -0500)]
mgr/cephadm: add a new smb ceph service subclass

Will be used in a later commit to implement deploying smb instances.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit a88cf505a051298996b6be99d6d55a91a7684467)

15 months agopython-common: define a new SMBSpec service spec type
John Mulligan [Wed, 13 Dec 2023 21:10:37 +0000 (16:10 -0500)]
python-common: define a new SMBSpec service spec type

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 4f655c5e1894812ad983111276f188b4fd61aebe)

15 months agopython-common: reformat ServiceSpec class level service type lists
John Mulligan [Thu, 14 Dec 2023 00:20:45 +0000 (19:20 -0500)]
python-common: reformat ServiceSpec class level service type lists

Reformat the ServiceSpec classes properties KNOWN_SERVICE_TYPES and
REQUIRES_SERVICE_ID. These were previously strings that were converted
to lists via a call to split. With a string there's very little a human
or a tool can do to validate the content. Changing these into proper
lists in the source code brings clarity of intent and the ability to
analyze the code. Because there's no semantic difference what services
are listed where (this means the type could probably be a set - a quest
for another day) I also took the opportunity to sort the contents of the
lists and add some basic comments for what these lists are for.

It also removes the use of (ugly, IMO) line continuations. The downside
is that it makes more total lines, but if that bugs you - use code
folding :-).

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 4fc2697fb1e4dc71b480db275aa4e54c2b66d018)

15 months agomgr/cephadm: refactor keyring simplification out of get_keyring_with_caps
John Mulligan [Fri, 5 Jan 2024 15:24:10 +0000 (10:24 -0500)]
mgr/cephadm: refactor keyring simplification out of get_keyring_with_caps

Refactor get_keyring_with_caps such that the keyring simplification code
is moved into a new function that can be used in other locations.
get_keyring_with_caps will now call the new function to return the
simplified & consistent keyring output.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 41e2b27817c783f3b4b142441ed827e1827482d6)

15 months agomgr/cephadm: reformat the _service_classes variable
John Mulligan [Wed, 13 Dec 2023 20:49:12 +0000 (15:49 -0500)]
mgr/cephadm: reformat the _service_classes variable

Reformat the _service_classes variable so that it uses a multi-line list
with a single item on each line in a more black-ish style that is more
readable (especially if you use code-folding wisely).
Sort the list while we're at it.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit a500f42d1a6faf5dc2607dd3ec425c5af7585128)

15 months agomgr/orchestrator: fix the sorting of the imports
John Mulligan [Wed, 13 Dec 2023 21:05:27 +0000 (16:05 -0500)]
mgr/orchestrator: fix the sorting of the imports

While ceph doesn't enforce sorted imports I prefer them when possible. I
had once sorted these imports but then nvmeof came along an ruined
things. Put nvmeof back in it's place.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 35028e15789dc3600143a434301625d094b24475)

15 months agomgr/orchestrator: clean up import style
John Mulligan [Wed, 13 Dec 2023 19:37:17 +0000 (14:37 -0500)]
mgr/orchestrator: clean up import style

In the seemingly never-ending fight against line continuations and just
blatting tons of stuff onto single lines another small victory is won.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 96456aaf46d13ee29529c4fb031a90f0e4a795a8)

15 months agomgr/cephadm: fix test failure on newer python
John Mulligan [Wed, 13 Dec 2023 19:33:20 +0000 (14:33 -0500)]
mgr/cephadm: fix test failure on newer python

Tests that touch this enum fail for me locally but pass in the CI. This
seems to be due to new enum related behavior in Python 3.11.
See: https://blog.pecar.me/python-enum
Instead of fixing it as suggested in the above blog, adding a __str__
method works on all python versions I care to know about.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 07b44900e8c8bef434e848bf7aa84d18d78d8bd6)

15 months agocephadm: fix issue joining to ad by using a virtual hostname
John Mulligan [Tue, 16 Jan 2024 20:37:27 +0000 (15:37 -0500)]
cephadm: fix issue joining to ad by using a virtual hostname

The not-a-real-fqdn hostname that the containers got were causing
performance issues joining AD (and running testjoin and winbind).
Define a virtual hostname that can be passed in from the service or
automatically derived from the system's hostname.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit f8160ed11b046bc747bbf045173fb222688ed669)

15 months agocephadm: add a basic deployment test for an smb daemon
John Mulligan [Wed, 6 Dec 2023 20:14:32 +0000 (15:14 -0500)]
cephadm: add a basic deployment test for an smb daemon

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 3b0f33188abef97d8e6ff774b03947ba23e180d0)

15 months agocephadm: import and enable deployment of SMB daemon class
John Mulligan [Wed, 6 Dec 2023 20:14:32 +0000 (15:14 -0500)]
cephadm: import and enable deployment of SMB daemon class

Enable the use of the SMB container daemon form class by importing, and
thus registering, it. Note that the only way to invoke this feature is
by hand rolling some JSON to feed to the `ceph _orch deploy` command.
Connecting this with the cephadm mgr module is left as a future task.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit f86e7106a48bd64a36c67377c780c6cf1521bdb5)

15 months agocephadm: add an SMB daemon module and classes
John Mulligan [Wed, 6 Dec 2023 20:14:31 +0000 (15:14 -0500)]
cephadm: add an SMB daemon module and classes

Add an incomplete but largely viable SMB/Samba container daemon form
implementation to cephadm. Currently unused but it lays out some of the
basics needed to create smb sharing using samba containers under cephadm
orchestration.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 0169fd945e7a1d5ea9dc3969e257cd0ecce0c1c6)

15 months agocephadm: add a default constant value for samba server container image
John Mulligan [Tue, 21 Nov 2023 22:11:37 +0000 (17:11 -0500)]
cephadm: add a default constant value for samba server container image

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit d373edf0d6126ab6672f115e439d5bc14f983336)

15 months agocephadm: add generic methods for sharing namespaces across containers
John Mulligan [Sun, 3 Dec 2023 16:01:05 +0000 (11:01 -0500)]
cephadm: add generic methods for sharing namespaces across containers

In the future, some sidecar containers will need to share namespaces
with the primary container (or each other). Make it easy to set this up
by creating a enable_shared_namespaces function and Namespace enum.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit b6fa001cdb49a4db6c469bb9f80b9baee7b91ae4)

15 months agoqa/tasks: replace uses of subst_vip with new templating function
John Mulligan [Thu, 22 Feb 2024 18:51:16 +0000 (13:51 -0500)]
qa/tasks: replace uses of subst_vip with new templating function

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 4f1f09531ad7dd94c1489eb4890244247f77d4c7)

15 months agoqa/tasks: add templating functions to cephadm module
John Mulligan [Thu, 22 Feb 2024 18:49:10 +0000 (13:49 -0500)]
qa/tasks: add templating functions to cephadm module

Add functions to cephadm.py that will be later used to template
strings within the yaml files in the cephadm suites. This will be used
to replace the specific subst_vip call with generic calls that let
tests access "any" variables stored on the test ctx.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 7bd85b52fd735d427048c38c322ba899681ab1e4)

15 months agoqa/tasks: fix VIPs log line
John Mulligan [Tue, 20 Feb 2024 15:09:50 +0000 (10:09 -0500)]
qa/tasks: fix VIPs log line

While testing my previous patches were correct I noticed that the string
here was logged exactly as written, and was thus pretty useless.  This
was probably meant to be an f-string. So make it one. Also get rid of
the unnecessary map call, the list and IP address type can repr
themselves just fine IMO.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 19e664fcdfeb62134db5d40210c40c63f7406a05)

15 months agoqa/tasks: make _map_vips private
John Mulligan [Tue, 20 Feb 2024 00:18:08 +0000 (19:18 -0500)]
qa/tasks: make _map_vips private

Nothing outside of vip.py called map_vips, so let us make sure this
is considered a private function and prefix it with the underscore.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit addc970c1991d6d1e9f0cbc736c279fcde003775)

15 months agoqa/tasks: change map_vips to raise exceptions instead of returning None
John Mulligan [Tue, 20 Feb 2024 00:14:52 +0000 (19:14 -0500)]
qa/tasks: change map_vips to raise exceptions instead of returning None

None of the callers of map_vips ever checks for a None return. So
instead of handling any error conditions it would always just blow
up with a semi-obscure TypeError. Convert the function to always
raise an exception (one that tries to breifly explain the condition)
when something goes wrong. I also take the opportunity to make
more clearer logging and reduce an indentation level.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 52a924e7fd4b84801b8606436f287ff15c46f40a)

15 months agoqa/cephadm: only fail on CEPHADM_ error in logs 56897/head
Adam King [Mon, 8 Apr 2024 19:11:02 +0000 (15:11 -0400)]
qa/cephadm: only fail on CEPHADM_ error in logs

Rather than failing for any instance of
[ERR], [WRN], or [SEC]. The orch/cephadm suite
does a lot of stuff that can cause these various
warnings to breifly appear. Trying to catch all
cases has been difficult and the suite has been
red for some time. This patch makes it so it
instead only matches log messages that
include CEPHADM_ on top of having [ERR], [WRN],
or [SEC] as those warnings have been the ones
that have actually lead us to cephadm bugs, while
the others are pretty much always just noise in
these tests. This patch does not apply this
to the mds_upgrade_sequence, nfs, or rbd-iscsi
sections as those are symlinked from other suites
and I didn't want to affect those suites tests
directly with this change.

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

Conflicts:
qa/suites/orch/cephadm/smb/tasks/deploy_smb_basic.yaml
qa/suites/orch/cephadm/smb/tasks/deploy_smb_domain.yaml
qa/suites/orch/cephadm/smoke/start.yaml
qa/suites/orch/cephadm/workunits/task/test_host_drain.yaml
qa/suites/orch/cephadm/workunits/task/test_monitoring_stack_basic.yaml
qa/suites/orch/cephadm/workunits/task/test_rgw_multisite.yaml
qa/suites/orch/cephadm/workunits/task/test_set_mon_crush_locations.yaml

15 months agoMerge pull request #56881 from rhcs-dashboard/wip-65465-squid
Ivo Almeida [Mon, 15 Apr 2024 14:39:21 +0000 (15:39 +0100)]
Merge pull request #56881 from rhcs-dashboard/wip-65465-squid

squid: mgr/dashboard: snapshot schedule repeat frequency validation

Reviewed-by: afreen23 <NOT@FOUND>
15 months agoqa/tasks/cephadm: add option to limit what matches in log error scraping
Adam King [Mon, 8 Apr 2024 18:27:26 +0000 (14:27 -0400)]
qa/tasks/cephadm: add option to limit what matches in log error scraping

This is specifically being added with the orch/cephadm suite
in mind, where coming up with a viable ignorelist has proved
difficult. The orch testing does a lot of actions that can
cause thigns like an OSD or MON daemon to be down very
briefly, and I've found the vast majority of the time we
really don't want to fail the test when these pop up as cephadm
testing really only benefits from catching the CEPHADM_ errors/
warnings rather than eveyr possible one. Rather than continuing to
play whack-a-mole with the errors in the logs, this
patch should allow us to limit what we fail on to at
least get the suite in a good spot again. We can always
phase out the uses of this new "log-only_match" option
later in a more controlled way, and adding it shouldn't
affect log scraping for any of the tests that aren't
facing a similar issue.

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

15 months agoMerge pull request #56861 from rhcs-dashboard/wip-65458-squid
Ivo Almeida [Mon, 15 Apr 2024 08:13:07 +0000 (09:13 +0100)]
Merge pull request #56861 from rhcs-dashboard/wip-65458-squid

squid: mgr/dashboard: fix snap schedule delete retention

Reviewed-by: afreen23 <NOT@FOUND>
15 months agomgr/dashboard: fix repeat frequency validation 56881/head
Ivo Almeida [Tue, 19 Mar 2024 12:44:40 +0000 (12:44 +0000)]
mgr/dashboard: fix repeat frequency validation

Fixed snap schedule repeat frequency validation

Fixes: https://tracker.ceph.com/issues/64980
Signed-off-by: Ivo Almeida <ialmeida@redhat.com>
(cherry picked from commit 92b40f91c07086406103c865af7c645b99d43806)

15 months agoMerge pull request #56871 from zdover23/wip-doc-2024-04-14-backport-56870-to-squid
Anthony D'Atri [Sat, 13 Apr 2024 21:50:59 +0000 (17:50 -0400)]
Merge pull request #56871 from zdover23/wip-doc-2024-04-14-backport-56870-to-squid

squid: doc/cephfs: disambiguate "Reporting Free Space"

15 months agodoc/cephfs: disambiguate "Reporting Free Space" 56871/head
Zac Dover [Sat, 13 Apr 2024 10:48:21 +0000 (20:48 +1000)]
doc/cephfs: disambiguate "Reporting Free Space"

Make a few sentences clearer in doc/cephfs/ceph-auth.rst.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 788ccff18149b16cb01947c5bcf3bde380090df0)

15 months agotest/rgw/pubsub: wait_for_queue_to_drain() supports tenant/account topics 56863/head
Casey Bodley [Thu, 11 Apr 2024 19:52:26 +0000 (15:52 -0400)]
test/rgw/pubsub: wait_for_queue_to_drain() supports tenant/account topics

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 400728481e2ba446ac2300565129a4ed55cf63b1)

15 months agoqa/rgw/s3tests: remove 'client.0' from bucket prefix
Casey Bodley [Thu, 4 Apr 2024 17:25:23 +0000 (13:25 -0400)]
qa/rgw/s3tests: remove 'client.0' from bucket prefix

new sns test cases are using this for topic names, but the '.' is not
allowed there:

> api_params = {'Name': 'test-client.0-n3bdgre5el2jk8v-606'}
> botocore.exceptions.ClientError: An error occurred (InvalidArgument) when calling the CreateTopic operation: Name must be made up of only uppercase and lowercase ASCII letters, numbers, underscores, and hyphens

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 39a2af56d78dd1949434c36367d780cc5f91fe30)

15 months agorgw/notify: populate event userIdentity with account ids
Casey Bodley [Thu, 4 Apr 2024 13:28:00 +0000 (09:28 -0400)]
rgw/notify: populate event userIdentity with account ids

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 24841fbddec68199bbe6cfcc9dc1d2bbc1d84e52)

15 months agotest/rgw/pubsub: test persistent notifications with account user
Casey Bodley [Wed, 3 Apr 2024 22:21:20 +0000 (18:21 -0400)]
test/rgw/pubsub: test persistent notifications with account user

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 43ca67b3d88d900abd6aaa52e84d46d212a936c6)

15 months agorgw/notify: support cross-tenant and cross-account notifications
Casey Bodley [Wed, 3 Apr 2024 20:23:53 +0000 (16:23 -0400)]
rgw/notify: support cross-tenant and cross-account notifications

a bucket's notification configuration may refer to topics from several
different tenants or accounts. when publishing to a given topic, look in
the correct namespace for each topic instead of defaulting to the
requesting user's tenant namespace

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 3a5af5fdfe138f1de385f7637d04398606be4eca)

15 months agorgw/pubsub: forward requests as s->owner instead of s->user
Casey Bodley [Thu, 28 Mar 2024 19:26:10 +0000 (15:26 -0400)]
rgw/pubsub: forward requests as s->owner instead of s->user

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 63e164f4d22999dcdeb34bbe8c879f1b70055def)

15 months agorgw/notify: publish functions use rgw_pubsub_dest::persistent_queue
Casey Bodley [Thu, 28 Mar 2024 17:29:37 +0000 (13:29 -0400)]
rgw/notify: publish functions use rgw_pubsub_dest::persistent_queue

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 64ac1de01f7f26c7af3da481ec522ca7dd188c55)

15 months agodoc/rgw: warn about topics under account migration
Casey Bodley [Wed, 20 Mar 2024 18:43:21 +0000 (14:43 -0400)]
doc/rgw: warn about topics under account migration

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit bfae83c86532eef6041d6d07acb47c02739b8748)

15 months agorgw/pubsub: use rgw_pubsub_dest::persistent_queue for queue oid
Casey Bodley [Wed, 20 Mar 2024 18:16:15 +0000 (14:16 -0400)]
rgw/pubsub: use rgw_pubsub_dest::persistent_queue for queue oid

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 4bac81a2bc540b110003b7e5a86c8670ea2a2cc8)

15 months agorgw/pubsub: RGWPubSub::remove_topic() removes persistent queue
Casey Bodley [Wed, 20 Mar 2024 18:14:29 +0000 (14:14 -0400)]
rgw/pubsub: RGWPubSub::remove_topic() removes persistent queue

move the persistent queue removal into remove_topic() where we have
access to the topic metadata. avoid trying to remove the queue if it
isn't enabled

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 4c50ad69c37110d42f1f68f6e567cdf5ac506a32)

15 months agorgw/pubsub: rgw_pubsub_dest stores persistent queue oid
Casey Bodley [Wed, 20 Mar 2024 17:57:21 +0000 (13:57 -0400)]
rgw/pubsub: rgw_pubsub_dest stores persistent queue oid

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 3ef1ab3de225a472a37e84d3e8abb6fbfcaddaa2)

15 months agorgw/pubsub: add/remove_persistent_topic() takes topic queue, not name
Casey Bodley [Wed, 20 Mar 2024 17:56:25 +0000 (13:56 -0400)]
rgw/pubsub: add/remove_persistent_topic() takes topic queue, not name

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit ba2566a5fee05d5ab75210f6b2ba0dc6bf683256)

15 months agotest/rgw/pubsub: topic policy doesn't deny access to owner
Casey Bodley [Mon, 18 Mar 2024 14:09:19 +0000 (10:09 -0400)]
test/rgw/pubsub: topic policy doesn't deny access to owner

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit a75c3ac8c19870ea58bd195893fdda519106bbf7)

15 months agorgw/pubsub: CreateTopic consults existing topic policy for overwrite
Casey Bodley [Fri, 15 Mar 2024 13:51:36 +0000 (09:51 -0400)]
rgw/pubsub: CreateTopic consults existing topic policy for overwrite

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 9b6fe4ac53fb2a1edf190f271c24a2ff9e0442c9)

15 months agorgw/pubsub: fix DeleteTopic permissions
Casey Bodley [Thu, 14 Mar 2024 19:25:02 +0000 (15:25 -0400)]
rgw/pubsub: fix DeleteTopic permissions

non-account users now consult identity policies with
verify_user_permission() when the topic doesn't exist

account users now consult topic policy when it does exist

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 4568b7a0c74404e0d21fcd221070530684de5066)