]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
14 months agoMerge pull request #56497 from adk3798/wip-65124-squid
Adam King [Mon, 29 Apr 2024 15:18:43 +0000 (11:18 -0400)]
Merge pull request #56497 from adk3798/wip-65124-squid

squid: mgr/cephadm: add some NVMEof gateway fields to be configurable by cephadm

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: John Mulligan <jmulligan@redhat.com>
14 months agoMerge pull request #57121 from zdover23/wip-doc-2024-04-29-backport-57119-to-squid
Anthony D'Atri [Mon, 29 Apr 2024 12:36:07 +0000 (08:36 -0400)]
Merge pull request #57121 from zdover23/wip-doc-2024-04-29-backport-57119-to-squid

squid: doc/cephfs: edit front matter in client-auth.rst

14 months agodoc/cephfs: edit front matter in client-auth.rst 57121/head
Zac Dover [Sun, 28 Apr 2024 13:18:50 +0000 (23:18 +1000)]
doc/cephfs: edit front matter in client-auth.rst

Clarify the front matter in doc/cephfs/client-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 713c7304d15279cbc2031efc05cc9e49911974fe)

14 months agoMerge pull request #57108 from zdover23/wip-doc-2024-04-27-backport-57105-to-squid
Zac Dover [Fri, 26 Apr 2024 23:48:52 +0000 (09:48 +1000)]
Merge pull request #57108 from zdover23/wip-doc-2024-04-27-backport-57105-to-squid

squid: doc/mgr: explain error message - dashboard.rst

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
14 months agodoc/mgr: explain error message - dashboard.rst 57108/head
Zac Dover [Fri, 26 Apr 2024 11:59:09 +0000 (21:59 +1000)]
doc/mgr: explain error message - dashboard.rst

Explain that an error message received in response to
"redirect_resolve_ip_addr True" might be caused by having an
insufficiently recent release of Ceph running in your cluster.

Fixes: https://tracker.ceph.com/issues/61312
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 78545030761330c44168dbb3f8d1e4c3c9a9a3bd)

14 months agoMerge pull request #57078 from adk3798/squid-cephadm-no-downgrade
Zac Dover [Thu, 25 Apr 2024 05:46:15 +0000 (15:46 +1000)]
Merge pull request #57078 from adk3798/squid-cephadm-no-downgrade

squid: doc/cephadm: remove downgrade reference from upgrade docs

Reviewed-by: Zac Dover <zac.dover@proton.me>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
14 months agodoc/cephadm: remove downgrade reference from upgrade docs 57078/head
Adam King [Tue, 23 Apr 2024 16:04:39 +0000 (12:04 -0400)]
doc/cephadm: remove downgrade reference from upgrade docs

This has been in here for years, but cephadm will block
attempted upgrades to lower versions and we generally
don't want people to think this is supported or safe.

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

14 months agoMerge pull request #56528 from adk3798/squid-mypy-bump
Adam King [Wed, 24 Apr 2024 15:37:42 +0000 (11:37 -0400)]
Merge pull request #56528 from adk3798/squid-mypy-bump

squid: python: mypy version bump

Reviewed-by: John Mulligan <jmulligan@redhat.com>
14 months agoMerge pull request #56899 from adk3798/wip-65378-squid
Adam King [Wed, 24 Apr 2024 15:34:27 +0000 (11:34 -0400)]
Merge pull request #56899 from adk3798/wip-65378-squid

squid: mgr/cephadm: make client-keyring deploying ceph.conf optional

Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
Reviewed-by: John Mulligan <jmulligan@redhat.com>
14 months agoMerge pull request #56715 from adk3798/squid-test-cephadm-correct-bootstrap-image
Adam King [Wed, 24 Apr 2024 15:32:24 +0000 (11:32 -0400)]
Merge pull request #56715 from adk3798/squid-test-cephadm-correct-bootstrap-image

squid: qa/cephadm: use squid image as default for test_cephadm workunit

Reviewed-by: John Mulligan <jmulligan@redhat.com>
14 months agoMerge pull request #56527 from adk3798/squid-tox-default-envs
Adam King [Wed, 24 Apr 2024 15:28:52 +0000 (11:28 -0400)]
Merge pull request #56527 from adk3798/squid-tox-default-envs

