]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/log
ceph.git
36 hours agoMerge pull request #65785 from NitzanMordhai/wip-71315-squid squid
SrinivasaBharathKanta [Tue, 6 Jan 2026 08:34:55 +0000 (14:04 +0530)]
Merge pull request #65785 from NitzanMordhai/wip-71315-squid

squid: memory lock issues causing hangs during connection shutdown

40 hours agoMerge pull request #66797 from bluikko/wip-doc-revert-64033-from-squid
bluikko [Tue, 6 Jan 2026 04:33:25 +0000 (11:33 +0700)]
Merge pull request #66797 from bluikko/wip-doc-revert-64033-from-squid

squid: Revert "doc: mgr/dashboard: add OAuth2 SSO documentation"

2 days agodoc: Revert "doc: mgr/dashboard: add OAuth2 SSO documentation" 66797/head
Ville Ojamo [Mon, 5 Jan 2026 13:46:26 +0000 (20:46 +0700)]
doc: Revert "doc: mgr/dashboard: add OAuth2 SSO documentation"

This reverts commit 2af5800f5a20ecc1fd592e024a8d03806ab67f89.

The dashboard OAuth2.0 feature was released in Tentacle.

Signed-off-by: Ville Ojamo <14869000+bluikko@users.noreply.github.com>
8 days agoMerge pull request #66739 from tchaikov/squid-backport-pr-66732
David Galloway [Mon, 29 Dec 2025 21:22:19 +0000 (16:22 -0500)]
Merge pull request #66739 from tchaikov/squid-backport-pr-66732

squid: debian/control: add iproute2 to build dependencies

9 days agoMerge pull request #66707 from tchaikov/squid-backport-pr-66700
David Galloway [Mon, 29 Dec 2025 21:20:05 +0000 (16:20 -0500)]
Merge pull request #66707 from tchaikov/squid-backport-pr-66700

squid: mgr/dashboard: update teuth_ref hash in api test

13 days agodebian/control: add iproute2 to build dependencies 66739/head
Kefu Chai [Wed, 24 Dec 2025 05:55:26 +0000 (13:55 +0800)]
debian/control: add iproute2 to build dependencies

Test scripts like qa/tasks/cephfs/mount.py expect the ip command to be
available in the container environment. Without it, tests fail with:

```
  /bin/bash: line 1: ip: command not found

  File "/ceph/qa/tasks/cephfs/mount.py", line 96, in cleanup_stale_netnses_and_bridge
    p = remote.run(args=['ip', 'netns', 'list'],
  ...
  teuthology.exceptions.CommandFailedError: Command failed with status 127: 'ip netns list'
```

Add iproute2 to the debian package build dependencies when the
<pkg.ceph.check> build profile is enabled. This ensures the package is
available during container-based builds, since buildcontainer-setup.sh
→ script/run-make.sh → install-deps.sh → debian/control → generated
dependency package chain respects build profiles configured via
`FOR_MAKE_CHECK` and `WITH_CRIMSON` environment variables set in
Dockerfile.build.

Signed-off-by: Kefu Chai <k.chai@proxmox.com>
(cherry picked from commit 599922aa582bbaa6fa8c8e274b780fabafb10a9b)

2 weeks agomgr/dashboard: update teuth_ref hash in api test 66707/head
Nizamudeen A [Fri, 19 Dec 2025 12:41:05 +0000 (18:11 +0530)]
mgr/dashboard: update teuth_ref hash in api test

update the hash to the latest commit where Kefu addressed the distutils
error.

Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 36fb920c5e88f7da24d0c7289d7e6bafd8b367d2)

2 weeks agoMerge pull request #66668 from ceph/apt-mirror-squid
David Galloway [Fri, 19 Dec 2025 03:51:25 +0000 (22:51 -0500)]
Merge pull request #66668 from ceph/apt-mirror-squid

squid: install-deps: Replace apt-mirror

2 weeks agoinstall-deps: Replace apt-mirror 66668/head
David Galloway [Tue, 16 Dec 2025 22:08:00 +0000 (17:08 -0500)]
install-deps: Replace apt-mirror

apt-mirror.front.sepia.ceph.com has happened to always work because we set up CNAMEs to gitbuilder.ceph.com.

That host is making its way to a new home upstate (literally and figuratively) so we'll get rid of the front subdomain since it's publicly accessible anyway and add TLS while we're at it.

Signed-off-by: David Galloway <david.galloway@ibm.com>
(cherry picked from commit 0b0c73ad860b20912c862b5376057153a5adab40)

3 weeks agoMerge pull request #66289 from henrichter/wip-73704-squid
Yuri Weinstein [Wed, 10 Dec 2025 22:51:16 +0000 (14:51 -0800)]
Merge pull request #66289 from henrichter/wip-73704-squid

squid: rgw: beast add ssl hot-reload

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 weeks agoMerge pull request #62055 from k0ste/wip-68956-squid
Dhairya Parmar [Wed, 10 Dec 2025 11:04:17 +0000 (16:34 +0530)]
Merge pull request #62055 from k0ste/wip-68956-squid

squid: mds: session in the importing state cannot be cleared if an export subtree task is interrupted while the state of importer is acking

4 weeks agoMerge pull request #64954 from batrick/wip-72515-squid
Dhairya Parmar [Wed, 10 Dec 2025 11:03:35 +0000 (16:33 +0530)]
Merge pull request #64954 from batrick/wip-72515-squid

squid: mds: skip charmap handler check for MDS requests

4 weeks agoMerge pull request #65449 from rishabh-d-dave/wip-70174-squid
Dhairya Parmar [Wed, 10 Dec 2025 11:02:57 +0000 (16:32 +0530)]
Merge pull request #65449 from rishabh-d-dave/wip-70174-squid

squid: qa/cephfs: ignore warning that pg is stuck peering for upgrade jobs

4 weeks agoMerge pull request #66471 from joscollin/wip-73879-squid
Dhairya Parmar [Wed, 10 Dec 2025 11:02:31 +0000 (16:32 +0530)]
Merge pull request #66471 from joscollin/wip-73879-squid

squid: cephfs: fix monclient not subscribed monmap/config

