]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/log
ceph-ci.git
3 days agoMerge PR #59647 into wip-jcollin-testing-20251001.024604-squid wip-jcollin-testing-20251001.024604-squid testing/wip-jcollin-testing-20251001.024604-squid
Jos Collin [Wed, 1 Oct 2025 02:46:34 +0000 (08:16 +0530)]
Merge PR #59647 into wip-jcollin-testing-20251001.024604-squid

* refs/pull/59647/head:
qa: test fetching foreign config item
mgr/snap_schedule: correctly fetch mds_max_snaps_per_dir from mds

3 days agoMerge PR #62052 into wip-jcollin-testing-20251001.024604-squid
Jos Collin [Wed, 1 Oct 2025 02:46:30 +0000 (08:16 +0530)]
Merge PR #62052 into wip-jcollin-testing-20251001.024604-squid

* refs/pull/62052/head:
mon,cephfs: small improvement for health warning methods
qa/cephfs: test that failing a FS is possible when other MDS/FS has...
qa/cephfs: allow detecting MDS ID from FS object for method the..
mon,cephfs: don't disallow "fs fail" when other FS/MDS has health...
cephfs,mon: rename variable to a better name
mon,cephfs: fix indentation level for a code block
qa/cephfs: test that a MDS can be failed when other FS/MDS has a...
qa/cephfs: allow passing MDS ID to method that generate...
mon,cephfs: check MDS ID before aborting "mds fail" command

3 days agoMerge PR #62433 into wip-jcollin-testing-20251001.024604-squid
Jos Collin [Wed, 1 Oct 2025 02:46:24 +0000 (08:16 +0530)]
Merge PR #62433 into wip-jcollin-testing-20251001.024604-squid

* refs/pull/62433/head:
PendingReleaseNote: add note for pause_purging and pause_cloninig
doc/cephfs: add note for config option pause_purging and pause_cloning
qa/cephfs: add tests for mgr/vol config pause_cloning
qa/cephfs: extend wait for trash empty
qa/cephfs: add tests for config option pause_purging
qa/cephfs: don't strip any whitespace for get_shell_stdout
mgr/vol: add pause/resume mechanism for async jobs

3 days agoMerge PR #62918 into wip-jcollin-testing-20251001.024604-squid
Jos Collin [Wed, 1 Oct 2025 02:46:19 +0000 (08:16 +0530)]
Merge PR #62918 into wip-jcollin-testing-20251001.024604-squid

* refs/pull/62918/head:
release note: add a note for "snapshot getpath" command
doc/cephfs: add doc for "snapshot getpath" cmd
qa/cephfs: add tests for "subvolume snapshot getpath" cmd
mgr/vol: add command to get snapshot path

Reviewed-by: Anthony D Atri <anthony.datri@gmail.com>
3 days agoMerge PR #65289 into wip-jcollin-testing-20251001.024604-squid
Jos Collin [Wed, 1 Oct 2025 02:46:13 +0000 (08:16 +0530)]
Merge PR #65289 into wip-jcollin-testing-20251001.024604-squid

* refs/pull/65289/head:
client: check if inode ref is dir before proceeding with lookup
client: do not open dir for a non-dir inode
qa: test unmount hang using high/low level APIs

3 days 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>
4 days 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>
4 days agomonitoring: fix MTU Mismatch alert rule and expr
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

4 days agomgr/dashboard: Blank entry for Storage Capacity in dashboard under Cluster > Expand...
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)

7 days 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>
7 days 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

7 days 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>
7 days 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>
8 days agorelease note: add a note for "snapshot getpath" command
Rishabh Dave [Mon, 7 Apr 2025 14:39:44 +0000 (20:09 +0530)]
release note: add a note for "snapshot getpath" command

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

8 days agodoc/cephfs: add doc for "snapshot getpath" cmd
Rishabh Dave [Mon, 7 Apr 2025 14:36:33 +0000 (20:06 +0530)]
doc/cephfs: add doc for "snapshot getpath" cmd

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

