Merge branch 'wip-fix-object-sync-trace' of https://github.com/smanjara/ceph into wip-anrao2-testing-2025-09-18-1558

Merge branch 'vault-cleanup' of https://github.com/clwluvw/ceph into wip-anrao2-testing-2025-09-18-1558

Merge pull request #65565 from salieri11/igolikov-bug-73053

mds: remove unused enum values for subvolume metrics

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #65394 from athanatos/sjust/wip-seastore-cleanups-2025-08

seastore: misc cleanups, coroutine conversions

Reviewed-by: Matan Breizman <mbreizma@redhat.com>

Merge pull request #65399 from anthonyeleven/improve-global-yml

src/common/options: Improve global.yaml.in

Merge pull request #65372 from adamemerson/wip-70916-bis

test/neorados: Catch timeouts in Watch/Poll test

Merge pull request #65532 from phlogistonjohn/jjm-jenk-hint

github: add a note reminding to use one command per comment

Merge pull request #65553 from ceph/pr-checklist-fix

.github/workflows/pr-checklist.yml: Update

test/.../test_cbjournal: destroy CircularBoundedJournal instance prior to reactor shutdown

Signed-off-by: Samuel Just <sjust@redhat.com>

crimson/.../circular_bounded_journal: inline do_submit_record into submit_record

Signed-off-by: Samuel Just <sjust@redhat.com>

crimson/.../circular_bounded_journal: add journal submission metrics

Signed-off-by: Samuel Just <sjust@redhat.com>

crimson/.../circular_bounded_journal: convert do_submit_record to coroutine

Signed-off-by: Samuel Just <sjust@redhat.com>

crimson/.../circular_bounded_journal: convert submit_record to coroutine

Signed-off-by: Samuel Just <sjust@redhat.com>

crimson/.../transaction_manager: convert do_submit_transaction to coroutine

Signed-off-by: Samuel Just <sjust@redhat.com>

crimson/.../extent_placement_manager: convert BackgroundProcess::run() to coroutine

Signed-off-by: Samuel Just <sjust@redhat.com>

Merge pull request #64978 from athanatos/sjust/wip-mclock-cleanup

mclock: avoid using config keys for profiles, remove MonClient from MclockConfig

Reviewed-by: Matan Breizman <mbreizma@redhat.com>
Reviewed-by: Mohit Agrawal <moagrawa@redhat.com>
Reviewed-by: Sridhar Seshasayee <sseshasa@redhat.com>

Merge PR #65516 into main

* refs/pull/65516/head:
common: remove unused attribute

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

Merge pull request #65559 from nbalacha/wip-nbalacha-cleanup-1

rgw/bucket-logging: minor code cleanup

mds: remove unused enum values for subvolume metrics

Signed-off-by: Igor Golikov <igolikov@redhat.com>
Fixes: https://tracker.ceph.com/issues/73053

Merge pull request #63089 from smanjara/wip-fix-object-lock-rule

rgw/multisite: sync put-object-lock-configuration

Merge pull request #64428 from sungjoon-koh/add-wildcard-support-cond-read

rgw: add wildcard "*" support for conditional read

rgw/bucket-logging: minor code cleanup

Fixes a typo in a variable name and the placement
of a comment.

Signed-off-by: N Balachandran <nithya.balachandran@ibm.com>

Merge pull request #65481 from rhcs-dashboard/snapshot-schdule-interval

mgr/dashboard: fix missing schedule interval in rbd API

.github/workflows/pr-checklist.yml: Update

This newer version of the action does not fail mysteriously if a contributer
removes the example Jenkins commands from the end of the PR description.

Signed-off-by: Zack Cerza <zack@cerza.org>

Merge pull request #62469 from igomon-bloomberg/wip-timestamp-ver-epoch

rgw: implements timestamp-based epochs for versioned objects

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #64917 from aainscow/ec_fixpack3_pr

EC fixpack 3

rgw/multisite: reset RGW_ATTR_OBJ_REPLICATION_TRACE during object attr changes.