4 weeks agoMerge pull request #66472 from joscollin/wip-73872-squid
Dhairya Parmar [Wed, 10 Dec 2025 11:02:03 +0000 (16:32 +0530)]
Merge pull request #66472 from joscollin/wip-73872-squid

squid: cephfs: MDCache request cleanup

4 weeks agoMerge pull request #66473 from joscollin/wip-73870-squid
Dhairya Parmar [Wed, 10 Dec 2025 11:01:26 +0000 (16:31 +0530)]
Merge pull request #66473 from joscollin/wip-73870-squid

squid: client: account for mixed quotas in statfs

4 weeks agoMerge pull request #64747 from kshtsk/wip-72330-squid
kyr [Tue, 9 Dec 2025 15:03:47 +0000 (16:03 +0100)]
Merge pull request #64747 from kshtsk/wip-72330-squid

squid: qa/tasks/ceph_manager: population must be a sequence

5 weeks agoqa/cephfs: ignore warning that pg is stuck peering for upgrade jobs 65449/head
Rishabh Dave [Tue, 18 Feb 2025 12:30:03 +0000 (18:00 +0530)]
qa/cephfs: ignore warning that pg is stuck peering for upgrade jobs

Health warning "pg .* is stuck peering" is seen while Ceph cluster is
under the upgrade process during fs/upgrade QA job. Being an expected
warning, it should be added to the ignorelist.

And besides this one, we already ignore more severe warnings ("pg is
stuck inactive" and "pg is degrarded") for fs/upgrade jobs.

Fixes: https://tracker.ceph.com/issues/70023
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 9748de76e02254c6dc284dcc20ec5d5761760dcb)

Conflicts:
qa/cephfs/overrides/pg_health.yaml
- Line before the point where the patch was to be applied is different
  comapred to main branch.

5 weeks agotest: Add statfs test case for mixed quotas 66473/head
Christopher Hoffman [Fri, 10 Oct 2025 15:10:33 +0000 (15:10 +0000)]
test: Add statfs test case for mixed quotas

Signed-off-by: Christopher Hoffman <choffman@redhat.com>
(cherry picked from commit 2b057ec7bb40855e3be3cb0de12b63f8c10b450e)

5 weeks agoclient: account for mixed quotas in statfs
Christopher Hoffman [Fri, 10 Oct 2025 14:47:08 +0000 (14:47 +0000)]
client: account for mixed quotas in statfs

In statfs, when the quota root for a dir is discovered,
it uses that dir to base values for max_files and max_bytes.

This can be an issue when a dir is found with only one of two potential quota
fields. Take for instance, a dir with only max_files set and parent dir
has only max_bytes set. During a statfs call, it will then use the max_files
value for provided dir, but does not have a value for max_bytes. In this case,
this behavior will cause the size of the filesystem to be displayed.

Instead, find the quota root for max_files and max_bytes separately. This will
allow for mixed quotas to inherit missing values from its parent. In the above
example, max_files from current dir and max_bytes from parent dir will be
displayed.

Fixes: https://tracker.ceph.com/issues/73487
Signed-off-by: Christopher Hoffman <choffman@redhat.com>
(cherry picked from commit dd02ea9b18502b87ce815eba4286ae3516e334b3)

5 weeks agomds: MDCache: check validity of mdr requests before dispatching 66472/head
Abhishek Lekshmanan [Tue, 1 Apr 2025 10:07:56 +0000 (12:07 +0200)]
mds: MDCache: check validity of mdr requests before dispatching

Ignore null requests

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@cern.ch>
(cherry picked from commit 75cd8c074f37de2a492177c54b3ef1879ab87637)

5 weeks agomds: MDCache request cleanup handles potential null mdr
Abhishek Lekshmanan [Tue, 1 Apr 2025 10:04:09 +0000 (12:04 +0200)]
mds: MDCache request cleanup handles potential null mdr

In cases where there is a single element in a batch_op_map,new_batch_head
is a nullptr, when this is retried at Finisher we'd hit one of the asserts when
dereferencing

Fixes: https://tracker.ceph.com/issues/70769
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@cern.ch>
(cherry picked from commit e63f8cc54d03dbdd147cdd2c301adef119a640da)

5 weeks agocephfs: make sure mon authenticate before objecter start 66471/head
wangshaohui.0512 [Fri, 8 Aug 2025 10:23:47 +0000 (18:23 +0800)]
cephfs: make sure mon authenticate before objecter start

Signed-off-by: Shaohui Wang <wangshaohui.0512@bytedance.com>
(cherry picked from commit 1de46f335ea21c7369c67a021da79f3c7e929e66)

5 weeks agotests: add a test case for cephfs SingletonClient
wangshaohui.0512 [Fri, 8 Aug 2025 10:03:05 +0000 (18:03 +0800)]
tests: add a test case for cephfs SingletonClient

In SingletonClient::init(), objecter->start() called before
monc->authenticate(), it makes conns of monc authencated before
monc->authenticate() called if mons reply faster, in this case,
monc will not subsribe monmap/config.

Signed-off-by: Shaohui Wang <wangshaohui.0512@bytedance.com>
(cherry picked from commit 8cce3277edcb819e5e61a67948f35e5c5358379d)

 Conflicts:
src/test/client/CMakeLists.txt
    - syncio.cc and fscrypt_conf.cc not backported to squid

6 weeks agoMerge pull request #66357 from k0ste/wip-70542-squid
Igor Fedotov [Sat, 22 Nov 2025 15:22:21 +0000 (18:22 +0300)]
Merge pull request #66357 from k0ste/wip-70542-squid

squid: os/bluestore: Disable invoking unittest_deferred

Reviewed-by: Igor Fedotov <igor.fedotov@croit.io>
6 weeks agomds: skip charmap handler check for MDS requests 64954/head
Patrick Donnelly [Mon, 4 Aug 2025 19:43:18 +0000 (15:43 -0400)]
mds: skip charmap handler check for MDS requests

The MDS uses a rename request to move the primary link to a remote link. For
these requests, there will be no session.

Fixes: https://tracker.ceph.com/issues/72349
Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
(cherry picked from commit ca35c0de42861352bee4cfaeda6e83a7aa0bd094)

6 weeks agoqa: test for charmap handling on reintegration
Patrick Donnelly [Mon, 4 Aug 2025 19:48:38 +0000 (15:48 -0400)]
qa: test for charmap handling on reintegration