8 days agoqa/cephfs: add tests for "subvolume snapshot getpath" cmd
Rishabh Dave [Mon, 7 Apr 2025 14:14:57 +0000 (19:44 +0530)]
qa/cephfs: add tests for "subvolume snapshot getpath" cmd

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

8 days agomgr/vol: add command to get snapshot path
Rishabh Dave [Wed, 2 Apr 2025 15:25:32 +0000 (20:55 +0530)]
mgr/vol: add command to get snapshot path

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

Conflicts:
src/pybind/mgr/volumes/fs/volume.py
- Line where the original patch makes the change is slightly different
  in main compared to Squid branch, leading to conflict.

8 days agomonitoring/ceph_mixin: fix Cluster - Advanced OSD grafana panel
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)

9 days 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

9 days 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>
9 days agocmake: remove _FORTIFY_SOURCE define
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)

9 days 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>
10 days 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>
10 days 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>
10 days 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>
10 days agoclient: check if inode ref is dir before proceeding with lookup
Dhairya Parmar [Tue, 8 Apr 2025 13:53:48 +0000 (19:23 +0530)]
client: check if inode ref is dir before proceeding with lookup

Lookup on non-dir inode is incorrect. Client::_lookup did check for it
but the order needed to be correct i.e. check for non-dir inode before
anything.

Fixes: https://tracker.ceph.com/issues/70553
Signed-off-by: Dhairya Parmar <dparmar@redhat.com>
(cherry picked from commit aa6ffa5159f6c9e14000a7501a394b1185b63078)

10 days agoclient: do not open dir for a non-dir inode
Dhairya Parmar [Tue, 8 Apr 2025 13:52:05 +0000 (19:22 +0530)]
client: do not open dir for a non-dir inode

adds an extra ref to the root which leads to ref leaks:
2025-03-26T15:37:55.162+0530 7fadb8d41640  1 client.4293 dump_inode: DISCONNECTED inode 0x1 #0x1 ref 2 0x1.head(faked_ino=0 nref=2 ll_ref=0 cap_refs={1024=0} open={} mode=41777 size=0/0 nlink=1 btime=2025-03-26T15:37:39.967146+0530 mtime=2025-03-26T15:37:45.113229+0530 ctime=2025-03-26T15:37:45.136266+0530 change_attr=3 caps=pAsLsXs(0=pAsLsXs) COMPLETE has_dir_layout 0x7fad78006970)

which leads to:
2025-03-26T15:37:55.162+0530 7fadb8d41640  2 client.4293 cache still has 1+1 items, waiting (for caps to release?)

Fixes: https://tracker.ceph.com/issues/70553
Signed-off-by: Dhairya Parmar <dparmar@redhat.com>
(cherry picked from commit 23b6b435835a095ceb10de92c3153ec1351d259c)

10 days agoqa: test unmount hang using high/low level APIs
Dhairya Parmar [Tue, 25 Mar 2025 11:19:09 +0000 (16:49 +0530)]
qa: test unmount hang using high/low level APIs

Fixes: https://tracker.ceph.com/issues/70553
Signed-off-by: Dhairya Parmar <dparmar@redhat.com>
(cherry picked from commit cbf1c5bb39b146f2457fe9c30c91122bcc7d442f)

10 days agomgr/dashboard: bump cheroot to > 10.0
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)

10 days agoclient: Gracefully handle empty pathname for statxat()
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.

10 days 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)

10 days 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.

10 days 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>
10 days 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>
10 days 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>
10 days 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>
10 days 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>
10 days 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>
11 days 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>
11 days 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>
11 days 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

11 days agodoc/radosgw: remove cloud-restore from squid
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>
11 days 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>
11 days 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)

11 days 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>
11 days 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>
11 days 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>
11 days agobuild-with-container: add argument groups to organize options
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)

