Merge pull request #64545 from ajarr/cleanup-librbd-mirror-enable-req

librbd/mirror: cleanup EnableRequest::handle_get_mirror_image()

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

Merge pull request #64193 from tchaikov/wip-bluestore-test-shutdown

os/bluestore: fix memory leak in HybridAllocator destructor

Merge pull request #64661 from afreen23/revert-stylus

Revert "mgr/dashboard: Fix stylus issue"

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

Merge pull request #64352 from aclamk/aclamk-bs-remove-cache_blob

os/bluestore: Get rid of unused CACHE_BLOB_BL

Merge pull request #64219 from kamoltat/wip-ksirivad-fix-qa-rados-test

qa/workunits/rados/test.sh: add timeout mechanism and more info to workloads with parallel tests

Merge pull request #63642 from ifed01/wip-ifed-dynamic-vsel-params

os/bluestore: make vselector reserved* parameters applicable in run-time

Merge pull request #64667 from afreen23/fix-localization-load

mgr/dashboard: Fix issue with loading localization module

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

Merge pull request #62790 from ceph/rm-ceph-common-postun

ceph.spec.in: don't rm ceph conf and logs in ceph-common postun

Merge pull request #64535 from yuvalif/wip-yuval-71979

rgw/test/notification: add more info when retry test fail

librbd/mirror: cleanup EnableRequest::handle_get_mirror_image()

In the EnableRequest state machine, clean up the handling of the async
request to fetch the mirror image, particularly when a non-primary image
is being created by the rbd-mirror daemon.

Signed-off-by: Ramana Raja <rraja@redhat.com>

Merge pull request #64402 from sam0044/sam0044-bug_72034

mgr/cephadm: updating maintenance health status in the serve loop

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

Merge pull request #63825 from leomylonas/main

mgr/cephadm: handle possibly undefined template variable in haproxy.cfg.j2

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

Merge pull request #63391 from Kushal-deb/fix-rgw-bootstrap

mgr/rgw: Improve error handling and add --resume flag to 'ceph rgw realm bootstrap'

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

Merge pull request #64185 from kshtsk/wip-add-cephadm-file-path

qa/tasks/cephadm: allow to select from 'cephadm' and 'cephadm.py'

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

Merge pull request #64635 from abitdrag/tracker_72134

krbd: "rbd device map" command should use msgr2 by default

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

Merge pull request #62886 from Kushal-deb/fix-issue-2302464-ceph_orch_commands_to_report_the_exit_code

mgr/cephadm: Provide appropriate exit codes for orch operations

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

Merge pull request #64454 from anoopcs9/fix-var-lib-samba-perms

cephadm: Bind mount /var/lib/samba with 0755

Reviewed-by: John Mulligan <jmulligan@redhat.com>
Reviewed-by: Sachin Prabhu <sp@spui.uk>
Reviewed-by: Shwetha K Acharya <Shwetha.K.Acharya@ibm.com>

mgr/dashboard: Fix issue with loading localization module

- this module is only required to be imported from polyfill
-  nx now loading this module as well breaking CI tests and dashboard `@angular/localize`

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

Merge pull request #64616 from afreen23/fix-smb

mgr/dashboard: Fix redirection of SMB enable module

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

Revert "mgr/dashboard: Fix stylus issue"

This reverts commit c7053dff52bc1a93af45b8017a6e13a578a2f71e.

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

krbd: "rbd device map" command should use msgr2 by default

Making msgr2 and ms_mode=prefer-crc as default option for "rbd device
map" command

Fixes: https://tracker.ceph.com/issues/72134
Signed-off-by: Miki Patel <miki.patel132@gmail.com>

Merge PR #62682 into main

* refs/pull/62682/head:

Reviewed-by: Patrick Donnelly <pdonnell@ibm.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #64633 from afreen23/fix-stylus

mgr/dashboard: Fix stylus issue

Merge pull request #64568 from cbodley/wip-qa-rgw-s3a-hadont

qa/rgw: remove hadoop-s3a subsuite

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>

Merge pull request #64639 from zdover23/wip-doc-2025-07-23-pr-64532-followup