The MDS uses a rename request to move the primary link to a remote link. For
these requests, there will be no session.

Fixes: https://tracker.ceph.com/issues/72349
Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
(cherry picked from commit 5d983a46b010144b71f8c5d092d30a4942d8e6e7)

6 weeks agoos/bluestore: Disable invoking unittest_deferred 66357/head
Adam Kupczyk [Tue, 29 Oct 2024 08:08:31 +0000 (08:08 +0000)]
os/bluestore: Disable invoking unittest_deferred

There is no value in invoking unittest_deferred expect via
run_test_deferred.sh script.

Fixes: https://tracker.ceph.com/issues/68718
Signed-off-by: Adam Kupczyk <akupczyk@ibm.com>
(cherry picked from commit 163d8297bd566d25a6897f3b9be0d97f95c3c12b)

6 weeks agomds: client is evicted when an export subtree task is interrupted 62055/head
Zhansong Gao [Mon, 3 Jul 2023 09:18:14 +0000 (17:18 +0800)]
mds: client is evicted when an export subtree task is interrupted

The importer will force open some sessions provided by the exporter but the client does not know about
the new sessions until the exporter notifies it, and the notifications cannot be sent if the exporter
is interrupted. The client does not renew the sessions regularly that it does not know about, so the client
will be evicted by the importer after `session_autoclose` seconds (300 seconds by default).

The sessions that are forced opened in the importer need to be closed when the import process is reversed.

Signed-off-by: Zhansong Gao <zhsgao@hotmail.com>
(cherry picked from commit 00b0711188f34ef4ea5c31f39bc70cf1fafbd907)

6 weeks agoqa: add test for importer's unexpected client eviction after an export subtree task...
Zhansong Gao [Mon, 3 Jul 2023 08:42:34 +0000 (16:42 +0800)]
qa: add test for importer's unexpected client eviction after an export subtree task is interrupted

Signed-off-by: Zhansong Gao <zhsgao@hotmail.com>
(cherry picked from commit f23bd5d0995e4e52e0ac43c7e8a112cd2faf9f27)

6 weeks agomds: session in the importing state cannot be cleared if an export subtree task is...
Zhansong Gao [Fri, 26 May 2023 04:20:17 +0000 (12:20 +0800)]
mds: session in the importing state cannot be cleared if an export subtree task is interrupted while the state of importer is acking

The related sessions in the importer are in the importing state(`Session::is_importing` return true) when the state of importer is `acking`,
`Migrator::import_reverse` called by `MDCache::handle_resolve` should reverse the process to clear the importing state if the exporter restarts
at this time, but it doesn't do that actually because of its bug. And it will cause these sessions to not be cleared when the client is
unmounted(evicted or timeout) until the mds is restarted.

The bug in `import_reverse` is that it contains the code to handle state `IMPORT_ACKING` but it will never be executed because
the state is modified to `IMPORT_ABORTING` at the beginning. Move `stat.state = IMPORT_ABORTING` to the end of import_reverse
so that it can handle the state `IMPORT_ACKING`.

Fixes: https://tracker.ceph.com/issues/61459
Signed-off-by: Zhansong Gao <zhsgao@hotmail.com>
(cherry picked from commit 057c5b1610c11ad8cc6d0cde43bee1306228275b)

6 weeks agoqa: add test for importer's session cleanup after an export subtree task is interrupted
Zhansong Gao [Fri, 26 May 2023 04:58:42 +0000 (12:58 +0800)]
qa: add test for importer's session cleanup after an export subtree task is interrupted

Signed-off-by: Zhansong Gao <zhsgao@hotmail.com>
(cherry picked from commit eccaf85294ae80bb76b75f30d74957c6bf03745b)

6 weeks agomds: the assert should be before the journal entry submit otherwise it's racy
Zhansong Gao [Fri, 16 Jun 2023 04:30:40 +0000 (12:30 +0800)]
mds: the assert should be before the journal entry submit otherwise it's racy

Signed-off-by: Zhansong Gao <zhsgao@hotmail.com>
(cherry picked from commit 11a4303d66fa0355c890a478b33ccc90ee68f6d3)

6 weeks agomds: add `importing_count` to session dump
Zhansong Gao [Fri, 26 May 2023 04:25:10 +0000 (12:25 +0800)]
mds: add `importing_count` to session dump

Signed-off-by: Zhansong Gao <zhsgao@hotmail.com>
(cherry picked from commit 79a33025d506c9a90520633492285bc047ef31f5)

6 weeks agoMerge pull request #66003 from cbodley/wip-73598-squid
Casey Bodley [Thu, 20 Nov 2025 19:00:18 +0000 (14:00 -0500)]
Merge pull request #66003 from cbodley/wip-73598-squid

squid: rgw: fix 'bucket rm --bypass-gc' for copied objects

Reviewed-by: Krunal Chheda <kchheda3@bloomberg.net>
6 weeks agoMerge pull request #66152 from ivancich/wip-73747-squid
J. Eric Ivancich [Thu, 20 Nov 2025 16:52:01 +0000 (11:52 -0500)]
Merge pull request #66152 from ivancich/wip-73747-squid

squid: rgw: fix `radosgw-admin object unlink ...`

Reviewed-by: Krunal Chheda <kchheda3@bloomberg.net>
Reviewed-by: Jane Zhu <jzhu116@bloomberg.net>
6 weeks agorgw: fix 'bucket rm --bypass-gc' for copied objects 66003/head
Casey Bodley [Fri, 3 Oct 2025 16:24:18 +0000 (12:24 -0400)]
rgw: fix 'bucket rm --bypass-gc' for copied objects

the `--bypass-gc` argument to `radosgw-admin bucket rm` causes us to
call `RadosBucket::remove_bypass_gc()`, which loops over the tail
objects and removes each with `RGWRados::delete_raw_obj_aio()`

however, this was removing the objects with `cls_rgw_remove_obj()`,
which is for head objects, not tails. tail objects must be removed with
`cls_refcount_put()`, which preserves them until the last copy is
removed

rename `delete_raw_obj_aio()` to `delete_tail_obj_aio()` to clarify its
purpose

Fixes: https://tracker.ceph.com/issues/73348
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 1fba459071da9f7ec13defe2c666f0df8174c8da)