11 days agomgr/dashboard: fix zone update API forcing STANDARD storage class
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)

2 weeks agomgr/vol: move reusable parts from async_cloner
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.

2 weeks agorgw: Record the `service_unique_id`, if present, in the SrviceMap
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>
2 weeks 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>
2 weeks 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>
2 weeks agoMerge pull request #62051 from k0ste/wip-65923-squid
Yuri Weinstein [Thu, 18 Sep 2025 15:19:59 +0000 (08:19 -0700)]
Merge pull request #62051 from k0ste/wip-65923-squid

squid: CephContext: acquire _fork_watchers_lock in notify_post_fork()

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2 weeks agoMerge pull request #63720 from batrick/wip-71554-squid
Christopher Hoffman [Wed, 17 Sep 2025 15:17:39 +0000 (11:17 -0400)]
Merge pull request #63720 from batrick/wip-71554-squid

squid: test/libcephfs: copy DT_NEEDED entries from input libraries

2 weeks agoMerge pull request #64936 from pritha-srivastava/wip-72464-squid
anrao19 [Wed, 17 Sep 2025 05:22:12 +0000 (10:52 +0530)]
Merge pull request #64936 from pritha-srivastava/wip-72464-squid

squid: rgw: check all JWKS for STS

2 weeks agorgw: discard olh_ attributes when copying object from a versioning-suspended bucket...
Jane Zhu [Wed, 20 Aug 2025 18:38:23 +0000 (18:38 +0000)]
rgw: discard olh_ attributes when copying object from a versioning-suspended bucket to a versioning-disabled bucket

Signed-off-by: Jane Zhu <jzhu116@bloomberg.net>
(cherry picked from commit 3fed58f43c3cb3977130926a2d1bca551deefade)

2 weeks agoMerge pull request #65550 from stackhpc/doc-balancer-squid
Anthony D'Atri [Tue, 16 Sep 2025 20:48:05 +0000 (15:48 -0500)]
Merge pull request #65550 from stackhpc/doc-balancer-squid

squid: doc: Fixes a typo in balancer operations

2 weeks agodoc: Fixes a typo in balancer operations
Tyler Brekke [Tue, 24 Jun 2025 19:12:33 +0000 (12:12 -0700)]
doc: Fixes a typo in balancer operations

Signed-off-by: Tyler Brekke <tbrekke@digitalocean.com>
(cherry picked from commit b038b8093d01a5e676ffa419607489a79261ef29)

2 weeks agoMerge pull request #65486 from tobias-urdin/squid-rgw-admin-bucket-pagination
Adam Emerson [Tue, 16 Sep 2025 19:32:01 +0000 (15:32 -0400)]
Merge pull request #65486 from tobias-urdin/squid-rgw-admin-bucket-pagination

squid: rgw/admin: Add max-entries and marker to bucket list

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
2 weeks agoMerge pull request #59922 from mchangir/wip-68077-squid
Milind Changire [Mon, 15 Sep 2025 07:08:33 +0000 (12:38 +0530)]
Merge pull request #59922 from mchangir/wip-68077-squid

squid: qa: relocate subvol creation overrides and test

2 weeks agoMerge pull request #61857 from batrick/wip-69956-squid
Milind Changire [Mon, 15 Sep 2025 07:02:56 +0000 (12:32 +0530)]
Merge pull request #61857 from batrick/wip-69956-squid

squid: mds: do not schedule quiesce for non-head imported inodes

2 weeks agoMerge pull request #64539 from batrick/wip-72163-squid
Milind Changire [Mon, 15 Sep 2025 07:01:59 +0000 (12:31 +0530)]
Merge pull request #64539 from batrick/wip-72163-squid

squid:  mds: nudge log for unstable locks after early reply

