doc/scripts: use raw string for regex in gen_state_diagram.py

Python 3.12 emits SyntaxWarning for invalid escape sequences in ordinary
string literals. The re.search() call on line 162 was the only pattern
in the file passed as a non-raw string, causing:

  doc/scripts/gen_state_diagram.py:162: SyntaxWarning: invalid escape
    sequence '\s'
    i = re.search("return\s+transit<\s*(\w*)\s*>()", line)

Add the r"" prefix to match the other re.search / re.finditer / re.sub
call sites in the same file. No behavior change; \s was already being
interpreted as a regex whitespace class because Python leaves unknown
escapes untouched, but this will become a SyntaxError in a future
Python release.

Signed-off-by: Kefu Chai <k.chai@proxmox.com>

Merge PR #68555 into main

* refs/pull/68555/head:
script/redmine-upkeep: resolve comment misformatting

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

Merge pull request #68414 from guits/has_bs_repl

ceph-volume: has_bluestore_label checks all bluestore label replica o…

Merge pull request #66704 from ivancich/wip-document-object-manifest-cmd

rgw: add internal docs for `radosgw-admin object manifest ...` sub-command

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

Merge pull request #66432 from stzuraski898/unittests-mgr

test/mgr: Improve unit-test coverage for ceph-mgr

Reviewed by: Nitzan Mordechai <nmordech@ibm.com>
Reviewed by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed by: Ronen Friedman <rfriedma@redhat.com>

Merge pull request #68472 from yuvalif/wip-yuval-76127

test/rgw/kafka: cleanup kafka tgz file

qa/cephadm: zap raw devices before OSD deployment

follow up on commit f3c938f5032885434dd2ab77f9b2e6bc05917f3c

```
2026-04-22T10:16:21.350 DEBUG:teuthology.orchestra.run.trial118:> sudo ceph-bluestore-tool zap-device --dev /dev/nvme3n1 --yes-i-really-really-mean-it
2026-04-22T10:16:21.358 INFO:teuthology.orchestra.run.trial118.stderr:sudo: ceph-bluestore-tool: command not found
```

ceph-bluestore-tool is not available on the host and must be run from within a container.

Instead, use `ceph-volume lvm zap` which internally calls `ceph-bluestore-tool zap-device`.

Fixes: https://tracker.ceph.com/issues/76238
Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>

Merge pull request #68541 from rhcs-dashboard/rgw-nfs-export-path-issue

mgr/dashboard: Difference in "path" value observed when rgw user level export created via dashboard vs cli

Reviewed-by: Afreen Misbah <afreen@ibm.com>
Reviewed-by: Abhishek Desai <abhishek.desai1@ibm.com>

Merge PR #65656 into main

* refs/pull/65656/head:
client: do not allow zero‑length reads
src/test: test zero-length async-fsync read using ceph_ll_nonblocking_readv_writev
src/test: test zero-length async-fsync read using ll_preadv_pwritev

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

Merge pull request #68562 from bluikko/wip-doc-sphinx-warnings-202604b

doc: fix Sphinx complaints

Merge pull request #68529 from rhcs-dashboard/fix-step-3

mgr/dashboard: Allow moving to next when Bidirectional mode is chosen

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

doc: fix Sphinx complaints

Fix section title underlines in ec_stretch_cluster.rst.
Fix table that was not rendered at all in lua-scripting.rst.

Signed-off-by: Ville Ojamo <git2233+ceph@ojamo.eu>

Merge pull request #68469 from VallariAg/fix-top-image-name

mgr/dashboard: show rados ns in 'ceph nvmeof top io'

Merge pull request #68535 from bluikko/wip-doc-rados-troubleshooting-mon-backticks

doc/rados: fix markup in troubleshooting-mon.rst

Merge pull request #68547 from rhcs-dashboard/encryption-fix

mgr/dashboard: Encryption key not being passed in gateway group form

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

Merge pull request #68531 from rhcs-dashboard/fix-step-2

mgr/dashboard: Validate no added hosts in second step

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

Merge pull request #68525 from rhcs-dashboard/y-axis-are

mgr/dashboard: Round off y-axis value of area chart

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