squid: python: allow unit tests to use tox default envs

Reviewed-by: John Mulligan <jmulligan@redhat.com>
14 months agomgr/cephadm: some changes to nvmeof conf file defaults 56497/head
Gil Bregman [Mon, 22 Apr 2024 09:32:15 +0000 (12:32 +0300)]
mgr/cephadm: some changes to nvmeof conf file defaults
Fixes https://tracker.ceph.com/issues/65566

Signed-off-by: Gil Bregman <gbregman@il.ibm.com>
(cherry picked from commit da2d088c1319e980b5202fb65326e78daa014063)

14 months agopython-common/ceph/deployment: some changes to nvmeof conf file defaults
Gil Bregman [Mon, 22 Apr 2024 09:31:16 +0000 (12:31 +0300)]
python-common/ceph/deployment: some changes to nvmeof conf file defaults
Fixes https://tracker.ceph.com/issues/65566

Signed-off-by: Gil Bregman <gbregman@il.ibm.com>
(cherry picked from commit c2aa1fcaf2d43a55953c77b991f688f4b060cd5e)

14 months agomgr/cephadm: make enable_monitor_client configurable for nvmeof
Adam King [Tue, 9 Apr 2024 16:19:06 +0000 (12:19 -0400)]
mgr/cephadm: make enable_monitor_client configurable for nvmeof

Currently, the mon client work is not merged on main, but our
default nvmeof container will attempt to make use of it by default,
causing it to crash. This makes it configurable and defaults the
behavior to false. That can be changed once the work is actually
present in main.

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

14 months agopython-common/ceph/deployment: add nvmeof configuration fields
Gil Bregman [Tue, 2 Apr 2024 10:23:43 +0000 (13:23 +0300)]
python-common/ceph/deployment: add nvmeof configuration fields
Fixes https://tracker.ceph.com/issues/65259

Signed-off-by: Gil Bregman <gbregman@il.ibm.com>
(cherry picked from commit 187baffd56fde2499109e779b3dacd9fa4d52ecf)

14 months agomgr/cephadm: add some NVMEof gateway fields to be configurable by cephadm
Gil Bregman [Tue, 2 Apr 2024 10:22:56 +0000 (13:22 +0300)]
mgr/cephadm: add some NVMEof gateway fields to be configurable by cephadm
Fixes https://tracker.ceph.com/issues/65259

Signed-off-by: Gil Bregman <gbregman@il.ibm.com>
(cherry picked from commit aa4adf97f6daec0a85b042a1591a6cc7ac137d14)

14 months agomgr/cephadm: add nvmeof configuration fields
Gil Bregman [Thu, 21 Mar 2024 09:06:52 +0000 (11:06 +0200)]
mgr/cephadm: add nvmeof configuration fields

Fixes: https://tracker.ceph.com/issues/64821
Signed-off-by: Gil Bregman <gbregman@il.ibm.com>
(cherry picked from commit a16ac81c43be884f2dd7fc8b0566be5aa35b7ace)

Conflicts:
src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2
src/pybind/mgr/cephadm/tests/test_services.py

14 months agopython-common/ceph/deployment: add nvmeof configuration fields
Gil Bregman [Thu, 21 Mar 2024 09:07:54 +0000 (11:07 +0200)]
python-common/ceph/deployment: add nvmeof configuration fields

Fixes: https://tracker.ceph.com/issues/64821
Signed-off-by: Gil Bregman <gbregman@il.ibm.com>
(cherry picked from commit 86a592730b09ab2cfaf4100907366050c932f30a)

14 months agoMerge pull request #57072 from zdover23/wip-doc-2024-04-24-backport-57051-to-squid
Anthony D'Atri [Wed, 24 Apr 2024 13:19:24 +0000 (09:19 -0400)]
Merge pull request #57072 from zdover23/wip-doc-2024-04-24-backport-57051-to-squid

squid: doc/rados: remove dual-stack docs

14 months agodoc/rados: remove dual-stack docs 57072/head
Zac Dover [Tue, 23 Apr 2024 06:37:27 +0000 (16:37 +1000)]
doc/rados: remove dual-stack docs