2 weeks agoMerge pull request #65492 from rhcs-dashboard/wip-72987-squid
afreen23 [Mon, 15 Sep 2025 07:01:44 +0000 (12:31 +0530)]
Merge pull request #65492 from rhcs-dashboard/wip-72987-squid

squid: mgr/dashboard : Fixed mirrored image usage info bar

Reviewed-by: Afreen Misbah <afreen@ibm.com>
2 weeks agoMerge pull request #65162 from joscollin/wip-72154-squid
Milind Changire [Mon, 15 Sep 2025 07:01:03 +0000 (12:31 +0530)]
Merge pull request #65162 from joscollin/wip-72154-squid

squid: mds: dump export_ephemeral_random_pin as double

3 weeks agomgr/dashboard : Fixed mirrored image usage info bar
Abhishek Desai [Thu, 7 Aug 2025 07:50:38 +0000 (13:20 +0530)]
mgr/dashboard : Fixed mirrored image usage info bar
fixes : https://tracker.ceph.com/issues/72431

Signed-off-by: Abhishek Desai <abhishek.desai1@ibm.com>
(cherry picked from commit 3a192b7c38e3f1669f3deee31702ba802d7411fd)

3 weeks agoradosgw-admin: Pass max_entries for bucket list
Tobias Urdin [Thu, 24 Jul 2025 21:42:46 +0000 (23:42 +0200)]
radosgw-admin: Pass max_entries for bucket list

The changes in [1] did not take into account that
radosgw-admin code calls `RGWBucketAdminOp::info`
directly and passes a `RGWBucketAdminOpState`
struct where max_entries is not initialized so
we should not assume that it's zero.

This in turn broke the `bucket list --uid foo` and
`bucket stats --uid foo` commands as the output was
changed and thus not keeping backward compatibility.

This change makes sure that we populate max_entries
in `RGWBucketAdminOpState` if `--max-entries` argument
was specified otherwise we set it to zero to keep the
backward compatibility in the output format.

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

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

3 weeks agorgw/qa: Move admin pagination tests
Tobias Urdin [Mon, 5 May 2025 15:20:31 +0000 (17:20 +0200)]
rgw/qa: Move admin pagination tests

Move the tests into qa directory and add it to the
rgw/verify suite so that we can run it in teuthology.

Signed-off-by: Tobias Urdin <tobias.urdin@binero.com>
(cherry picked from commit 57cbc9b6599be1e84c5bc209936080c4a04bb891)

3 weeks agorgw/doc: Add doc for admin bucket list pagination
Tobias Urdin [Fri, 11 Apr 2025 08:37:45 +0000 (10:37 +0200)]
rgw/doc: Add doc for admin bucket list pagination

This adds the documentation for the admin bucket list
pagination change.

Signed-off-by: Tobias Urdin <tobias.urdin@binero.com>
(cherry picked from commit 7fa025e08a21b03ce91556ffb936b9f26ffdc00f)

3 weeks agorgw/admin: Add max-entries and marker to bucket list
Tobias Urdin [Fri, 11 Apr 2025 08:13:57 +0000 (10:13 +0200)]
rgw/admin: Add max-entries and marker to bucket list

This adds pagination to the /admin/bucket endpoint for the
Admin API.

If a user has a lot of buckets the /admin/bucket endpoint
that is listing buckets can be so long that the HTTP request
gets a timeout.

This adds the ``max-entries`` and ``marker`` query parameters
to the API to support pagination. If ``max-entries`` is given
we introduce a new format for the HTTP response body the same
way that metadata API does, if it's not given we return the
response with the same body as before and thus retaining the
backward compatibility of the API.

This adds a Python3 based test suite that tests all of this
functionality to verify the behaviour and the HTTP response
body itself.

This fixes the pagination mentioned in tracker [1] and thus
fixes (or atleast partially fixes) that.

[1] https://tracker.ceph.com/issues/22168

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