6 weeks agoMerge pull request #66104 from shraddhaag/wip-73694-squid
Shraddha Agrawal [Thu, 20 Nov 2025 12:27:57 +0000 (17:57 +0530)]
Merge pull request #66104 from shraddhaag/wip-73694-squid

squid: tasks/cbt_performance: Tolerate exceptions during performance data up…

6 weeks agotasks/cbt_performance: Tolerate exceptions during performance data updates 66104/head
Nitzan Mordechai [Wed, 22 Oct 2025 05:41:56 +0000 (05:41 +0000)]
tasks/cbt_performance: Tolerate exceptions during performance data updates

If an exception occurs during the POST request to update CBT performance,
log the error instead of failing the entire job. This ensures that
intermittent update failures do not block the main workflow.

Fixes: https://tracker.ceph.com/issues/68843
Signed-off-by: Nitzan Mordechai <nmordech@ibm.com>
(cherry picked from commit b47880f82de436776acab7ff13fb5e6496e49170)

6 weeks agoMerge pull request #66033 from thuvh/bug-kafka-expected-sizes
anrao19 [Thu, 20 Nov 2025 09:11:12 +0000 (14:41 +0530)]
Merge pull request #66033 from thuvh/bug-kafka-expected-sizes

squid: rgw-test: fix bug kafka unexpected keyword argument 'expected_sizes'

7 weeks agorgw: fix `radosgw-admin object unlink ...` 66152/head
J. Eric Ivancich [Tue, 4 Nov 2025 21:55:38 +0000 (16:55 -0500)]
rgw: fix `radosgw-admin object unlink ...`

The unlink subcommand did not handle unsharded bucket indices
appropriately. These are when the number of shards listed in the
bucket instance object is 0. In that case there will actually be 1
shard.

When number of shards as 0 is passed into the function that maps
object names to shards, it returns -1. And that was not handled
properly. That is now fixed.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 9eeb71e28526df8ce2b920d4f50763a734264416)

7 weeks agosquid: rgw-testing: fix unexpected keyword argument 'expected_sizes' for kafka test 66033/head
Hoai-Thu Vuong [Thu, 23 Oct 2025 03:47:50 +0000 (10:47 +0700)]
squid: rgw-testing: fix unexpected keyword argument 'expected_sizes' for kafka test

Signed-off-by: Hoai-Thu Vuong <thuvh87@gmail.com>
7 weeks agoMerge pull request #66242 from kshtsk/wip-73816-squid
J. Eric Ivancich [Tue, 18 Nov 2025 16:46:38 +0000 (11:46 -0500)]
Merge pull request #66242 from kshtsk/wip-73816-squid

squid: rgw: update keystone repo stable branch to 2024.2

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
7 weeks agoMerge pull request #66251 from kshtsk/wip-73582-squid
kyr [Tue, 18 Nov 2025 16:22:18 +0000 (17:22 +0100)]
Merge pull request #66251 from kshtsk/wip-73582-squid

squid: qa/tasks/workunit: fix no module named 'pipes'

7 weeks agoMerge pull request #65922 from guits/wip-73514-squid
Guillaume Abrioux [Tue, 18 Nov 2025 12:45:22 +0000 (13:45 +0100)]
Merge pull request #65922 from guits/wip-73514-squid

squid: ceph-volume: use udev data instead of LVM subprocess in get_devices()

7 weeks agodoc/radosgw: Fix frontends.rst typo 66287/head 66289/head
Anthony D'Atri [Mon, 3 Nov 2025 15:43:25 +0000 (10:43 -0500)]
doc/radosgw: Fix frontends.rst typo

Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
(cherry picked from commit 075f5afd4a7fafc333d0a70b977fbac446f51e44)

7 weeks agorgw/frontend: fix typo in function name
Yuval Lifshitz [Mon, 3 Nov 2025 08:42:48 +0000 (08:42 +0000)]
rgw/frontend: fix typo in function name

regression from: d8a3f3e2c5ae4d586fffdb12426c836b659c99cd

Signed-off-by: Yuval Lifshitz <ylifshit@ibm.com>
(cherry picked from commit 20743ee6896d7ca5b7186dfe1a29ee2da800963c)

7 weeks agorgw: asio/beast add ssl hot-reload
Henry Richter [Wed, 8 Oct 2025 23:00:34 +0000 (01:00 +0200)]
rgw: asio/beast add ssl hot-reload

Adds the `ssl_reload` config option to the beast frontend.
This sets an interval in seconds to periodically reload the ssl context to pick up changes without restarting. It can be disabled (default) be setting it to `0`.

Fixes: 65470
Signed-off-by: Henry Richter <henry.richter@cloudandheat.com>
(cherry picked from commit d8a3f3e2c5ae4d586fffdb12426c836b659c99cd)

Conflicts:
      src/rgw/rgw_asio_frontend.cc
- squid doesn't support graceful stop

7 weeks agoMerge pull request #64509 from NitzanMordhai/wip-72122-squidReviewed-by: Aishwarya...
Yuri Weinstein [Fri, 14 Nov 2025 16:26:44 +0000 (08:26 -0800)]
Merge pull request #64509 from NitzanMordhai/wip-72122-squidReviewed-by: Aishwarya Mathuria <amathuri@redhat.com>

squid: mon/OSDMonitor: call no_reply() on ignored osd alive

Reviewed-by: Aishwarya Mathuria <amathuri@redhat.com>
7 weeks agoqa/tasks/workunit: fix no module named 'pipes' 66251/head
Kyr Shatskyy [Fri, 10 Oct 2025 19:37:21 +0000 (21:37 +0200)]
qa/tasks/workunit: fix no module named 'pipes'

Python 3.13 finally dropped the 'pipes' module,
replacing it with shlex.

Fixes: https://tracker.ceph.com/issues/73498
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@clyso.com>
(cherry picked from commit da40484b9577aba21833e6b09c6129fe2d3c596c)

7 weeks agorgw: update keystone repo stable branch to 2024.2 66242/head
Kyr Shatskyy [Tue, 11 Nov 2025 12:55:39 +0000 (13:55 +0100)]
rgw: update keystone repo stable branch to 2024.2

The stable/2024.1 is gone from the github repo:

  https://github.com/openstack/keystone.git