Remove references to dual-stack mode in
doc/rados/configuration/network-config-ref.rst and
doc/rados/configuration/msgr2.rst. This feature seems to have been
planned but never to have been completely implemented.

See the tracker issue listed below for an email exchange detailing the
confusion caused by the presence in the documentation of this
now-removed information.

Fixes: https://tracker.ceph.com/issues/65631
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit c65d2056c27d75f91af44e004d8defe7ffbf5fc8)

14 months agoMerge pull request #57054 from rhcs-dashboard/wip-65255-squid
Nizamudeen A [Wed, 24 Apr 2024 06:54:26 +0000 (12:24 +0530)]
Merge pull request #57054 from rhcs-dashboard/wip-65255-squid

squid: mgr/dashboard: start using alertmanager v2

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
14 months agoMerge pull request #57047 from zdover23/wip-doc-2024-04-23-backport-57032-to-squid
Anthony D'Atri [Tue, 23 Apr 2024 14:02:49 +0000 (10:02 -0400)]
Merge pull request #57047 from zdover23/wip-doc-2024-04-23-backport-57032-to-squid

squid: doc/rados: fix outdated value for ms_bind_port_max

14 months agomgr/dashboard: start using alertmanager v2 57054/head
Nizamudeen A [Tue, 26 Sep 2023 16:08:51 +0000 (21:38 +0530)]
mgr/dashboard: start using alertmanager v2

I was looking into sorting the alerts and saw there is an api v2 for
alertmanager which also has an endpoint like `alerts/groups` which might
be something that is useful for us.

Refer: https://github.com/prometheus/alertmanager/blob/main/api/v2/openapi.yaml

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

 Conflicts:
src/pybind/mgr/dashboard/controllers/prometheus.py
  - don't add the endpoint apart from the get_alertgroup one

14 months agodoc/rados: fix outdated value for ms_bind_port_max 57047/head
Pierre Riteau [Mon, 22 Apr 2024 09:28:53 +0000 (11:28 +0200)]
doc/rados: fix outdated value for ms_bind_port_max

The highest port number used by OSD or MDS daemons was increased from
7300 to 7568 in [1] but the documentation still refers to 7300 in
multiple locations.

[1] https://github.com/ceph/ceph/pull/42210

Fixes: https://tracker.ceph.com/issues/65609
Signed-off-by: Pierre Riteau <pierre@stackhpc.com>
(cherry picked from commit 23d2740241af2118652fef6e7d6a286f338a18f2)

14 months agoMerge pull request #57039 from zdover23/wip-doc-2024-04-23-backport-57022-to-squid
Anthony D'Atri [Mon, 22 Apr 2024 20:38:57 +0000 (16:38 -0400)]
Merge pull request #57039 from zdover23/wip-doc-2024-04-23-backport-57022-to-squid

squid: doc/rados: remove redundant pg repair commands

14 months agoMerge pull request #56958 from cbodley/wip-64552-squid
Casey Bodley [Mon, 22 Apr 2024 17:31:37 +0000 (18:31 +0100)]
Merge pull request #56958 from cbodley/wip-64552-squid

squid: rgw/http/client-side: disable curl path normalization

Reviewed-by: Oguzhan Ozmen <oozmen@bloomberg.net>
Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
14 months agoMerge pull request #56960 from cbodley/wip-65353-squid
Casey Bodley [Mon, 22 Apr 2024 17:30:58 +0000 (18:30 +0100)]
Merge pull request #56960 from cbodley/wip-65353-squid

squid: rgwlc: check for no-bucket at bucket_lc_process() preamble

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
14 months agoMerge pull request #56959 from cbodley/wip-64496-squid
Casey Bodley [Mon, 22 Apr 2024 17:30:45 +0000 (18:30 +0100)]
Merge pull request #56959 from cbodley/wip-64496-squid

squid: rgw: invalidate and retry keystone admin token

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
14 months agodoc/rados: remove redundant pg repair commands 57039/head
Zac Dover [Mon, 22 Apr 2024 06:59:15 +0000 (16:59 +1000)]
doc/rados: remove redundant pg repair commands