3 weeks agoMerge pull request #65475 from rhcs-dashboard/wip-72965-squid
Nizamudeen A [Thu, 11 Sep 2025 06:17:41 +0000 (11:47 +0530)]
Merge pull request #65475 from rhcs-dashboard/wip-72965-squid

squid: monitoring: add user-agent headers to the urllib

3 weeks agomonitoring: add user-agent headers to the urllib
Nizamudeen A [Wed, 10 Sep 2025 13:00:36 +0000 (18:30 +0530)]
monitoring: add user-agent headers to the urllib

The documentation started raising 403 suddenly. Adding User-Agent
headers to the request

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

3 weeks agoMerge pull request #64741 from cbodley/wip-71544-squid
Adam Emerson [Tue, 9 Sep 2025 21:45:29 +0000 (17:45 -0400)]
Merge pull request #64741 from cbodley/wip-71544-squid

squid: rgw/lc: stop using merge_and_store_attrs in remove_bucket_config

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
3 weeks agoMerge pull request #65302 from guits/wip-72781-squid
Guillaume Abrioux [Tue, 9 Sep 2025 12:52:08 +0000 (14:52 +0200)]
Merge pull request #65302 from guits/wip-72781-squid

squid: ceph-volume: drop udevadm subprocess calls

4 weeks agoMerge pull request #65417 from ceph/fix-api-tests-squid
David Galloway [Fri, 5 Sep 2025 22:14:37 +0000 (18:14 -0400)]
Merge pull request #65417 from ceph/fix-api-tests-squid

squid: pybind/mgr/dashboard: Use teuthology's actual requirements

4 weeks agopybind/mgr/dashboard: Use teuthology's actual requirements
David Galloway [Fri, 5 Sep 2025 17:58:43 +0000 (13:58 -0400)]
pybind/mgr/dashboard: Use teuthology's actual requirements

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

4 weeks agoMerge pull request #65244 from ceph/wip-yuriw-squid-p2p-squid
Yuri Weinstein [Fri, 5 Sep 2025 15:19:44 +0000 (08:19 -0700)]
Merge pull request #65244 from ceph/wip-yuriw-squid-p2p-squid

qa/tests: added 19.2.3 to the mix

Reviewed-by: Laura Flores <lflores@redhat.com>
4 weeks agoMerge pull request #65379 from zdover23/wip-doc-2025-09-04-backport-65325-to-squid
Zac Dover [Thu, 4 Sep 2025 03:51:52 +0000 (13:51 +1000)]
Merge pull request #65379 from zdover23/wip-doc-2025-09-04-backport-65325-to-squid

squid: doc/cephfs: edit troubleshooting.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
4 weeks agodoc/cephfs: edit troubleshooting.rst
Zac Dover [Tue, 2 Sep 2025 00:31:41 +0000 (10:31 +1000)]
doc/cephfs: edit troubleshooting.rst

Update the "Disconnected+Remounted FS" section in
doc/cephfs/troubleshooting.rst, as suggested by Venky Shankar in https://github.com/ceph/ceph/pull/65129/files#r2312903062

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

4 weeks agoMerge pull request #65202 from zdover23/wip-doc-2025-08-25-backport-65185-to-squid
Zac Dover [Mon, 1 Sep 2025 04:29:25 +0000 (14:29 +1000)]
Merge pull request #65202 from zdover23/wip-doc-2025-08-25-backport-65185-to-squid

squid: doc/cephfs: edit troubleshooting.rst (Slow MDS)

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
4 weeks agoMerge pull request #65206 from zdover23/wip-doc-2025-08-26-backport-64074-to-squid
Zac Dover [Mon, 1 Sep 2025 04:28:54 +0000 (14:28 +1000)]
Merge pull request #65206 from zdover23/wip-doc-2025-08-26-backport-64074-to-squid