Fixes: https://tracker.ceph.com/issues/73800
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@clyso.com>
(cherry picked from commit 998e4299af417221ac8102fe46c46967e88f0da4)

7 weeks agoMerge pull request #65584 from rzarzynski/wip-bug-72412-squid
Yuri Weinstein [Thu, 13 Nov 2025 18:14:01 +0000 (10:14 -0800)]
Merge pull request #65584 from rzarzynski/wip-bug-72412-squid

squid: osd: stop scrub_purged_snaps() from ignoring osd_beacon_report_interval

Reviewed-by: Prashant D <pdhange@redhat.com>
3 months agomsg/async: race condition between reset_recv_state and shutdown_connections 65785/head
Nitzan Mordechai [Tue, 10 Dec 2024 09:04:34 +0000 (09:04 +0000)]
msg/async: race condition between reset_recv_state and shutdown_connections

when shutting down monitors and valgrind is involved, we can,
sometimes, to hit race condition and locks that causing the shutdown
process to hang for a long time.

reset_recv_state - issuing a message without proper locks that
causing the shutdown to hang during shutdown connection (drain network)

Fixes: https://tracker.ceph.com/issues/63501
Signed-off-by: Nitzan Mordechai <nmordech@redhat.com>
(cherry picked from commit b800149243b593ff7946d9a5df23f5a49247c0fd)

3 months agorados/valgrind-leaks: add timeout value for stop command
Nitzan Mordechai [Wed, 4 Dec 2024 06:49:36 +0000 (06:49 +0000)]
rados/valgrind-leaks: add timeout value for stop command

increase the timeout before stop command failed. in case
of monitor running under valgrind, we sometimes failed beacuse
of timeout.

Fixes: https://tracker.ceph.com/issues/63501
Signed-off-by: Nitzan Mordechai <nmordech@redhat.com>
(cherry picked from commit 5668807051302e6080f637d92e0f25ef055e42a3)

3 months agoMerge pull request #64739 from VinayBhaskar-V/wip-72319-squid
Yuri Weinstein [Thu, 2 Oct 2025 17:27:31 +0000 (10:27 -0700)]
Merge pull request #64739 from VinayBhaskar-V/wip-72319-squid

squid: rbd-mirror: prevent image deletion if remote image is not primary

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
3 months agoMerge pull request #65665 from kchheda3/wip-73055-squid
Yuri Weinstein [Wed, 1 Oct 2025 18:31:45 +0000 (11:31 -0700)]
Merge pull request #65665 from kchheda3/wip-73055-squid

squid: rgw/account: bucket acls are not completely migrated once the user is migrated to an account

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 months agoMerge pull request #65709 from aaSharma14/wip-73293-squid
Aashish Sharma [Tue, 30 Sep 2025 05:15:24 +0000 (10:45 +0530)]
Merge pull request #65709 from aaSharma14/wip-73293-squid

squid: monitoring: fix MTU Mismatch alert rule and expr

Reviewed-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
3 months agoMerge pull request #65706 from rhcs-dashboard/wip-73274-squid
Pedro Gonzalez Gomez [Mon, 29 Sep 2025 11:52:15 +0000 (13:52 +0200)]
Merge pull request #65706 from rhcs-dashboard/wip-73274-squid

squid: mgr/dashboard: Blank entry for Storage Capacity in dashboard under Cluster > Expand Cluster > Review

Reviewed-by: Pedro Gonzalez Gomez <pegonzal@ibm.com>
3 months agomonitoring: fix MTU Mismatch alert rule and expr 65709/head
Aashish Sharma [Wed, 2 Jul 2025 11:05:14 +0000 (16:35 +0530)]
monitoring: fix MTU Mismatch alert rule and expr

Fixes: https://tracker.ceph.com/issues/73290
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit bee24dec441b9e6b263e4498c2ab333b0a60a52d)

Conflicts:
monitoring/ceph-mixin/prometheus_alerts.yml
monitoring/ceph-mixin/tests_alerts/test_alerts.yml
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.scss

3 months agomgr/dashboard: Blank entry for Storage Capacity in dashboard under Cluster > Expand... 65706/head
Naman Munet [Wed, 24 Sep 2025 07:23:40 +0000 (12:53 +0530)]
mgr/dashboard: Blank entry for Storage Capacity in dashboard under Cluster > Expand Cluster > Review

https://tracker.ceph.com/issues/73220

Signed-off-by: Naman Munet <naman.munet@ibm.com>
(cherry picked from commit a01909e7588c7ff757079475e3ea6f1dc3054db7)

3 months agoMerge pull request #64456 from cbodley/wip-72090-squid
Yuri Weinstein [Fri, 26 Sep 2025 16:08:49 +0000 (09:08 -0700)]
Merge pull request #64456 from cbodley/wip-72090-squid

squid: deb/mgr: remove deprecated distutils from ceph-mgr.requires

Reviewed-by: Nizamudeen A <nia@redhat.com>
3 months agoMerge pull request #65141 from mchangir/wip-70925-squid
Christopher Hoffman [Fri, 26 Sep 2025 16:07:55 +0000 (12:07 -0400)]
Merge pull request #65141 from mchangir/wip-70925-squid

squid: mds: fix heap-use-after-free in C_Flush_Journal

3 months agoMerge pull request #65620 from aaSharma14/wip-73167-squid
Aashish Sharma [Fri, 26 Sep 2025 14:07:55 +0000 (19:37 +0530)]
Merge pull request #65620 from aaSharma14/wip-73167-squid

squid: mgr/dashboard: fix zone update API forcing STANDARD storage class

Reviewed-by: Afreen Misbah <afreen@ibm.com>
3 months agoMerge pull request #65671 from aaSharma14/wip-73231-squid
Aashish Sharma [Fri, 26 Sep 2025 05:11:59 +0000 (10:41 +0530)]
Merge pull request #65671 from aaSharma14/wip-73231-squid

squid: monitoring: fix "In" OSDs in Cluster-Advanced grafana panel. Also change units from decbytes to bytes wherever used in the panel

Reviewed-by: Afreen Misbah <afreen@ibm.com>
3 months agomonitoring/ceph_mixin: fix Cluster - Advanced OSD grafana panel 65671/head
Aashish Sharma [Wed, 17 Sep 2025 06:58:16 +0000 (12:28 +0530)]
monitoring/ceph_mixin: fix Cluster - Advanced OSD grafana panel