Incorporate the material in /doc/rados/operations/pg-repair into
/doc/rados/troubleshooting/troubleshooting-pg. Remove
/doc/rados/operations/pg-repair from the documentation. Redirect all
links to the old location to the new location.

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

14 months agoMerge pull request #57026 from zdover23/wip-doc-2024-04-22-backport-57016-to-squid
Anthony D'Atri [Mon, 22 Apr 2024 14:19:41 +0000 (10:19 -0400)]
Merge pull request #57026 from zdover23/wip-doc-2024-04-22-backport-57016-to-squid

squid: doc/rados: add bucket rename command

14 months agoMerge pull request #57023 from zdover23/wip-doc-2024-04-22-backport-56962-to-squid
Anthony D'Atri [Mon, 22 Apr 2024 14:08:17 +0000 (10:08 -0400)]
Merge pull request #57023 from zdover23/wip-doc-2024-04-22-backport-56962-to-squid

squid: doc/radosgw: use 'confval' directive for reshard config options

14 months agodoc/rados: add bucket rename command 57026/head
Zac Dover [Sun, 21 Apr 2024 12:46:18 +0000 (22:46 +1000)]
doc/rados: add bucket rename command

Add "ceph osd crush rename bucket" command. This commit is made in
response to a request from Michele Giacomoli.

Fixes: https://tracker.ceph.com/issues/65599
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 1030b572fa1680792b4c5843a6cf517bd31511ae)

14 months agodoc/radosgw: use 'confval' directive for reshard config options 57023/head
Casey Bodley [Wed, 17 Apr 2024 17:17:40 +0000 (13:17 -0400)]
doc/radosgw: use 'confval' directive for reshard config options

this will render the config options with their descriptions/defaults
taken directly from common/options/rgw.yaml.in

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

14 months agoMerge pull request #56999 from rhcs-dashboard/wip-65581-squid
Nizamudeen A [Mon, 22 Apr 2024 03:53:17 +0000 (09:23 +0530)]
Merge pull request #56999 from rhcs-dashboard/wip-65581-squid

squid: mgr/dashboard: pin xmlsec to 1.3.13

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: rishabh-d-dave <NOT@FOUND>
14 months agoMerge pull request #57017 from zdover23/wip-doc-2024-04-21-backport-56904-to-squid
Anthony D'Atri [Sun, 21 Apr 2024 14:56:27 +0000 (10:56 -0400)]
Merge pull request #57017 from zdover23/wip-doc-2024-04-21-backport-56904-to-squid

squid: doc/security: update CVE list

14 months agodoc/security: update CVE list 57017/head
Zac Dover [Mon, 15 Apr 2024 15:41:51 +0000 (01:41 +1000)]
doc/security: update CVE list

Update the list of CVEs in doc/security/cves.rst.

Co-authored-by: Ilya Dryomov <idryomov@redhat.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 8381259a46fbd04218946b67e73e140cb054e3d8)

14 months agoMerge pull request #57007 from zdover23/wip-doc-2024-04-20-backport-56996-to-squid
Anthony D'Atri [Fri, 19 Apr 2024 23:26:43 +0000 (19:26 -0400)]
Merge pull request #57007 from zdover23/wip-doc-2024-04-20-backport-56996-to-squid

squid: doc/dev: repair broken image

14 months agodoc/dev: repair broken image 57007/head
Zac Dover [Fri, 19 Apr 2024 03:22:33 +0000 (13:22 +1000)]
doc/dev: repair broken image

Replace the ".. graphviz" directive with an ".. image" directive that
correctly displays an image where previously an unusably zoomed-in image
appeared.

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

15 months agoMerge pull request #56992 from rosinL/wip-65577-squid
Rongqi Sun [Fri, 19 Apr 2024 09:08:14 +0000 (02:08 -0700)]
Merge pull request #56992 from rosinL/wip-65577-squid

squid: install-deps: save and restore user's XDG_CACHE_HOME

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 agoinstall-deps: save and restore user's XDG_CACHE_HOME 56992/head
luo rixin [Tue, 16 Apr 2024 07:18:06 +0000 (15:18 +0800)]
install-deps: save and restore user's XDG_CACHE_HOME