doc/radosgw: edit config-ref.rst

Merge pull request #64640 from zdover23/wip-doc-2025-07-23-pr-64604-followup

doc/cephfs: edit disaster-recovery.rst

doc/cephfs: edit disaster-recovery.rst

Follow up on the suggestions made by Anthony D'Atri in
https://github.com/ceph/ceph/pull/64604.

Signed-off-by: Zac Dover <zac.dover@proton.me>

doc/radosgw: edit config-ref.rst

Follow up on the suggestions made by Anthony D'Atri in
https://github.com/ceph/ceph/pull/64532.

Signed-off-by: Zac Dover <zac.dover@proton.me>

Merge pull request #63974 from baum/dsa

mgr/cephadm/nvmeof: idxd/dsa

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

mgr/dashboard: Fix stylus issue

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

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

Merge pull request #64543 from phlogistonjohn/jjm-bib

src/script/build-integration-branch improvements

Merge pull request #62767 from rhcs-dashboard/notification-list-ui

mgr/dashboard: Add RGW bucket notification listing in dashboard

Reviewed-by: Afreen Misbah <afreen@ibm.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

mgr/dashboard: Fix redirection of SMB enable module
- taking to dashboard page due to remains of `buttonToEnableModule`

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

Merge pull request #64595 from aainscow/align_storage

osd: Replace deprecated std::align_storage_t with alignas

Merge pull request #64225 from rhcs-dashboard/inline-tip-notification

mgr/dashboard: add support for inline-tip notification

Reviewed-by: Afreen Misbah <afreen@ibm.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

Merge pull request #64505 from abitdrag/tracker_71961

librbd: images aren't closed in group_snap_*_by_record() on error

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

Merge pull request #64527 from rhcs-dashboard/edit-storage-class-mgmt

mgr/dashboard: Storage Class - Update

mgr/dashboard: Add RGW bucket notification listing in dashboard

Fixes: https://tracker.ceph.com/issues/70880
Signed-off-by: pujaoshahu <pshahu@redhat.com>
Signed-off-by: pujashahu <pshahu@redhat.com>

Merge pull request #64591 from tchaikov/wip-auth-remove-unused

auth: remove unused AuthTicket::renew_after member variable

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

Merge pull request #64437 from avanthakkar/add-smb-metadata-metric

mgr/prometheus: add smb_metadata metric

Merge pull request #64604 from zdover23/wip-doc-2025-07-21-cephfs-disaster-recovery-data-pool-damage

doc/cephfs: edit disaster-recovery.rst

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

mgr/dashboard: Storage Class - Update

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

doc/cephfs: edit disaster-recovery.rst

Edit the section "Data Pool Damage" in doc/cephfs/disaster-recovery.rst.
This commit is part of the project of improving the data-recovery parts
of the CephFS documentation, as requested in the Ceph Power Users
Feedback Summary in mid-2025.

Signed-off-by: Zac Dover <zac.dover@proton.me>

Merge pull request #61767 from ivoalmeida/mfe-app-shell

mgr/dashboard: set up dashboard as a app shell for plugin framework

Reviewed-by: Afreen Misbah <afreen@ibm.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

auth: remove unused AuthTicket::renew_after member variable

The AuthTicket::renew_after field is only set in init_timestamps() and
read by dump() for debugging purposes. It has no functional use cases
and causes encoding/decoding inconsistencies.

During decoding, this field remains unchanged, creating discrepancies
between original and decoded values. This issue was masked because
check-generated.sh and readable.sh reused struct instances, preserving
stale field values across encode/decode cycles.

An upcoming change will allocate fresh instances for each decode
operation, which would expose these inconsistent values.

Remove the unused field to eliminate the encoding inconsistency and
simplify the codebase.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>

osd: Replace deprecated std::align_storage_t with alignas

C++23 has been enabled, causing deprecated warnings. Following the
"possible implementation" in the C++ docs, I have replaced the last
remaining aligned_storage_t.

Signed-off-by: Alex Ainscow <aainscow@uk.ibm.com>