1. Fixes the promql expr used to calculate "In" OSDs in
   ceph-cluster-advanced.json.
2. Fixes the color coding for the single state panels used in the OSDs
   grafana panel like "In", "Out" etc

Fixes: https://tracker.ceph.com/issues/72810
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit 53a6856d603e0fe4ff31f76e19263a80359a9f1d)

3 months agoMerge pull request #65659 from ceph/wip-squid-noble
David Galloway [Wed, 24 Sep 2025 19:35:22 +0000 (15:35 -0400)]
Merge pull request #65659 from ceph/wip-squid-noble

squid: cmake: remove _FORTIFY_SOURCE define

3 months agoMerge pull request #64605 from cbodley/wip-72190-squid
Yuri Weinstein [Wed, 24 Sep 2025 18:42:50 +0000 (11:42 -0700)]
Merge pull request #64605 from cbodley/wip-72190-squid

squid: deb/cephadm: add explicit --home for cephadm user

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 months agorgw/account: bucket acls are not completely migrated once the user is migrated to... 65665/head
kchheda3 [Wed, 3 Sep 2025 14:48:42 +0000 (10:48 -0400)]
rgw/account: bucket acls are not completely migrated once the user is migrated to an account

Signed-off-by: kchheda3 <kchheda3@bloomberg.net>
(cherry picked from commit 23dc3697cfd309b4d8736ec99490cd57db621cf7)

3 months agocmake: remove _FORTIFY_SOURCE define 65659/head
Casey Bodley [Wed, 3 Sep 2025 17:22:30 +0000 (13:22 -0400)]
cmake: remove _FORTIFY_SOURCE define

according to `dpkg-buildflags`, ubuntu 24 raised this value to
`-D_FORTIFY_SOURCE=3` which causes `error: "_FORTIFY_SOURCE" redefined`
compilation failures because Ceph itself adds `-D_FORTIFY_SOURCE=2`

`_FORTIFY_SOURCE` is a hardening option. both our rpm and debian builds
already specify that via environment variables, so Ceph's cmake should
leave it alone

Fixes: https://tracker.ceph.com/issues/72361
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 66bec97b0dc90b91f5be586351f52082beb6374a)

3 months agoMerge pull request #61166 from anoopcs9/wip-69306-squid
Rishabh Dave [Wed, 24 Sep 2025 13:42:42 +0000 (19:12 +0530)]
Merge pull request #61166 from anoopcs9/wip-69306-squid

squid: client: Handle empty pathnames for `ceph_chownat()` and `ceph_statxat()`

Reviewed-by: Rishabh Dave <ridave@redhat.com>
3 months agoMerge pull request #65636 from adk3798/squid-cephadm-pin-cheroot
Adam King [Tue, 23 Sep 2025 21:10:40 +0000 (17:10 -0400)]
Merge pull request #65636 from adk3798/squid-cephadm-pin-cheroot

squid: pybind/mgr: pin cheroot version in requirements-required.txt

Reviewed-by: John Mulligan <jmulligan@redhat.com>
3 months agoMerge pull request #65588 from adamemerson/wip-perfcounters-unique-string-squid
Yuri Weinstein [Tue, 23 Sep 2025 19:12:58 +0000 (12:12 -0700)]
Merge pull request #65588 from adamemerson/wip-perfcounters-unique-string-squid

squid: common: Allow PerfCounters to return a provided service ID

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 months agoMerge pull request #65556 from jzhu116-bloomberg/wip-72972-squid
Yuri Weinstein [Tue, 23 Sep 2025 19:12:09 +0000 (12:12 -0700)]
Merge pull request #65556 from jzhu116-bloomberg/wip-72972-squid

squid: rgw: discard olh_ attributes when copying object from a versioning-suspended bucket to a versioning-disabled bucket

Reviewed-by: Adam Emerson <aemerson@redhat.com>
3 months agomgr/dashboard: bump cheroot to > 10.0 65636/head
Nizamudeen A [Fri, 19 Apr 2024 08:07:11 +0000 (13:37 +0530)]
mgr/dashboard: bump cheroot to > 10.0

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

3 months agoclient: Gracefully handle empty pathname for statxat() 61166/head
Anoop C S [Mon, 23 Sep 2024 07:06:55 +0000 (12:36 +0530)]
client: Gracefully handle empty pathname for statxat()

man statx(2)[1] says the following:
. . .
AT_EMPTY_PATH
    If pathname is an empty string, operate on the file referred to by
    dirfd (which may have been obtained using the open(2) O_PATH flag).
    In this case, dirfd can refer to any type of file, not just a
    directory.

    If dirfd is AT_FDCWD, the call operates on the current working
    directory.
. . .

Look out for an empty pathname and use the relative fd's inode in the
presence of AT_EMPTY_PATH flag before calling internal _getattr().

Fixes: https://tracker.ceph.com/issues/68189
Review with: git show -w

[1] https://www.man7.org/linux/man-pages/man2/statx.2.html

Signed-off-by: Anoop C S <anoopcs@cryptolab.net>
(cherry picked from commit edd7fe76c4919bc243377c6d7aae20b0606b89c3)

Conflicts:
        src/client/Client.cc
- path_walk() refactor from https://github.com/ceph/ceph/pull/62095
  included the required core changes.

3 months agolibcephfs.h: Fix API documentation for ceph_statxat
Anoop C S [Thu, 17 Oct 2024 16:15:17 +0000 (21:45 +0530)]
libcephfs.h: Fix API documentation for ceph_statxat

flags parameter for ceph_statxat() API is supposed to accept only
AT_STATX_DONT_SYNC and AT_SYMLINK_NOFOLLOW. Modify the corresponding
documentation to reflect the acceptance of above two flags.

Signed-off-by: Anoop C S <anoopcs@cryptolab.net>
(cherry picked from commit 92c5ab99b8dcaae56e4a92cfe72a7e3d343b8a0c)

3 months agoclient: Gracefully handle empty pathname for chownat()
Anoop C S [Fri, 20 Sep 2024 08:49:01 +0000 (14:19 +0530)]
client: Gracefully handle empty pathname for chownat()

