Merge pull request #64565 from synarete/ss-samba-metrics-image-devbuilds-centos-amd64

mgr/cephadm: use same tag for all samba images

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #64737 from zdover23/wip-doc-2025-07-29-cephfs-ceph-dokan

doc/cephfs: edit ceph-dokan.rst (2 of x)

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

Merge pull request #64351 from ifed01/wip-ifed-discard-threads-better-lifecycle

blk/kernel: improve DiscardThread life cycle.

Reviewed-by: Yite Gu <guyite@bytedance.com>

Merge pull request #64060 from zhscn/wip-seastore-2q

crimson/os/seastore: introduce 2Q cache replacement algorithm

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>

Merge pull request #64452 from xxhdx1985126/wip-72087

crimson/os/seastore/epm: make max_generation and gc_formula configurable

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>

Merge pull request #64617 from xxhdx1985126/wip-seastore-invalidate-logical

crimson/os/seastore/logical_child_node: LogicalChildNode should respond to the invalidation event

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

Merge pull request #63604 from guojidan/kv-tool

crimson: Add objectstore tool with partial functionality

Reviewed-by: Aishwarya Mathuria <amathuri@redhat.com>

Merge pull request #64070 from samarahu/samarahu-get-storage-admin

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>

Merge pull request #64733 from stackhpc/doc-fix-mclock-links

doc: Fix links to mClock config reference

Merge pull request #64466 from chanyoung/fix-list-complete

crimson/.../omap_btree_node_impl: fix complete flag for depth 2 omap scan

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>

qa/suites/crimson-rados: Introduce objectstore_tool testing

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

qa/tasks/ceph_objectstore_tool: Support Crimson tool

fixes: https://tracker.ceph.com/issues/71504

Signed-off-by: junxiang Mu <1948535941@qq.com>
Signed-off-by: Matan Breizman <mbreizma@redhat.com>

Merge pull request #64323 from guits/cv-seastore

ceph-volume: add seastore OSDs support

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Matan Breizman <mbreizma@redhat.com>
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>

doc/cephfs: edit ceph-dokan.rst (2 of x)

Edit the last half of doc/cephfs/ceph-dokan.rst. This is part of a
larger project whose goal is the improvement of the CephFS
documentation.

Follows https://github.com/ceph/ceph/pull/64690.

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

doc: Fix links to mClock config reference

Signed-off-by: Pierre Riteau <pierre@stackhpc.com>

Merge pull request #63555 from Matan-B/wip-matanb-crimson-asock-race-coro

crimson/osd: committed/handle_osd_maps into coroutines

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

Merge pull request #63270 from VinayBhaskar-V/wip-resync-changes

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

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>

Merge pull request #64601 from tchaikov/wip-dencoder-without-hitset

tools/ceph-dencoder: do not test HitSet types

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

Merge pull request #64705 from tchaikov/wip-pybind-setup-license-classifier

pybind: replace deprecated license classifiers with SPDX expression

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #64711 from idryomov/wip-72134-cont

qa/suites/krbd: request msgr1 explicitly in unmap subsuite

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

Merge pull request #64583 from ceph/wip-yuriw-release-19.2.3-main

doc: squid 19.2.3 release notes

Reviewed-by: Adam Emerson <aemerson@redhat.com>
Reviewed-by: Laura Flores <lflores@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>

Merge pull request #63348 from AliMasarweh/wip-alimasa-68183

RGW | fix conditional Delete, MultiDelete and Put

Reviewed-by: Casey Bodley <cbodley@redhat.com>, Matt Benjamin <mbenjamin@redhat.com>

Merge pull request #64503 from Matan-B/wip-matanb-crimson-misdirected-fix

crimson/osd/../client_request: fix is_misdirected

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

qa/suites/krbd: request msgr1 explicitly in unmap subsuite