squid: doc/rados/configuration: Mention show-with-defaults and ceph-conf

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
4 weeks agoMerge pull request #65211 from zdover23/wip-doc-2025-08-26-backport-65180-to-squid
Zac Dover [Mon, 1 Sep 2025 04:28:20 +0000 (14:28 +1000)]
Merge pull request #65211 from zdover23/wip-doc-2025-08-26-backport-65180-to-squid

squid: doc/dev:update blkin.rst doc for lttng trace

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
4 weeks agoMerge pull request #65238 from zdover23/wip-doc-2025-08-26-backport-65230-to-squid
Zac Dover [Mon, 1 Sep 2025 04:27:46 +0000 (14:27 +1000)]
Merge pull request #65238 from zdover23/wip-doc-2025-08-26-backport-65230-to-squid

squid: doc/rados/operations: Improve health-checks.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
4 weeks agoMerge pull request #65311 from zdover23/wip-doc-2025-08-30-backport-8ff129c89-to...
Zac Dover [Mon, 1 Sep 2025 04:27:09 +0000 (14:27 +1000)]
Merge pull request #65311 from zdover23/wip-doc-2025-08-30-backport-8ff129c89-to-squid

squid: doc/dev/crimson: Update docs

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
5 weeks agodoc/dev/crimson: Update docs
Matan Breizman [Wed, 13 Aug 2025 08:11:30 +0000 (08:11 +0000)]
doc/dev/crimson: Update docs

* CPU allocation missed some information and was confusing.
* Drop alienized term when possible
* introdice release/debug builds

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 8ff129c89ffcd4831dcd9d8b8f0d49687cc57183)

5 weeks agoMerge pull request #63130 from kshtsk/wip-71208-squid
Venky Shankar [Fri, 29 Aug 2025 14:07:04 +0000 (19:37 +0530)]
Merge pull request #63130 from kshtsk/wip-71208-squid

squid: qa/tasks/cephfs/mount: use 'ip route' instead 'route'

Reviewed-by: Igor Fedotov <igor.fedotov@croit.io>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 weeks agoceph-volume: drop udevadm subprocess calls
Guillaume Abrioux [Thu, 14 Aug 2025 11:43:40 +0000 (11:43 +0000)]
ceph-volume: drop udevadm subprocess calls

Calling udevadm via subprocess can cause processes to pile up
under heavy load on production clusters.
This commit switches to reading udev data directly from /run/udev/data,
which is mounted as tmpfs.

Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit 727e69db73ef39d51bdd45515536e59d3acff19e)

5 weeks agoqa: use a larger timeout for kernel_untar_build workunit
Venky Shankar [Wed, 6 Nov 2024 10:05:44 +0000 (10:05 +0000)]
qa: use a larger timeout for kernel_untar_build workunit

Fixes: http://tracker.ceph.com/issues/68855
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit b65d7492af0c0e31f5bf891554b7608fa4c9f395)

5 weeks agomds: add the event when creating the batch head
Xiubo Li [Wed, 31 Jul 2024 02:14:59 +0000 (10:14 +0800)]
mds: add the event when creating the batch head

This could help us the debug the slow request or deadlock bugs and
we could know which stage the request has been in.

Fixes: https://tracker.ceph.com/issues/67280
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 7e08760a0e560759fa73e7b889494bdb60a03ff3)

5 weeks agomds: print the path depth to help debug mds issue
Xiubo Li [Wed, 31 Jul 2024 02:48:01 +0000 (10:48 +0800)]
mds: print the path depth to help debug mds issue

From the path depth we can get more useful info, such as whether
the path_traverse() acquired any locks, etc.

Fixes: https://tracker.ceph.com/issues/67280
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 5d8aa5245cb7e5d819651898533130e463b373fe)

5 weeks agodoc/cephfs: edit troubleshooting.rst (Slow MDS)
Zac Dover [Fri, 22 Aug 2025 08:39:29 +0000 (18:39 +1000)]
doc/cephfs: edit troubleshooting.rst (Slow MDS)