Merge pull request #63407 from adk3798/cephadm-rbd-iscsi-ignore-mon-down

qa/rbd/iscsi: ignore MON_DOWN warning in logs

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

mgr/dashboard: add support for inline-tip notification

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

Signed-off-by: Naman Munet <naman.munet@ibm.com>

Merge PR #64005 into main

* refs/pull/64005/head:
qa: Run test_admin with the squid client

Reviewed-by: Dhairya Parmar <dparmar@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@ibm.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge PR #63214 into main

* refs/pull/63214/head:
release note: add a note that "subvolume info" cmd output can also...
doc/cephfs: update docs since "subvolume info" cmd output can also...
qa/cephfs: add test to check clone source info's present in...
mgr/vol: show clone source info in "subvolume info" cmd output
mgr/vol: keep clone source info even after cloning is finished

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Kotresh Hiremath Ravishankar <khiremat@redhat.com>
Reviewed-by: Neeraj Pratap Singh <neesingh@redhat.com>

Merge PR #57953 into main

* refs/pull/57953/head:
mds: Mark the scrub passed if dirfrag is dirty

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

Merge PR #64356 into main

* refs/pull/64356/head:
client: prohibit unprivileged users from setting sgid/suid bits

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

Merge PR #58564 into main

* refs/pull/58564/head:
client: clamp sizes to INT_MAX in sync i/o code paths
client: restrict bufferlist to total write size
src/test: test sync/async i/o code paths with huge (4GiB) buffers

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

Merge pull request #64459 from cbodley/wip-72083

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

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>

Merge pull request #63261 from NitzanMordhai/wip-nitzan-msg-shutdown-hang-drain

msg: drain stack before stopping processors to avoid shutdown hang

Merge pull request #63239 from mohit84/upgrade_health_warning