ceph-volume: has_bluestore_label checks all bluestore label replica offsets

BlueStore replicates the block device label at fixed offsets (0 and
multiples of 1Gb up to 1000gb). has_bluestore_label() only read the
first 22 bytes, so disks with a wiped primary label but intact
replicas are missed.

with this commit, has_bluestore_label() scans each known offset with
seek/read and compares the ASCII prefix as bytes.

Fixes: https://tracker.ceph.com/issues/76060
Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>

script/redmine-upkeep: resolve comment misformatting

See for example [1].

[1] https://github.com/ceph/ceph/pull/67343#issuecomment-4298533030

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

doc/rados: fix markup in troubleshooting-mon.rst

Double backticks do not stack with strong emphasis.
Use automatic emphasis instead.

Signed-off-by: Ville Ojamo <git2233+ceph@ojamo.eu>

Merge pull request #67019 from Jayaprakash-ibm/wip-object-fragmentation

os/bluestore: add static and runtime object fragmentation tracking

Reviewed-by: Adam Kupczyk <akupczyk@ibm.com>

Merge pull request #68183 from rhcs-dashboard/set-motd

mgr/dashboard: Add option to set motd via api

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

Merge pull request #68467 from ujjawal-ibm/filter-virtual-ram-devices

ceph-volume: skip /dev/ram* devices in inventory

Merge pull request #68280 from xhernandez/proxy-fix-fscrypt-buffers

libcephfs_proxy: fix passed buffers for fscrypt functions

Reviewed-by: John Mulligan <jmulligan@redhat.com>
Reviewed-by: Anoop C S <anoopcs@cryptolab.net>

Merge pull request #68493 from rhcs-dashboard/76158-rgw-restart-stop-bug

mgr/dashboard : Fix services restart/stop issue

Reviewed-by: Afreen Misbah <afreen@ibm.com>
Reviewed-by: Dnyaneshwari Talwekar <dtalweka@redhat.com>

mgr/dashboard: Difference in "path" value observed when rgw user level export created via dashboard vs cli

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

Merge pull request #68036 from ifed01/wip-ifed-print-effective-vsel-extra

os/bluestore: print effective extra in 'bluefs stats' report

Reviewed-by: Adam Kupczyk <akupczyk@ibm.com>

Merge pull request #68177 from ifed01/wip-ifed-better-ebd-detect

blk,os/bluestore: do not call extblkdev::detect_device on every

Reviewed-by: Adam Kupczyk <akupczyk@ibm.com>

mgr/dashboard: Encryption key not being passed in gateway group form

- encryption_key despite fo being added by user is not added in service spec
- this blocks both bi and uni directional auth

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

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

mgr/dashboard: Allow moving to next when Bidirectional mode is chosen

- there is an issue with bi-auth , where the validation is getting empty due to some state refresh
- fixed by removing re-setting of form state

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

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

Merge pull request #68353 from Jayaprakash-ibm/wip-clean-discard-warn

mon: simplify discard queue health warning

Reviewed-by: Adam Kupczyk <akupczyk@ibm.com>
Reviewed-by: Igor Fedotov <igor.fedotov@croit.io>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>

Merge pull request #68441 from rhcs-dashboard/mgr/dashboard/carbonize-multisite-wizard-realm-token

mgr/dashboard: mgr/dashboard: Carbonize Realm Name and Token block in Multi-site Replication Wizard

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

mgr/dashboard: Fix review page showing auth details when all hosts selected

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

mgr/dashboard: Round off y-axis value of area chart

- by default y-axos set to 1 for all
- the value round off for area chart is seperated from y-axis ticks
- also fixes a bug where all IOPS y-ticks being repeated 1,1,0,0

The following values are set for now:

IOPS: valueDecimals=0, axisDecimals=1
Latency: valueDecimals=2, axisDecimals=1
Throughput: valueDecimals=2, axisDecimals=1
Consumption: valueDecimals=2, axisDecimals=1

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

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

mgr/dashboard: Add option to set motd via api

Signed-off-by: Aashish Sharma <aasharma@redhat.com>

Merge pull request #68537 from rhcs-dashboard/fix-76200