man fchownat(2)[1] says the following:
. . .
AT_EMPTY_PATH (since Linux 2.6.39)
    If pathname is an empty string, operate on the file referred to by
    dirfd (which may have been obtained using the open(2) O_PATH flag).
    In this case, dirfd can refer to any type of file, not just a
    directory. If dirfd is AT_FDCWD, the call operates on the current
    working directory.
. . .

Look out for an empty pathname and use the relative fd's inode in the
presence of AT_EMPTY_PATH flag before calling internal _setattr().

Fixes: https://tracker.ceph.com/issues/68189
Review with: git show -w

[1] https://www.man7.org/linux/man-pages/man2/fchownat.2.html

Signed-off-by: Anoop C S <anoopcs@cryptolab.net>
(cherry picked from commit 829f38899226fcd1f603ba446b018f53c5b0921d)

Conflicts:
        src/client/Client.cc
- path_walk() refactor from https://github.com/ceph/ceph/pull/62095
  included the required core changes.

3 months agoMerge pull request #65639 from zdover23/wip-doc-2025-09-23-squid-remove-cloud-restore-rst
Casey Bodley [Tue, 23 Sep 2025 13:24:28 +0000 (09:24 -0400)]
Merge pull request #65639 from zdover23/wip-doc-2025-09-23-squid-remove-cloud-restore-rst

squid: doc/radosgw: remove cloud-restore from squid

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 months agoMerge pull request #61451 from anoopcs9/wip-69556-squid
Rishabh Dave [Tue, 23 Sep 2025 12:10:57 +0000 (17:40 +0530)]
Merge pull request #61451 from anoopcs9/wip-69556-squid

squid: mds: Fix invalid access of mdr->dn[0].back()

Reviewed-by: Rishabh Dave <ridave@redhat.com>
3 months agoMerge pull request #62391 from neesingh-rh/wip-70416-squid
Rishabh Dave [Tue, 23 Sep 2025 12:10:47 +0000 (17:40 +0530)]
Merge pull request #62391 from neesingh-rh/wip-70416-squid

squid: cephfs-shell: add option to remove xattr

Reviewed-by: Rishabh Dave <ridave@redhat.com>
3 months agoMerge pull request #64652 from rishabh-d-dave/wip-72200-squid
Rishabh Dave [Tue, 23 Sep 2025 12:10:35 +0000 (17:40 +0530)]
Merge pull request #64652 from rishabh-d-dave/wip-72200-squid

squid: mgr/vol: keep and show clone source info

Reviewed-by: Rishabh Dave <ridave@redhat.com>
3 months agoMerge pull request #65279 from joscollin/wip-67809-squid
Rishabh Dave [Tue, 23 Sep 2025 12:10:25 +0000 (17:40 +0530)]
Merge pull request #65279 from joscollin/wip-67809-squid

squid: mds: add more debug logs and log events

Reviewed-by: Rishabh Dave <ridave@redhat.com>
3 months agoMerge pull request #65280 from joscollin/wip-69369-squid
Rishabh Dave [Tue, 23 Sep 2025 12:09:50 +0000 (17:39 +0530)]
Merge pull request #65280 from joscollin/wip-69369-squid

squid: qa: use a larger timeout for kernel_untar_build workunit

Reviewed-by: Rishabh Dave <ridave@redhat.com>
3 months agotest/rbd-mirror: eliminate a race in ResyncRequestedRemoteNotPrimary 64739/head
VinayBhaskar-V [Wed, 30 Jul 2025 10:10:27 +0000 (10:10 +0000)]
test/rbd-mirror: eliminate a race in ResyncRequestedRemoteNotPrimary

Adjust the wait_for_notification call in TestMockImageReplayerSnapshotReplayer.ResyncRequestedRemoteNotPrimary
to expect 2 notifications instead of 1. This allows the test to correctly wait for both expected events
i.e for finish_sync() and handle_replay_complete(locker, -EREMOTEIO, "remote image demoted"), ensuring the
replayer transitions to STATE_COMPLETE and is_replaying() returns false as intended.

Fixes: https://tracker.ceph.com/issues/72325
Signed-off-by: VinayBhaskar-V <vvarada@redhat.com>
(cherry picked from commit b5a013f6170bb4445da8f5469243e4869b760a81)

3 months agorbd-mirror: prevent image deletion if remote image is not primary
VinayBhaskar-V [Tue, 13 May 2025 20:25:44 +0000 (01:55 +0530)]
rbd-mirror: prevent image deletion if remote image is not primary

A resync on a mirrored image may incorrectly results in the local
image being deleted even when the remote image is no longer primary.
This issue can occur under the following conditions:
* if  resync is requested on the secondary before the remote image has
  been fully demoted
* if the demotion of the primary image is not mirrored
  due to the rbd-mirror daemon being offline.

This can be fixed by ensuring that image deletion during a resync is
only allowed when the remote image is confirmed to be primary.

This commit fixes the issue only for snapshot based mirroring mode

Fixes: https://tracker.ceph.com/issues/70948
Signed-off-by: VinayBhaskar-V <vvarada@redhat.com>
(cherry picked from commit e14afbc95a5fb8f5a33e7ea23a035992b966d671)

3 months agoMerge pull request #63019 from batrick/wip-71094-squid
Jos Collin [Tue, 23 Sep 2025 03:09:30 +0000 (08:39 +0530)]
Merge pull request #63019 from batrick/wip-71094-squid

squid: mds: check for snapshots on parent snaprealms

Reviewed-by: Jos Collin <jcollin@redhat.com>
3 months agoMerge pull request #62499 from batrick/wip-70663-squid
Jos Collin [Tue, 23 Sep 2025 02:43:42 +0000 (08:13 +0530)]
Merge pull request #62499 from batrick/wip-70663-squid

squid:  client: ll_walk will process absolute paths as relative

Reviewed-by: Jos Collin <jcollin@redhat.com>
3 months agoMerge pull request #65629 from phlogistonjohn/jjm-s-65514
David Galloway [Tue, 23 Sep 2025 02:27:19 +0000 (19:27 -0700)]
Merge pull request #65629 from phlogistonjohn/jjm-s-65514

squid: build-with-container: add argument groups to organize options

3 months agodoc/radosgw: remove cloud-restore from squid 65639/head
Zac Dover [Tue, 23 Sep 2025 02:09:52 +0000 (12:09 +1000)]
doc/radosgw: remove cloud-restore from squid