qa: Add "osds down" in log-ignorelist to avoid the test case failure during upgrade

 mgr/dashboard: add rollup as optional deps

    - for arm64 hitting (Use `node --trace-warnings ...` to show where the warning was created)
     NX   Cannot find module @rollup/rollup-linux-arm64-gnu. npm has a bug related to optional dependencies (https://github.com/npm/cli/issues/4828). Please try `npm i` again after removing both package-lock.json and node_modules directory.
    Pass --verbose to see the stacktrace.
    - due this this make check arm64 failing
    - added the fix as per https://github.com/vitejs/vite/discussions/15532#discussioncomment-13369584
    - its failing then  NX  Falling back to ts-node for local typescript execution. This may be a little slower.
     NX   Cannot find module '@rspack/binding-linux-arm64-gnu'
    - the above fix failed asking more deps from rollup, so added whole rollup package

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

Merge pull request #64567 from ronen-fr/wip-rf-72178auto

osd/scrub: allow auto-repair on operator-initiated scrubs

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

Merge pull request #63672 from ArbitCode/wip-raja-get-caller-identity

rgw/sts: GetCallerIdentity API

Merge pull request #64549 from joscollin/wip-B65770-imported-exported-counters-failed-to-set

qa: increase the randomness to trigger the directory import/export

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

Merge pull request #63128 from kshtsk/wip-backport-create-issue-syntax

script/backport-create-issue: fix the syntax warning

Merge pull request #64363 from Hezko/nvmeof-cli-aviv-feedback

mgr/dashboard: nvmeof cli feedback fixes

Reviewed-by: Afreen Misbah <afreen@ibm.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>

Merge pull request #64186 from tinchee/bug_71262

mon/MgrMonitor: add a space before "is already disabled"

Merge pull request #64016 from bill-scales/issue70818

qa: get_rand_pg_acting_set needs to wait for pool to create PGs

Merge pull request #64003 from NitzanMordhai/wip-nitzan-perfcount-latency-overflow

Paxos: use mono clock for latency calculate in latency perfcount

Merge pull request #62951 from phlogistonjohn/jjm-pe-crypto-plus

mgr:python: avoid pyo3 errors by running certain cryptographic functions in a child process

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Paulo E. Castro <pecastro@wormholenet.com>

Merge pull request #63890 from shreya-subramanian/bug_fix

mon: paxos_service_min_trim bug fix, ceph tracker issue: 71610

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@ibm.com>

Merge pull request #64560 from gbregman/main

imgr/cephadm/nvmeof: Add "force TLS" flag to NVMeOF spec file.

qa/rgw: remove hadoop-s3a subsuite

this suite hasn't provided much benefit since it was added, and is
becoming more of a maintenance burden recently:
* https://tracker.ceph.com/issues/71584
* https://tracker.ceph.com/issues/72179

remove the subsuite and its s3a_hadoop.py task

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

osd/scrub: allow auto-repair on operator-initiated scrubs

Previously, operator-initiated scrubs would not auto-repair, regardless
of the value of the 'osd_scrub_auto_repair' config option.  This was
less confusing to the operator than it could have been, as most
operator commands would in fact cause a regular periodic scrub
to be initiated. However, that quirk is now fixed: operator commands
now trigger 'op-initiated' scrubs. Thus the need for this patch.

The original bug was fixed in https://github.com/ceph/ceph/pull/54615,
but was unfortunately re-introduced later on.
Fixes: https://tracker.ceph.com/issues/72178
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

Merge branch 'ceph:main' into main

Merge pull request #63731 from matt-akamai/lc_ordered_listing

rgw: allow lc listing order to be configurable

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

Merge pull request #64272 from linuxbox2/wip-matt-70853

rgwlc: fix removal of delete markers (SAL)

improve error handling and add --resume flag to 'ceph rgw realm bootstrap' for partial recovery

This patch enhances the `ceph rgw realm bootstrap` command by improving error
messaging and introducing a `--resume` flag to support recovery from partial
bootstrap failures.

Signed-off-by: Kushal Deb <Kushal.Deb@ibm.com>

librbd: Clean up usage of IoCtx

Clean up of librbd::IoCtx to librados::IoCtx in Group.cc

Signed-off-by: Miki Patel <miki.patel132@gmail.com>

imgr/cephadm/nvmeof: Add "force TLS" flag to NVMeOF spec file.

Fixes: https://tracker.ceph.com/issues/72172
Signed-off-by: Gil Bregman <gbregman@il.ibm.com>

Merge pull request #64516 from Hezko/nvmeof-cli-size-convert3

mgr/dashboard: support human friendly size parameter split commands to separate api and cli functions

Reviewed-by: Afreen Misbah <afreen@ibm.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>

Merge pull request #64346 from nbalacha/wip-nbalacha-options-typos

options: fix typos

mgr/dashboard: nvmeof cli rename ns to namespace, fixes for text responses, subsys add params

Signed-off-by: Tomer Haskalovitch <tomer.haska@ibm.com>

librbd: images aren't closed in group_snap_*_by_record() on error

Fixes memory leak and handles resource leak scenario when at leat one IoCtx is not
created successfully. This is done by returning error before opening any image.
Changes are made in group_snap_remove_by_record and group_snap_rollback_by_record

Fixes: https://tracker.ceph.com/issues/71961
Signed-off-by: Miki Patel <miki.patel132@gmail.com>

Merge pull request #62985 from connorfawcett/wip-exerciser-consistency-2604

common/io_exerciser: Add consistency checking functionality to IO exerciser

Merge pull request #64448 from nbalacha/wip-nbalacha-typo-1

rgw: fix typos in log messages

rgw/test/notification: add more info when retry test fail

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

Merge pull request #63421 from rhcs-dashboard/storageClass-LocalGlacier

mgr/dashboard: Glacier Storage Class - create and list

qa: increase the randomness to trigger the directory import/export

Fixes: https://tracker.ceph.com/issues/65770
Signed-off-by: Jos Collin <jcollin@redhat.com>

Merge pull request #64537 from bluikko/doc-bucket-logging-formatting-radosgw

doc/radosgw: Improve formatting consistency and language in bucket_logging.rst

Merge pull request #64532 from zdover23/wip-doc-2025-07-16-radosgw-config-ref

doc/radosgw: edit "Lifecycle Settings"

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

Add a new flag to the IO exerciser which enables live consistency
checking during IO sequences (disabled by default).

Signed-off-by: Connor Fawcett <connorfa@uk.ibm.com>

Get chunk size for consistency checking from EC profile instead of command line arg

Signed-off-by: Connor Fawcett <connorfa@uk.ibm.com>

Merge pull request #64524 from tchaikov/wip-function2-alignas

include/function2.hpp: avoid using std::aligned_storage_t

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

build-integration-branch: allow setting git trailer on final commit

After the last commit is made, provide a simple mechanism for adding
git trailers to the commit message. The git trailers [1] are metadata
that tools may make use of. In particular, we add a few of the
trailers documented by ceph-build here [2] as well as allowing
for arbitrary trailers for future changes (before this code can
be updated), advanced trailer, or other unrelated purposes.

[1] https://www.alchemists.io/articles/git_trailers
[2] https://github.com/ceph/ceph-build/tree/main/ceph-trigger-build

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

build-integration-branch: convert to argparse

Convert build-integration-branch to use the stdlib argparse module.

Argparse is:
* Part of the python standard library and available since 3.2
* Well documented as a stdlib component
* Widely used
* Fairly simple and direct

docopt is:
* Clever
* Not documented as a dependency of this script (so I bet most users
  are relying on the fallback behavior)
* Of questionable maintenance status with:
  - No releases since 2014
  - Only four PRs merged since 2019
  - Last merged PR was merged, recommending an alternate repo, and then
    disappeared from the commit history of the master branch, indicating
    a possible maintainership/status discrepancy
  - Only a couple of commits merged since 2018 (visible on github)
* In my opinion: not particularly ergonomic esp. wrt dictionary based
  key access

I feel pretty comfortable making this conversion as I think it will
make the script easier to maintain and extend.

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

Merge pull request #64157 from concubidated/wip-doc-balancer

doc: Fixes a typo in balancer operations

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

mgr/dashboard: split ns add to separate api and cli functions

Signed-off-by: Tomer Haskalovitch <tomer.haska@ibm.com>

Merge pull request #64536 from bluikko/doc-cloud-transition-link-plus-radosgw

doc/radosgw: Internal link and single-keystroke improvements

build-integration-branch: add a main function

Follow typical python best practicies and add a if-name-equals-main
script guard and a main function. Body of the if statement is largely
unchanged from the bulk of the script.

View with: git diff -w

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

Merge PR #64229 into main

* refs/pull/64229/head:
doc/cephfs: add mds_allow_batched_ops to conf ref
mds: nudge log for unstable locks after early_reply
mds: allow disabling batch ops
common/options: chomp whitespace

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

doc/radosgw: Improve formatting and language in bucket_logging.rst

Trim trailing extra line characters around main title.

Add missing full stops in list items.

Use double backticks for configuration options, data etc.

Linkify reference to REST API.

No hyphen in "regular expression".

Fix section hierarchy by moving "Log Records" up 2 levels and try to
make the section title more consistent with another section title.

Try to improve partial sentences and try to simplify one sentence.

Remove whitespace at otherwise empty line.

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

Merge pull request #64517 from Hezko/nvmeof-cli-help

mgr/dashboard: add help for nvmeof cli

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

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

cephadm.postinst fails on ubuntu 24.04, because the cephadm user it
creates ends up with a `/nonexistent` home directory:

> mkdir: cannot create directory '/nonexistent/.ssh': No such file or directory

on ubuntu 22.04, this user's home directory is `/home/cephadm`

the `adduser` man page for 24.04 includes this new text:
> If no home directory is specified, the default home directory for a new system user is /nonexistent. This directory should never exist on any Debian system, and adduser will never create it automatically.

commit 90bc0369243077c2aaf67f0de2bab5810b217f4e had previously added
`--home /home/cephadm`, but that was later removed by commit
c5a316cfd5e993ad5accd12ed101dc33ff671163 to support non-default home
directories. the latter commit's author recommends use of
`--home /var/lib/cephadm` instead

Fixes: https://tracker.ceph.com/issues/72083
Signed-off-by: Casey Bodley <cbodley@redhat.com>