mgr/dashboard: [snap-visibility]Edit Client config option remains stuck in loading when nfs user is configured

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

Merge pull request #68521 from rhcs-dashboard/fix-osd

mgr/dashboard: Fix osd modal spacings and footer

Reviewed-by: Abhishek Desai <abhishek.desai1@ibm.com>

Merge pull request #67995 from rhcs-dashboard/rename-namespacesize

mgr/dashboard: Rename namespace block size field and reorder namespace form order

Reviewed-by: Devika Babrekar <devika.babrekar@ibm.com>
Reviewed-by: pujaoshahu <pshahu@redhat.com>
Reviewed-by: Afreen Misbah <afreen@ibm.com>

client: do not allow zero‑length reads

fixing this in Client::_read which is called by both async and sync code paths.

Fixes: https://tracker.ceph.com/issues/73037
Signed-off-by: Dhairya Parmar <dparmar@redhat.com>

src/test: test zero-length async-fsync read using ceph_ll_nonblocking_readv_writev

Fixes: https://tracker.ceph.com/issues/73037
Signed-off-by: Dhairya Parmar <dparmar@redhat.com>

src/test: test zero-length async-fsync read using ll_preadv_pwritev

Fixes: https://tracker.ceph.com/issues/73037
Signed-off-by: Dhairya Parmar <dparmar@redhat.com>

mgr/dashboard: [snap-visibility]Edit Client config option remains stuck in loading when nfs user is configured

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

mgr/dashboard: mgr/dashboard: Rename namespace block size field and reorder namespace create form fields

Fixes: https://tracker.ceph.com/issues/75707
Signed-off-by: Sagar Gopale <sagar.gopale@ibm.com>

Merge pull request #68490 from rhcs-dashboard/fix-76163-main

mgr/dashboard: remove sync_from entry when sync_from_all is true

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

mgr/dashboard : Fix RGW restart/stop issue
fixes : https://tracker.ceph.com/issues/76158
Signed-off-by: Abhishek Desai <abhishek.desai1@ibm.com>

mgr/dashboard: Validate no added hosts in second step

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

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

mgr/dashboard: Fix osd modal spacings and footer

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

- aligned as per https://carbondesignsystem.com/components/modal/usage/#transactional-modal

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

Merge pull request #68465 from rhcs-dashboard/IBMCEPH-10149-rgw-non-version-bucket

mgr/dashboard : fix-non-versioning-bucket-issue

Reviewed-by: Afreen Misbah <afreen@ibm.com>
Reviewed-by: Dnyaneshwari Talwekar <dtalweka@redhat.com>

Merge pull request #68412 from cloudbehl/cephfsdashboardCPUMEM

mgt/dashboard: Add the CPU, Memory to CephFS dashboard

Reviewed-by: Dnyaneshwari Talwekar <dtalweka@redhat.com>
Reviewed-by: Pedro Gonzalez Gomez <pegonzal@ibm.com>

mgr/dashboard: remove sync_from entry when sync_from_all is true

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

Merge pull request #68411 from rhcs-dashboard/fix-76054-main

mgr/dashboard: Option to select archive option while Import Multi-site token

Reviewed-by: Naman Munet <nmunet@redhat.com>

Merge pull request #67869 from rhcs-dashboard/sync-policy-replication

mgr/dashboard: sync policy created for a bucket in Object >> Multi-site >> Sync-policy, is not reflecting under bucket's replication

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

Merge pull request #68485 from kginonredhat/issue-76147-typo-spcified-in-comment

mgr/cephadm: fix typo in schedule.py comment (specified)

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>

Merge pull request #68464 from vshankar/wip-exlude-crimson-fs-upgrade

qa/cephfs: exclude ceph-osd-{classic,crimson} in fs:upgrade:featurefu…

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

Merge pull request #67867 from vshankar/wip-75380

qa/cephfs: treat "implicit declaration of function" for blogbench workunit for newer gcc version

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

Merge pull request #68179 from ifed01/wip-ifed-util-no-warn

common/util: silent "warning: ‘cgroup_limit’ may be used uninitialized"

Reviewed-by: Md Mahamudur Rahaman Sajib <mahamudur.sajib@croit.io>