Since commit 5011cc926cd4 ("qa/suites/krbd: run unmap subsuite with
msgr1 only"), unmap.t is run only against msgr1.  pre-single-major.yaml
kernel has actually been gone for some time now, but there is still
value in maintaining a msgr1-only test.  With the default switched to
msgr2 in commit a577f6fa405c ("krbd: "rbd device map" command should
use msgr2 by default"), msgr1 needs to be requested explicitly.

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

doc/man/rbd: update ms_mode default (legacy -> prefer-crc)

The default was switched to msgr2 in prefer-crc mode in commit
a577f6fa405c ("krbd: "rbd device map" command should use msgr2 by
default").

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

Merge pull request #63945 from ArbitCode/wip-raja-get-account-summary

rgw/iam: getAccountSummary API

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

doc/radosgw: get caller identity docs

Merge pull request #64289 from sseshasa/wip-mclock-new-benchmark-mechanism

src/ceph_osd, osd: Implement running benchmark during OSD creation - Phase 1

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

crimson/osd/../client_request: drop rwoedered with balanced/localize reads

This is the counterpart of https://github.com/ceph/ceph/pull/62806
Which fixes classical: https://tracker.ceph.com/issues/70715

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

crimson/osd/../client_request: rename is_misdirected and add logs

This function mainly verifies replicated read related info.

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

crimson/osd: handle_osd_map to coroutines

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

crimson/osd: committed_osd_maps into coroutines

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

crimson/osd: committed_osd_maps fix paramter types

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

Merge pull request #64593 from chanyoung/fix-omap-iterate

crimson/.../omap_btree_node_impl: fix inner node iterate

Reviewed-by: Xuehan Xu <xuxuehan@qianxin.com>

Merge pull request #64585 from myoungwon/wip-parallel-write-ool

crimson/os/seastore/rbm: improve large sequential write by issuing writes in parallel

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Xuehan Xu <xuxuehan@qianxin.com>

Merge pull request #64498 from xxhdx1985126/wip-seastore-io-block-time

crimson/os/seastore/async_cleaner: measure io block time

Reviewed-by: Matan Breizman <mbreizma@redhat.com>
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>

pybind: replace deprecated license classifiers with SPDX expression

Replace the deprecated "License :: OSI Approved :: GNU Lesser General
Public License v2 or later (LGPLv2+)" classifier with the SPDX license
expression "LGPL-2.0-or-later" in the license field.

Recent setuptools versions warn that license classifiers are deprecated
in favor of SPDX expressions in the license field. This change eliminates
the deprecation warning while maintaining the same licensing terms.

References:
- https://setuptools.pypa.io/en/stable/history.html#v77-0-0
- https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#license
- https://spdx.org/licenses/LGPL-2.0-or-later.html

The warning looked like:
```
[1/1] Generating ../../../lib/cython_modules/lib.3/rados.cpython-313-x86_64-linux-gnu.so
/usr/lib/python3.13/site-packages/setuptools/dist.py:759: SetuptoolsDeprecationWarning: License classifiers are deprecated.
!!

        ********************************************************************************
        Please consider removing the following classifiers in favor of a SPDX license expression:

        License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)

        See https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#license for details.
        ********************************************************************************

!!
  self._finalize_license_expression()
```

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

Merge pull request #64418 from ifed01/wip-ifed-discard-mkfs

os/bluestore: make full device discard on mkfs a default behavior

Merge pull request #64142 from phlogistonjohn/jjm-smb-ip-bind

smb: support custom ip address binds

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Anoop C S <anoopcs@cryptolab.net>

Merge pull request #64690 from zdover23/wip-doc-2025-07-25-cephfs-ceph-dokan

doc/cephfs: edit ceph-dokan.rst (1 of x)

doc/cephfs: edit ceph-dokan.rst (1 of x)

Edit the first 62 lines of doc/cephfs/ceph-dokan. This is part of a
larger project whose goal is the improvement of the CephFS
documentation.

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

Merge PR #64523 into main

* refs/pull/64523/head:

Reviewed-by: Laura Flores <lflores@redhat.com>

Merge pull request #64409 from bolzo/mds_disallow_root_fragmentation

MDS: disallow root directory fragmentation

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

Merge PR #64308 into main

* refs/pull/64308/head:

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

Merge PR #64297 into main

* refs/pull/64297/head:

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

Merge pull request #63524 from batrick/i71462

 mds: wrong snap check for directory with parent snaps

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

Merge PR #62554 into main

* refs/pull/62554/head:

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

Merge pull request #64465 from tchaikov/wip-crimson-formatter-sans-fmt-local

crimson/common: replace deprecated fmt::localtime() with localtime_r()

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

Merge pull request #63408 from aainscow/ec_recovery_zero_detect

OSD: EC recovery zero detect

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

doc/releases/squid: More notable changes in RGW

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

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

RGW | Added debugs in cases where precondition check fails

Signed-off-by: Ali Masarwa <amasarwa@redhat.com>

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>

doc/mgr: add documentation for bind_addrs option

Add some documentation for the bind_addrs option including a warning
about how combining public_addrs and bind_addrs gets quirky.

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

mgr/smb: add bind_addrs field to cluster resource type

Add bind_addrs, which is largely a wrapper around the service spec's
bind_addrs to the smb cluster resource.

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

cephadm: add support for specific network binds to smb service

Add a bunch of code to support specific IP address (and/or interface -
see below) binds for the smb service. When the smb service is not
clustered it is using container networking - in this case we use
publish options for the container manager to only listen on the supplied
addresses.

When the smb service is clustered we need to jump through a bunch of
hoops to configure each service individually. Many are easy with just
a short set of CLI options. CTDB only listens on the (first) node
address that it can bind to and only that. smbd has complex interactions
based on the `interfaces` and `bind interfaces only` config parameters.
Because these parameters may be unique to a node (addresses certainly
will be - and interfaces names could be) we can not store this in
the registry based conf. Instead, we take the slightly hacky approach
of generating a stub conf file with just the interfaces related params
in them and telling sambacc to generate a config that includes this
stub config.

IMPORTANT: When using ctdb with public addresses smbd doesn't know what
additional IPs it may need to listen to, so instead of binding to
a fixed IP we configure it to use an interface. This does have a
downside of possibly listening to another address on the same interface
we don't want it to. Additionally, I have observed that as addresses
are added or removed from the interface by ctdb, smbd doesn't
consistently start listening to those addresses.

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

mgr/cephadm: pass bind_networks with other smb config blobs

Tell the cephadm binary deploying an smb service about the networks
this smb service will be binding to.

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

mgr/cephadm: teach ctdb nodes logic about bind_addrs

Within the cephadm smb service class we have logic to help manage CTDB's
nodes. Ensure that this node handling logic also conforms to the recent
addition of the smb service's bind_addrs field.

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

mgr/cephadm: add filter_host_candidates method to smb service class

Add a filter_host_candidates method to the smb service class allowing
that class to act as a HostSelector. The HostSelector was added in an
earlier commit to allow classes like this one to make specific host
selections based on unique to that class (or it's spec) criteria.

This method uses the newly added `bind_addrs` field of the smb service
spec to ensure only hosts that meet the desired set of
networks/addresses get used in placement.

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

python-common/deployment: add bind_addrs and related type for smb

Add a `bind_addrs` field and `SMBClusterBindIPSpec` to the smb service
spec. If specified the `bind_addrs` field can contain one or more
SMBClusterBindIPSpec value. In JSON these values can contain either an
address `{"address": "192.168.76.10"}` or network `{"network":
"192.168.76.0/24"}`.

These specs will be used by cephadm to place the smb service only on
hosts that have IPs matching the supplied IP Address/Network values. It
will also instruct the smb services to only bind to these addresses.

A suggested future enhancement may be include an IP address range
representation for the SMBClusterBindIPSpec.

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

mgr/cephadm: teach serve.py about host selector support

A previous commit added a HostSelector protocol type to the schedule
code. This change makes it so the function calling upon the
HostAssignment class detects if a CephService provides a
filter_host_candidates method - meaning the service class can act as a
HostSelector. If the class can be a HostSelector pass it to the
HostAssignment so that the custom selection operation can be run.

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

mgr/cephadm: prepare schedule.py for per-service-type host filtering

Prepare schedule.py for per-service-type host filtering based on allowed
host addresses/networks. Add a new HostSelector protocol type to the
module defining what the filtering interface looks like.

This interface is intended allows CephService classes to "take over" the
network based filtering of nodes prior to placement and customize the
behavior of this step in cephamd's placement algorithm.

Note that the type must be passed in to the HostAssignment class as an
optional argument. If nothing is passed the class behaves as it did
before.

Signed-off-by: John Mulligan <jmulligan@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>

ceph.spec.in: install crimson-objectstore-tool

Include the tool when packaging for deb/rpm.

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

Crimson: Implement crimson-objectstore-tool

fixes: https://tracker.ceph.com/issues/71504

Signed-off-by: junxiang Mu <1948535941@qq.com>
Signed-off-by: Matan Breizman <mbreizma@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>

crimson/os/seastore/logical_child_node: LogicalChildNode should respond
to the invalidation event

Although this is not causing any damage for now, it's violating the
invariant that invalid linked child nodes mustn't have parents.

Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>

Merge pull request #64543 from phlogistonjohn/jjm-bib

src/script/build-integration-branch improvements

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

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

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

This commit fixes the issue only for snapshot based mirroring mode

Fixes: https://tracker.ceph.com/issues/70948
Signed-off-by: VinayBhaskar-V <vvarada@redhat.com>

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>