Since ccache 4.0, ccache use $XDG_CACHE_HOME/ccache to keep compile cache
if XDG_CACHE_HOME is set. In this case $XDG_CACHE_HOME is overwrite,
ccache will use $XDG_CACHE_HOME/ccache(ccache will create the dir if not exsit) to
store compile cache, but $XDG_CACHE_HOME will be removed next round running,
leading to ccache contests are always removed. So save and restore user's XDG_CACHE_HOME.

Fixes: https://tracker.ceph.com/issues/65175
Signed-off-by: luo rixin <luorixin@huawei.com>
(cherry picked from commit a17342147d4411211ecf646730987d2633dabb6e)

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 agorgwlc: check for no-bucket at bucket_lc_process() preamble 56960/head
Matt Benjamin [Wed, 27 Mar 2024 22:33:56 +0000 (18:33 -0400)]
rgwlc: check for no-bucket at bucket_lc_process() preamble

Avoids trivial segfault deferencing the bucket pointer.

Fixes: https://tracker.ceph.com/issues/65188
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit d5f6fe772f83d9e6b1ebaafdb1e8274041b0d684)

15 months agorgw: invalidate and retry keystone admin token 56959/head
Tobias Urdin [Thu, 18 Jan 2024 09:29:05 +0000 (09:29 +0000)]
rgw: invalidate and retry keystone admin token

We validate client tokens against the Keystone API by
sending our own "admin token" that is allowed to lookup
client tokens.

This "admin token" is cached and upon checking the cache
we verify the expiration on the token before using it but
we have no logic to invalidate the cache if the response
from the Keystone API says that the "admin token" is invalid.

Since we don't invalidate it and it still has not expired
it will stay in our cache and continue to cause Swift API
requests for clients to be dropped because of the invalid
admin token, until service is restarted, admin token is
expired (which it can already be) or until
the whole cache is dropped or TokenCache::invalidate()
called on the admin token.

There is probably multiple places in Keystone where it
invalidates tokens, but one example where the "admin token"
would be invalidated and return  HTTP 401 status code is if
the user that is configured in rgw_keystone_admin_user has
it's password changed (even if it's the same password as the
current one) then Keystone will invalidate it's cache and
invalidated existing tokens even if they have not expired yet.

Fixes: https://tracker.ceph.com/issues/64094
Signed-off-by: Tobias Urdin <tobias.urdin@binero.se>
(cherry picked from commit df23e4b2ea4f8647271a9ce541a1fdbc4d9fe4a6)

15 months agorgw/http/client-side: disable curl path normalization 56958/head
Oguzhan Ozmen [Tue, 13 Feb 2024 16:40:38 +0000 (11:40 -0500)]
rgw/http/client-side: disable curl path normalization

test_multi.py:test_object_sync is updated to reproduce the issue.
Without the fix, objects "." and ".." are not replicated and the test
fails (times out).

Fixes: https://tracker.ceph.com/issues/64366
Signed-off-by: Oguzhan Ozmen <oozmen@bloomberg.net>
(cherry picked from commit b4b1868a0047890ada2c8b39c3a932ae51255714)

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 agodoc/cephadm: document new --no-ceph-conf flag for `orch client-keyring set` 56899/head
Adam King [Thu, 4 Apr 2024 19:05:34 +0000 (15:05 -0400)]
doc/cephadm: document new --no-ceph-conf flag for `orch client-keyring set`

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

15 months agomgr/cephadm: make client-keyring deploying ceph.conf optional
Adam King [Thu, 4 Apr 2024 18:11:11 +0000 (14:11 -0400)]
mgr/cephadm: make client-keyring deploying ceph.conf optional

There are cases where users would like to manage their own
ceph.conf but still have cephadm deploy the client keyrings,
so this is being added to facilitate that.

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

15 months agomgr/cephadm: rename ceph_admin_key -> client_key in _calc_client_files
Adam King [Thu, 4 Apr 2024 16:28:45 +0000 (12:28 -0400)]
mgr/cephadm: rename ceph_admin_key -> client_key in _calc_client_files

I think this variable name is misleading, as we use this same
logic for all client-keyrings that can be setup, not just
the client.admin keyring

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

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)