Merge pull request #68486 from rhcs-dashboard/fix-76156-main

mgr/dashboard: remove archive option from master zone creation

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

Merge pull request #68440 from rhcs-dashboard/tearsheet-layout-fix

mgr/dashboard: tearsheet-layout-fix

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

Merge pull request #68224 from rhcs-dashboard/fix/nvmeof-initiator-hostname-prevalidation

mgr/dashboard: NVMe-of Initiator Hostname Pre-validation

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

Merge pull request #68160 from rhcs-dashboard/fix-delete-subsystem

mgr/dashboard: fix delete subsystem issue

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

Merge pull request #67546 from kotreshhr/mirror-syncthreads-fair-scheduling

tools/cephfs_mirror: Distribute datasync threads evenly across snapshots

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

Merge pull request #67710 from vshankar/wip-75083

qa/cephfs: make test_journal_migration immune to stdout changes

Reviewed-by: Christopher Hoffman <choffman@redhat.com>

Merge pull request #67878 from salieri11/igolikov-fix-subvolume-map-75343-new

mds: fix data race on subvolume_metrics_map in MetricsHandler

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

ceph-volume: skip /dev/ram* devices in inventory

Kernel RAM disks (/dev/ram*) are not valid OSD targets, filter them out during
device discovery so they don’t appear in inventory.

Fixes: https://tracker.ceph.com/issues/76113
Signed-off-by: Ujjawal Anand <ujjawal.anand@ibm.com>

mgr/dashboard: mgr/dashboard: Carbonize Realm Name and Token block in Multi-site Replication Wizard

Fixes: https://tracker.ceph.com/issues/76085
Signed-off-by: Sagar Gopale <sagar.gopale@ibm.com>

Merge pull request #68175 from rhcs-dashboard/bugfix/nvmeof-namespace-subsystem-selection-order

mgr/dashboard: NVMeoF namespace create form should show subsystem selection first

Reviewed-by: Afreen Misbah <afreen@ibm.com>
Reviewed-by: pujaoshahu <pshahu@redhat.com>
Reviewed-by: Devika Babrekar <devika.babrekar@ibm.com>

mgr/dashboard: Option to select archive option while Import Multi-site Token

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

mgt/dashboard: Add the CPU, Memory to CephFS dashboard

Fixes: https://tracker.ceph.com/issues/76058
Signed-off-by: Ankush Behl <cloudbehl@gmail.com>

Merge pull request #68377 from rhcs-dashboard/fix-namespace-block-size

mgr/dashboard: fix namespace block size in namespace form

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

Merge pull request #68302 from rhcs-dashboard/bug-13708

mgr/dashboard : Unable to remove gateway node from gateway group

Reviewed-by: Afreen Misbah <afreen@ibm.com>
Reviewed-by: Dnyaneshwari Talwekar <dtalweka@redhat.com>

mgr/dashboard: remove archive option from master zone creation

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

mgr/dashboard : fix-non-versioning-bucket-issue
fixes : https://tracker.ceph.com/issues/76109
Signed-off-by: Abhishek Desai <abhishek.desai1@ibm.com>

mgr/cephadm: fix typo in schedule.py comment (specified)

Correct spelling in the ip_addrs allocation comment: "spcified" → "specified".

Fixes: https://tracker.ceph.com/issues/76147
Signed-off-by: Kobi Ginon <kginon@redhat.com>

Merge pull request #68033 from smanjara/wip-zg-rename

rgw/multisite: remove old zonegroup name on the remote zone after a rename

Merge pull request #68163 from ceph/wip-oozmen-75831

rgw/admin: enhance bucket list --marker to support versioned bucket pagination

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

Merge pull request #67424 from BBoozmen/wip-oozmen-75031

rgw/beast: use strand executor for timeout timer to prevent concurrent socket access

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

Merge pull request #67665 from tchaikov/wip-test-rgw-fix-warning

test/rgw: fix -Wstring-plus-char warning in test_d4n_policy

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

Merge pull request #67189 from cbodley/wip-74231

rgw: fix 'bucket stats' when bucket index doesn't exist

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

Merge pull request #67958 from cbodley/wip-qa-rgw-compress-encrypted