Remove doc/radosgw/cloud-restore.rst from the Squid branch.

cloud-restore does not appear in index.rst, so its removal from
index.rst is unnecessary.

Signed-off-by: Zac Dover <zac.dover@proton.me>
3 months agoMerge pull request #64090 from vshankar/wip-cephfs-client-fixes-squid
Jos Collin [Tue, 23 Sep 2025 02:06:52 +0000 (07:36 +0530)]
Merge pull request #64090 from vshankar/wip-cephfs-client-fixes-squid

squid: client: cephfs user-space client fixes

Reviewed-by: Jos Collin <jcollin@redhat.com>
3 months agopybind/mgr: pin cheroot version in requirements-required.txt
Adam King [Mon, 22 Sep 2025 21:05:07 +0000 (17:05 -0400)]
pybind/mgr: pin cheroot version in requirements-required.txt

With python 3.10 (didn't seem to happen with python 3.12) the
pybind/mgr/cephadm/tests/test_node_proxy.py test times out.
This appears to be related to a new release of the cheroot
package and a github issues describing the same problem
we're seeing has been opened by another user
https://github.com/cherrypy/cheroot/issues/769

It is worth noting that the workaround described in that
issue does also work for us. If you add

```
import cheroot
cheroot.server.HTTPServer._serve_unservicable = lambda: None
```

after the existing imports in test_node_proxy.py the
test hanging issue also disappears. Also worth noting the
particular pin of

cheroot~=10.0

was chosen as it matches the existing pin being used
in pybind/mgr/dashboard/constraints.txt

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

3 months agoMerge pull request #61274 from kotreshhr/wip-68940-squid
Jos Collin [Tue, 23 Sep 2025 01:41:10 +0000 (07:11 +0530)]
Merge pull request #61274 from kotreshhr/wip-68940-squid

squid: ceph-fuse: Improve fuse mount usage message

Reviewed-by: Jos Collin <jcollin@redhat.com>
3 months agoMerge pull request #62517 from salieri11/wip-70631-squid
Jos Collin [Tue, 23 Sep 2025 01:36:49 +0000 (07:06 +0530)]
Merge pull request #62517 from salieri11/wip-70631-squid

squid: mds: add MDS asok command for dumping stray directories

Reviewed-by: Jos Collin <jcollin@redhat.com>
3 months agoMerge pull request #65133 from chrisphoffman/wip-72645-squid
Jos Collin [Tue, 23 Sep 2025 01:28:13 +0000 (06:58 +0530)]
Merge pull request #65133 from chrisphoffman/wip-72645-squid

squid: client: use path supplied in statfs

Reviewed-by: Jos Collin <jcollin@redhat.com>
3 months agobuild-with-container: add argument groups to organize options 65629/head
John Mulligan [Fri, 12 Sep 2025 17:52:25 +0000 (13:52 -0400)]
build-with-container: add argument groups to organize options

Use the argparse add_argument_group feature to organize the mass of
arguments into more sensible categories. Hopefully, someone reading
over the `--help` output can now more easily see options that
are useful rather than being overwhelmed by a wall of text.

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

3 months agomgr/dashboard: fix zone update API forcing STANDARD storage class 65620/head
Aashish Sharma [Thu, 18 Sep 2025 10:59:52 +0000 (16:29 +0530)]
mgr/dashboard: fix zone update API forcing STANDARD storage class

The zone update REST API (`edit_zone`) always attempted to configure a
placement target for the `STANDARD` storage class, even when the request
was intended for a different storage class name.
This caused failures in deployments where `STANDARD` is not defined.

Changes:
Club add placement target and add storage class methods into one single
add_placement_targets_storage_class_zone method which takes the storage
class as a param as well alongside the rest of the placement params.

Fixes: https://tracker.ceph.com/issues/73105
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit 135f3adb4973be493925839e946e7a5fc75e7d5c)

3 months agomgr/vol: move reusable parts from async_cloner 64652/head
Rishabh Dave [Wed, 14 Feb 2024 09:52:47 +0000 (15:22 +0530)]
mgr/vol: move reusable parts from async_cloner

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 8c536f78907fe1d42e1df612604d5872019b501d)

Conflicts:
src/pybind/mgr/volumes/fs/async_cloner.py
src/pybind/mgr/volumes/fs/operations/versions/subvolume_v1.py
- commit 8c536f78907f was missing which led to conflict.

3 months agorgw: Record the `service_unique_id`, if present, in the SrviceMap 65588/head
Adam C. Emerson [Mon, 8 Sep 2025 18:19:20 +0000 (14:19 -0400)]
rgw: Record the `service_unique_id`, if present, in the SrviceMap

For consistency and ease associating the two.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 3a94a7b2ed02d20b2bc839b283e60cf4778f69e4)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
3 months agocommon: Allow PerfCounters to return a provided service ID
Adam C. Emerson [Fri, 5 Sep 2025 15:31:40 +0000 (11:31 -0400)]
common: Allow PerfCounters to return a provided service ID

Dashboard has asked for a unique identifier that can be associated
with services. This commit provides a component of that
functionality. Enforcing uniqueness is beyond the scope of this PR and
is the responsibility of cluster setup and orchestration. The scope of
uniqueness is a matter of policy and up to the design of cluster setup
and orchestration software.

We provide the `--service_unique_id` argument that can be passed on
the command line when executing a Ceph service that uses
`global_init`. If non-empty, a `service_unique_id` section is added to
the PerfCounters dump for that service. This section has a single
entry whose name is set to the argument of `service_unique_id` and
whose value is arbitrary. If unspecified or empty, no
`service_unique_id` section is added.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 6dc322421f7a3758251fe29e3f35934231358011)
Conflicts:
src/common/options/global.yaml.in
 - Preceding options not in Squid

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
3 months agoMerge pull request #65219 from cbodley/wip-72715-squid
Yuri Weinstein [Thu, 18 Sep 2025 15:20:45 +0000 (08:20 -0700)]
Merge pull request #65219 from cbodley/wip-72715-squid

squid: rgw/s3: remove 'aws-chunked' from Content-Encoding response

Reviewed-by: Adam Emerson <aemerson@redhat.com>