otherwise, if a zone receives request for any s3 object api requests like PutObjectAcl, PutObjectTagging etc. and this zone
was originally the source zone for the object put request, then such subsequent sync ops will fail. this is because the
zone id was added to the replication trace to ensure that we don't sync the object back to it.
for example in a put/delete race during full sync(https://tracker.ceph.com/issues/58911)
so, if the same zone ever becomes the destination for subsequent sync requests on the same object, we compare this zone as
the destination zone against the zone entries in replication trace and because it's entry is already present in the trace,
the sync operation returns -ERR_NOT_MODIFIED.

Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>

Merge pull request #65370 from kchheda3/wip-fixed-acl-account-migration

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

Reviewed-by: Casey Bodley <cbodley@redhat.com>

rgw: implement timestamp-based epochs.

Signed-off-by: Igor Gomon <igomon@bloomberg.net>

Merge pull request #65536 from bluikko/doc-services-mon-improvements-cephadm

doc/cephadm: Fix errors and improvements in services/monitoring.rst

Merge pull request #65498 from adamemerson/wip-rgw-weekly-baseline-prio-subset

qa: Run fewer RGW jobs at higher priority every week

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>

Merge pull request #65530 from rkachach/fix_issue_73025

doc: fixing starting release of mgmt-gateway/oauth2-proxy services

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

Merge pull request #64771 from Matan-B/wip-matanb-crimson-seastore-coro

crimson/os/seastore/segment_manager: Check segments prior to mkfs

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #64970 from edwinzrodriguez/ceph-wip-72479

crush/mapper: Mark pushed variable as maybe unused

rgw: drop unused keysel attrs for non testing encryptions

Signed-off-by: Seena Fallah <seenafallah@gmail.com>

rgw: send one x-vault-token on vault requests

Signed-off-by: Seena Fallah <seenafallah@gmail.com>

rgw: expect vault returns key detail on key creation

Vault will return the key detail on creation. no need to log an error
for that.

Signed-off-by: Seena Fallah <seenafallah@gmail.com>

Merge pull request #65227 from tchaikov/wip-generate-brace-init

src: replace push_back(T{}) with emplace_back()

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>

doc/cephadm: Fix errors and small improvements in services/monitoring.rst

Add that certmgr is new in version Tentacle.

Fix broken links with formatting rendered as text.

Capitalize consistently in text HTTP, YAML, URL, Alertmanager, Grafana,
centralized logging; Prometheus or use inline preformat with lower case
when referring to the module name.

Use inline preformat consistently for CLI commands within text
paragraphs.

Use title case in section titles.

Trim section title underline syntax.

Use consistently pre-formatted blocks bash prompt, YAML.

Start all block formatting paragraphs at the left margin instead of
indenting.

Signed-off-by: Ville Ojamo <14869000+bluikko@users.noreply.github.com>

doc: github: add a note reminding to use one command per comment

When I started using ceph I also thought it would be natural to issue >1
command per comment, but it doesn't work. I saw someone else doing it
recently and thought it would be good to have this reminder in the PR
template.

Signed-off-by: John Mulligan <jmulligan@redhat.com>

src/common/options: Improve global.yaml.in

Improve and correct option descriptions. Filestore options are marked deprecated to stress that Filestore should no longer be used.

Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>

Merge pull request #65514 from phlogistonjohn/jjm-bwc-arg-grouping

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

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>

doc: fixing starting release of mgmt-gateway/oauth2-proxy services

Fixes: https://tracker.ceph.com/issues/73025
Signed-off-by: Redouane Kachach <rkachach@ibm.com>

Merge pull request #65456 from yuvalif/wip-yuval-72940

rgw/logging: rollover objects when conf changes

Merge pull request #65521 from shraddhaag/wip-shraddhaag-availability-release-notes

doc: update data availability release notes

Merge pull request #64728 from rhcs-dashboard/wip-aashish-log-promtail-main

mgr/dashboard: Migrate from promtail to grafana alloy

Reviewed-by: Adam King <adking@redhat.com>

Merge pull request #65170 from rhcs-dashboard/tiering-tracker-72569

[mgr/dashboard]: Mismatch in the object size observed in Advance section in Tiering.

Reviewed-by: Naman Munet <nmunet@redhat.com>
Reviewed-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>

crimson/os/seastore/segment_manager: Check segments prior to mkfs

Verify Segment count for prior to mkfs
* ExtentPlacementManager::init - dynamic_max_rewrite_generation segments
* SegmentedJournal segment (1)

Fixes: https://tracker.ceph.com/issues/72484
Signed-off-by: Matan Breizman <mbreizma@redhat.com>

crimson/os/seastore: BlockSegmentManager::primary_mkfs coroutines

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

common/options/crimson.yaml.in: add hot_tier_generations minimum

See ExtentPlacementManager::init

dynamic_max_rewrite_generation = hot_tier_generations - 1;
ceph_assert(dynamic_max_rewrite_generation > MIN_REWRITE_GENERATION);

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

crimson/os/seastore/epm: Add logs and comments

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

crimson/tools/store_bench: update example, switch to --debug

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

crimson/os/seastore: Remove error on expected logic

In read_meta we should not use ERROR when the key is not found
as this is expected.
Same in _mkfs, if mkfs_done exists we shouldn't use ERROR.
This can be confusing when debugging is disabled and few ERROR log
lines are printed.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

crimson/os/seastore: add logs around mkfs

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

crimson/os/seastore: SeaStore::mkfs() into coroutines

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

crimson/os/seastore: prepare_meta() into coroutines

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

crimson/os/seastore: test_mkfs() into coroutines

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

Merge pull request #65494 from yuvalif/wip-yuval-72543

rgw/logging: add error message when log_record fails

doc: update data availability release notes

Signed-off-by: Shraddha Agrawal <shraddhaag@ibm.com>

Merge pull request #65388 from jamiepryde/main-choose-pdw-over-rmw

osd: Choose PDW over traditional RMW if number of reads required is equal

Merge pull request #65181 from qiuxinyidian/lttng

rados/lttng: add lttng open *tp.so error message

Merge pull request #65172 from shraddhaag/wip-shraddhaag-availability-frequency-config

mon: add config option to change availability score update interval

Merge PR #65499 into main

* refs/pull/65499/head:
script/redmine-upkeep: reset merge state after PR change

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

common: remove unused attribute

This resolves an obnoxious compiler warning:

    [79/768] Building CXX object src/mgr/CMakeFiles/ceph-mgr.dir/__/ceph_mgr.cc.o
    In file included from /run/host/home/sepian/ceph/src/global/global_init.h:23,
                     from /run/host/home/sepian/ceph/src/ceph_mgr.cc:27:
    /run/host/home/sepian/ceph/src/common/ceph_context.h:153:42: warning: ‘maybe_unused’ attribute ignored [-Wattributes]
      153 |   [[maybe_unused]] std::unique_ptr<char> _ex_handler;
          |                                          ^~~~~~~~~~~

Fixes: 39af0bc23b3ae2063f8e846b0ff522bafa0f5c27
Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>

Merge pull request #65350 from adamemerson/wip-perfcounters-unique-string

common: Allow PerfCounters to return a provided service ID

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>

Merge pull request #65507 from MaxKellermann/log__includes

log: add missing includes

Reviewed-by: Casey Bodley <cbodley@redhat.com>

crush/mapper: Mark 'pushed' variable as maybe unused to suppress compiler warnings

Mark 'pushed' variable as maybe_unused

Fixes: https://tracker.ceph.com/issues/72479
Signed-off-by: Edwin Rodriguez <edwin.rodriguez1@ibm.com>

Merge pull request #64829 from aclamk/aclamk-jenkins-fix-make-check

common/ceph_context.h: reserve space for breakpad in CephContext

log: add missing includes

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

Merge pull request #64271 from benhanokh/full_dedup

rgw/dedup: Tech preview of full dedup support which means duplicate objects will be removed

Reviewed-by: Yuval Lifshitz <ylifshit@ibm.com>

Merge pull request #64341 from mertsunacoglu/wip-swift-conditional-write

fix: Swift API conditional write if_match, if_none_match

mgr/dashboard: Migrate from promtail to grafana alloy

Since promtail is now deprecated, we need to start using grafana alloy for centralized logging setup

Fixes: https://tracker.ceph.com/issues/71072
Signed-off-by: Aashish Sharma <aasharma@redhat.com>

Merge PR #64434 into main

* refs/pull/64434/head:

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>

mgr/dashboard: fix missing schedule interval in rbd API

Fetching the rbd image schedule interval through the rbd_support module
schedule list command

GET /api/rbd will have the following field per image
```
"schedule_info": {
                    "image": "rbd/rbd_1",
                    "schedule_time": "2025-09-11 03:00:00",
                    "schedule_interval": [
                        {
                            "interval": "5d",
                            "start_time": null
                        },
                        {
                            "interval": "3h",
                            "start_time": null
                        }
                    ]
                },
```

Also fixes the UI where schedule interval was missing in the form and
also disable editing the schedule_interval.

Extended the same thing to the `GET /api/pool` endpoint.

Fixes: https://tracker.ceph.com/issues/72977
Signed-off-by: Nizamudeen A <nia@redhat.com>

Merge pull request #65010 from irq0/pr/verify-barbican-keyid-before-sending

rgw: Verify key id before sending to Barbican

Reviewed-by: Tobias Urdin <tobias.urdin@binero.com>

Merge pull request #64569 from cbodley/wip-71607

rgw: DeleteObject supports sigv4 with Transfer-Encoding: chunked

Reviewed-by: Robin H. Johnson <robbat2@orbis-terrarum.net>
Reviewed-by: Casey Bodley <cbodley@redhat.com>

script/redmine-upkeep: reset merge state after PR change

This prevents mischief like: https://tracker.ceph.com/issues/70916?tab=history#note-34

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>

Merge pull request #64504 from NitzanMordhai/wip-nitzan-rados-suites-remove-cache-tier-test

qa/workunits/rados: remove cache tier test

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

qa: Run fewer RGW jobs at higher priority every week

So that they actually run.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

Merge PR #64324 into main

* refs/pull/64324/head:
qa/cephfs: fix test_subvolume_group_charmap_inheritance test
doc: add name mangling documentation for subvolume group creation
qa: add tests for name mangling in subvolume group creation
pybind/mgr: add name mangling options to subvolume group creation

Reviewed-by: Anthony D Atri <anthony.datri@gmail.com>
Reviewed-by: Patrick Donnelly <pdonnell@ibm.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>

rgw/logging: add error message when log_record fails

when log_record fails in journal mode due to issues in the target
bucket, the result code that the client get will be confusing, since
there is no indication that the issue is wit hte target bucket and not
the source bucket on which the client was operating.
the HTTP error message will be used to convey this information.

Fixes: https://tracker.ceph.com/issues/72543
Signed-off-by: Yuval Lifshitz <ylifshit@ibm.com>

mgr/dashboard: fix data mismatch in Advance section in Tiering.

Fixes: https://tracker.ceph.com/issues/72641
Signed-off-by: Dnyaneshwari Talwekar <dtalweka@redhat.com>

Merge pull request #64992 from rhcs-dashboard/tiering-enhancement

mgr/dashboard: Tiering form -  Placement Target in Advanced Section

Reviewed-by: Afreen Misbah <afreen@ibm.com>
Reviewed-by: pujashahu <pshahu@redhat.com>

Merge pull request #65115 from rhcs-dashboard/72628-fix-inputfield-css-carbon

mgr/dashboard : fix css for carbon input fields

Reviewed-by: Afreen Misbah <afreen@ibm.com>

Merge pull request #64683 from tobias-urdin/rgwadmin-max-entries-fix

radosgw-admin: Pass max_entries for bucket list

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

Merge pull request #65321 from guits/support-extra-dmcrypt-options

ceph-volume: support additional dmcrypt params

Merge pull request #64855 from rhcs-dashboard/72431-mirrored-images-have-incorrect-usage-info

mgr/dashboard : Fixed mirrored image usage info bar

Reviewed-by: Nizamudeen A <nia@redhat.com>

Merge pull request #65312 from rhcs-dashboard/72788-group-similar-alerts

mgr/dashboard: Group similar alerts

Reviewed-by: Afreen Misbah <afreen@ibm.com>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>

Merge pull request #64190 from SundownRises/carbon-toast

mgr/dasboard: Carbonised Toast Notification

Reviewed-by: Afreen Misbah <afreen@ibm.com>
Reviewed-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>

qa/cephfs: fix test_subvolume_group_charmap_inheritance test

Signed-off-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #65158 from jzhu116-bloomberg/wip-72667

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

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #65393 from MaxKellermann/rgw_includes

rgw: include cleanup

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #64800 from BBoozmen/wip-72375-bulk_delete_olh

RGW: multi object delete op; skip olh update for all deletes but the last one

Reviewed-by: Casey Bodley <cbodley@redhat.com>

doc: update documentation

Fixes: https://tracker.ceph.com/issues/68931
Signed-off-by: Igor Golikov <igolikov@ibm.com>

test: add subvolume metrics sanity test

Signed-off-by: Igor Golikov <igolikov@ibm.com>
Fixes: https://tracker.ceph.com/issues/68929

qa/cephfs: run selective test classes from basic volumes test

Signed-off-by: Venky Shankar <vshankar@redhat.com>

qa/cephfs: use fuse mount for volumes/subvolume tests

Using the kernel client is a) not really required existing
volume/subvolume test and b) per-subvolume metrics is only
supported by the user-space client library.

Signed-off-by: Venky Shankar <vshankar@redhat.com>

mds, messages: include subvolume metric count in log dumps and message exchanges

Signed-off-by: Venky Shankar <vshankar@redhat.com>

mds: remove unneeded SubvolumeMetric field from `struct Metric`

Signed-off-by: Venky Shankar <vshankar@redhat.com>