qa/rgw: crypt subsuite tests compress-encrypted

Reviewed-by: Matthew N. Heler <matthew.heler@hotmail.com>

Merge pull request #68393 from Hezko/traddr-compat

mgr/dashboard: introduce traddr for backward compatibility

Merge pull request #67841 from rhcs-dashboard/fix-pools-app-list-names

mgr/dashboard : Fix application names in pools form

Reviewed-by: Afreen Misbah <afreen@ibm.com>
Reviewed-by: Ankush Behl <cloudbehl@gmail.com>
Reviewed-by: Dnyaneshwari Talwekar <dtalweka@redhat.com>

Merge pull request #68011 from mheler/wip-75650

rgw: always decompress in CopyObject when source is compressed

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

Merge pull request #68324 from mheler/wip-multipart-cloud-transition

rgw: fix cloud tier multipart resume using part number 0

Reviewed-by: Soumya Koduri <skoduri@redhat.com>

Merge pull request #67560 from mheler/wip-cloud-restore-etag-fix

rgw/cloud-restore: strip quotes from ETag on cloud tier fetch

Reviewed-by: Soumya Koduri <skoduri@redhat.com>

Merge pull request #67966 from mheler/wip-75649

rgw: fix fixup_range cascade for compressed+encrypted objects

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

Merge pull request #68466 from bluikko/wip-doc-fix-tentacle-releases

doc/releases: fix Tentacle data in releases.yml

qa/rgw: crypt subsuite tests compress-encrypted

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

qa/rgw: rgw task can enable/disable zone features

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

qa/rgw: don't duplicate 'user list' commands for default zone

some commands during setup expect the zone to exist already, so run
'radosgw-admin user list' to make sure a default zone/zonegroup are
created. avoid duplicating this in several subtasks by moving this to
its own subtask that runs when a realm is not configured

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

Merge pull request #67863 from mheler/wip-bug-75569

rgw: stop crashing when an admin tries to assume a nonexistent role

rgw: fix cloud tier multipart resume starting at part number 0

When resuming a cloud tier multipart upload, the part-size
calculation was inside the fresh-init block and never executed.
cur_part, num_parts, and part_size stayed at 0, causing the
remote endpoint to reject part number 0 as invalid.

Move the part-size calculation out of the init block so it
runs for both fresh and resumed uploads.

Signed-off-by: Matthew N. Heler <matthew.heler@hotmail.com>

rgw/cloud-restore: strip quotes from ETag on cloud tier fetch

When objects are restored from a cloud endpoint, the ETag value read
from the HTTP response includes surrounding double-quotes per RFC 7232.
RGW stores ETags unquoted internally, and dump_etag() adds its own
quotes when serving responses. The mismatch results in double-quoted
ETags like ""abc123-6"" on restored objects.

Strip the quotes from both the etag output parameter and the
RGW_ATTR_ETAG attribute after fetching from the cloud endpoint,
matching the unquoted format RGW uses everywhere else.

Signed-off-by: Matthew N. Heler <matthew.heler@hotmail.com>

Merge pull request #68204 from abhishek593/bug-73437

rgw: fix uninitalized fields in pubsub topic creation

test/rgw/kafka: cleanup kafka tgz file

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

Merge pull request #67548 from mertsunacoglu/wip-rgw-lua-postauth

rgw/lua: Add new Lua postAuth hook that is being run after authorization

Merge pull request #68097 from cheese-cakee/wip-72088-sync-checkpoint-stdout

radosgw-admin: output bucket sync checkpoint to stdout

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

Merge pull request #68279 from wuhongsong/fix/rgw-vault-content-type

rgw: add Content-Type header to Vault KMS requests

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

Merge pull request #67479 from nbalacha/wip-nbalacha-75127

rgw: Lua Package management fixes

mgr/dashboard : Select replicated rule by default in pools form
fixes : https://tracker.ceph.com/issues/75632
Signed-off-by: Abhishek Desai <abhishek.desai1@ibm.com>

Merge pull request #66778 from Kushal-deb/d3n-cephadm-automation

mgr/cephadm: Implement D3N L1 persistent datacache support for RGW

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Redouane Kachach <rkachach@ibm.com>