Move the "Slow requests (MDS)" section immediately after the first
section in this document ("Slow/Stuck Operations"), because the first
procedure on the page directs the reader to undertake the operation in
"Slow requests (MDS)" before trying anything else.

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

5 weeks agoMerge pull request #65183 from zdover23/wip-doc-2025-08-22-backport-64726-to-squid
Zac Dover [Wed, 27 Aug 2025 19:56:48 +0000 (05:56 +1000)]
Merge pull request #65183 from zdover23/wip-doc-2025-08-22-backport-64726-to-squid

squid: doc/man/8: Improve mount.ceph.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
5 weeks agoMerge pull request #65137 from zdover23/wip-doc-2025-08-20-backport-65128-to-squid
Zac Dover [Wed, 27 Aug 2025 19:56:26 +0000 (05:56 +1000)]
Merge pull request #65137 from zdover23/wip-doc-2025-08-20-backport-65128-to-squid

squid: doc/rados: repair short underline

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
5 weeks agoMerge pull request #65249 from ceph/squid-pipelineee-backports
David Galloway [Wed, 27 Aug 2025 18:10:07 +0000 (14:10 -0400)]
Merge pull request #65249 from ceph/squid-pipelineee-backports

squid: Recent pipeline backports

5 weeks agoMerge pull request #64668 from cbodley/wip-72255-squid
Casey Bodley [Wed, 27 Aug 2025 17:21:34 +0000 (13:21 -0400)]
Merge pull request #64668 from cbodley/wip-72255-squid

squid: qa/rgw: remove hadoop-s3a subsuite

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
5 weeks agoMerge pull request #65242 from afreen23/wip-72734-squid
afreen23 [Wed, 27 Aug 2025 15:04:31 +0000 (20:34 +0530)]
Merge pull request #65242 from afreen23/wip-72734-squid

squid: mgr/dashboard: Dashboard nfs export editor rejects ipv6 addresses

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
5 weeks agomgr/dashboard: Dashboard nfs export editor rejects ipv6 addresses
Afreen Misbah [Thu, 21 Aug 2025 09:41:43 +0000 (15:11 +0530)]
mgr/dashboard: Dashboard nfs export editor rejects ipv6 addresses

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

Signed-off-by: Afreen Misbah <afreen@ibm.com>
(cherry picked from commit 6c9a5536f3459cb3e676e240730eb5f7c45352ff)

 Conflicts:
        src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form-client/nfs-form-client.component.html

5 weeks agoMerge pull request #64842 from NitzanMordhai/wip-72418-squid
NitzanMordhai [Wed, 27 Aug 2025 09:16:59 +0000 (12:16 +0300)]
Merge pull request #64842 from NitzanMordhai/wip-72418-squid

squid: monitor: Enhance historic ops command output and error handling

5 weeks agoRemove git clean -fdx
Dan Mick [Tue, 26 Aug 2025 00:45:21 +0000 (17:45 -0700)]
Remove git clean -fdx

either
1) a source tarball is supplied, in which case the local dir is
   irrelevant, or
2) make-debs calls make-dist, which doesn't care about a dirty cwd

so it just punishes the unaware by removing things that they may
have wanted to keep.

Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit ad529cce49c466daa02bb3b90804ff6a6ec548e8)

5 weeks agomake-debs.sh: invoke tar with --no-same-owner
Dan Mick [Sat, 23 Aug 2025 00:43:24 +0000 (17:43 -0700)]
make-debs.sh: invoke tar with --no-same-owner

When running as a normal user, tar does not attempt to preserve
owners set on the tar content files.  When running as root, it does.
Containerized builds are running as root.  Stop make-debs.sh from
trying to set other owners for files, and leaving files in the
host system with mapped UIDs other than the user running the container
(which causes jenkins to be unable to clear the workspace).

Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit 46c540444dd0dc4b4572e71ef452436a3b580d51)