Merge pull request #62982 from samarahu/wip-rgw-d4n-next-test

rgw: D4N Test Updates

Reviewed-by: Pritha Srivastava <prsrivas@redhat.com>

Merge pull request #64158 from tchaikov/wip-doc-ext-cleanup

doc/_ext: cleanups

Merge pull request #61020 from MaxKellermann/kvstore_tool__ifdef_WITH_BLUESTORE

tools/kvstore_tool: add missing `#ifdef WITH_BLUESTORE`

Reviewed-by: Igor Fedotov <igor.fedotov@croit.io>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #64261 from tchaikov/wip-cmake-cls_rbd_client-with-neorados

cmake: Remove unused cls_lock_client linkage

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

Merge pull request #62530 from liu-chunmei/omap_iterate

crimson: implement crimson Omap iterate interface

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

Merge pull request #64184 from kshtsk/wip-allow-cephadm-container-image-tag

qa/tasks/cephadm: override container image tags

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

Merge pull request #63162 from Kushal-deb/fix_issue-2323601-trust-both-sites-rgw-certs-from-a-node

mgr/cephadm: include cluster FSID in root CA Common Name (CN)

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

Merge pull request #62808 from adk3798/mgr-rgw-fix-re-realm-bootstrap-after-deletions

mgr/rgw: don't fail realm bootstrap if system user exists already

Reviewed-by: Redouane Kachach <rkachach@ibm.com>

Merge pull request #59889 from adk3798/alertmanager-custom-webhook

mgr/cephadm: fix custom alertmanager webhooks

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

Merge pull request #61017 from ShwetaBhosale1/fix_issue_69174_ceph_orch_apply_command_accepts_both_positional_and_keyword_argument

mgr/cephadm: Ceph orch apply command does not give error if 'placement' is passed as both positional and keyword argument

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

Merge pull request #62927 from ShwetaBhosale1/fix_issue_71031_add_Monitoring_Addr_param_to_ganesha.conf

mgr/nfs: Add Monitoring_Addr parameter to ganesha.conf and provide option for user to provide ips for bind_addr

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>

Merge pull request #62984 from JoshuaGabriel/jblanch_71087

mgr/cephadm: disallow changing OSD service type to non-OSD types

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

Merge pull request #63563 from adk3798/cephadm-no-new-daemon-on-port-change-mid-upgrade

mgr/cephadm: don't remove and deploy new daemon if ports change during upgrade

Reviewed-by: Shweta Bhosale <Shweta.Bhosale1@ibm.com>

Merge pull request #63952 from jimfunk/get_ceph_cluster_count_missing_data_dir

cephadm: Get ceph cluster count missing data dir

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

Merge pull request #64385 from rhcs-dashboard/prometheus-http-service-fix

mgr/prometheus: fix metrics service not coming up

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

Merge pull request #64477 from gbregman/main

mgr/cephadm/nvmeof: Increase the default limit of max_namespaces

cmake: Remove unused cls_lock_client linkage

Remove unused cls_lock_client linkage from cls_rbd_client and ceph_test_cls_rbd

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

mgr/cephadm/nvmeof: Increase the default limit of max_namespaces
Fixes https://tracker.ceph.com/issues/72108

Signed-off-by: Gil Bregman <gbregman@il.ibm.com>

Merge pull request #63232 from amathuria/wip-amat-update-seastar

seastar: bump up seastar submodule

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

crimson/os: drop off omap_get_values with start

Signed-off-by: chunmei liu <chunmei.liu@ibm.com>

osd/SnapMapper: replace omap_get_values by omap_iterate in get_next

Signed-off-by: Chunmei Liu <chunmei.liu@ibm.com>

test/crimson/seastore: check_omap replace omap_get_values by omap_iterate

Signed-off-by: chunmei liu <chunmei.liu@ibm.com>

osd/PGLog.cc: replace omap_get_values by omap_iterate

Signed-off-by: chunmei liu <chunmei.liu@ibm.com>

crimson/osd/../scrub_events: replace omap_get_values() by omap_iterate()

Signed-off-by: chunmei liu <chunmei.liu@ibm.com>

crimson/osd/replicated_recovery_backend: replace omap_get_values() by omap_iterate()

Signed-off-by: chunmei liu <chunmei.liu@ibm.com>

crimson/osd/pg_backend: replace omap_get_keys/vals() by omap_iterate()

needn't scan the entire omap tree.

Signed-off-by: chunmei liu <chunmei.liu@ibm.com>

test/crimson/seastore/test_omap_manager: test omap_iterate()

Signed-off-by: chunmei liu <chunmei.liu@ibm.com>

crimson/os: add omap_iterate interface to futurized store

Signed-off-by: chunmei liu <chunmei.liu@ibm.com>

Merge PR #64487 into main

* refs/pull/64487/head:
script/redmine-upkeep: add Filter class

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

script/redmine-upkeep: add Filter class

To add priority and clarity of organization.

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

Merge PR #64486 into main

* refs/pull/64486/head:
script/redmine-upkeep: codify commit abbreviation

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

Merge PR #64446 into main

* refs/pull/64446/head:
script/redmine-upkeep: handle invalid PRs

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

script/redmine-upkeep: codify commit abbreviation

As it can vary depending on repository size. On my development machine, it
produces 8 character abbreviations but the github action is producing 7
character abbreviations. This triggers unnecessary updates.

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

Merge PR #64461 into main

* refs/pull/64461/head:
.github/workflows/redmine-upkeep: use pull_request_target

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

Merge PR #64468 into main

* refs/pull/64468/head:
mailmap, githubmap, organizationmap: Add Kautilya

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

Merge pull request #64483 from zdover23/wip-doc-2025-07-15-pr-64374-followup

doc: add note admonitions in two files

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

doc: add note admonitions in two files

Add note admonitions when discussing client package support in the
context of OS Recommendations in the following two files:

- doc/cephfs/ceph-dokan.rst
- doc/rbd/rbd-windows.rst

This addresses a change requested by Ilya Dryomov in
https://github.com/ceph/ceph/pull/64374#discussion_r2199756581.

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

Merge pull request #64470 from Matan-B/wip-matanb-crimson-rbd-py

test/pybind/test_rbd.py: remove skip_if_crimson

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

Merge pull request #64374 from anthonyeleven/update-msw-support

doc: Clarify the status of MS Windows client support

doc: Clarify the status of MS Windows client support

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

qa/d4n: Update D4N suite

Signed-off-by: Samarah <samarah.uriarte@ibm.com>

rgw/d4n: Add shutdown calls to unit tests and save yield in filter

Signed-off-by: Samarah <samarah.uriarte@ibm.com>

test/d4n: Add length to bufferlist vars

Signed-off-by: Samarah <samarah.uriarte@ibm.com>

test/d4n: Add dout initalization during env setup

Signed-off-by: Samarah <samarah.uriarte@ibm.com>

test/d4n: Set config_store_type to dbstore

Signed-off-by: Samarah <samarah.uriarte@ibm.com>

Merge pull request #64333 from mohit84/seastore_magic

crimson/os/seastore: write "seastore block device" signature in write_superblock

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

Merge pull request #64432 from tchaikov/wip-cls-rbd-iwyu

cls/rbd: remove unused includes

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

Merge pull request #62813 from smanjara/wip-fix-delete-object-tagging

rgw/multisite: sync object tagging deletion

Merge pull request #63080 from bluikko/doc-caching-improvements-radosgw

doc/radosgw: Improve rgw-cache.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Reviewed-by: Zac Dover <zac.dover@proton.me>

Merge pull request #64462 from anthonyeleven/fusefix

doc/cephfs: Improve mount-using-fuse.rst

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

cls/rbd: remove unused includes

- Remove unused #include "cls/lock/cls_lock_client.h" from
  cls_rbd_client.cc.
- Remove unused includes in test_cls_rbd.cc

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

test/pybind/test_rbd.py: remove skip_if_crimson

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

install-deps.sh: use gcc-12 for ubuntu jammy

Clang relies on the system's libstdc++ headers for standard C++
features. On Ubuntu Jammy, gcc-11 is the default and it's libstdc++ is
missing some of the newer features supported by C++20.

This causes build failures as certain standard headers are incomplete.
To fix this, we install gcc-12 explicitly so that Clang can pick up the
newer libstdc++ headers.

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

crimson/tools: remove usage of deprecated function at_exit()

at_exit() is now deprecated, in place of that we will explicitly
call stop() for the sharded objects.

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

crimson/tools: Remove usage of at_exit()

at_exit() is deprecated in seastar. Make use of deferred_stop instead.

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

crimson/test_messenger: remove usage of deprecated function at_exit()

at_exit() is now deprecated, in place of that we will explicitly
call stop() for the sharded objects.

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

seastar: bump up seastar submodule

Update branch to wip-amat-seastar-may-25
https://github.com/ceph/seastar/tree/wip-amat-seastar-may-25

Fixes: https://tracker.ceph.com/issues/71184
Signed-off-by: Aishwarya Mathuria <amathuri@redhat.com>

Merge pull request #64362 from rhcs-dashboard/edit-bucket-with-account

mgr/dashboard: differentiate account users from rgw users in bucket form

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

mailmap, githubmap, organizationmap: Add Kautilya

Signed-off-by: Kautilya Tripathi <kautilya.tripathi@ibm.com>

Merge pull request #64259 from tchaikov/wip-cmake-osdc-without-error_code

cmake: remove error_code.cc from osdc to fix ODR violation

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

cmake: remove osdc/error_code.cc from osdc to fix ODR violation

Fix AddressSanitizer ODR (One Definition Rule) violation caused by
osdc/error_code.cc being compiled into both the osdc library and
ceph-common library.

The violation occurred because osdc_error_category was defined in
both the rbd binary (via osdc) and libceph-common.so, creating
duplicate symbols at runtime.

Since all targets that link against osdc also link against
ceph-common, removing osdc/error_code.cc from osdc doesn't break the
build while eliminating the duplicate definition.

ASan error sample:

```
  ==857433==ERROR: AddressSanitizer: odr-violation (0x5612ad665760):
    [1] size=22 'typeinfo name for osdc_error_category' /home/jenkins-build/build/workspace/ceph-pull-requests/src/osdc/error_code.cc in /home/jenkins-build/build/workspace/ceph-pull-requests/build/bin/rbd
    [2] size=22 'typeinfo name for osdc_error_category' /home/jenkins-build/build/workspace/ceph-pull-requests/src/osdc/error_code.cc in /home/jenkins-build/build/workspace/ceph-pull-requests/build/lib/libceph-common.so.2
  These globals were registered at these points:
    [1]:
      #0 0x5612acd62c88 in __asan_register_globals (/home/jenkins-build/build/workspace/ceph-pull-requests/build/bin/rbd+0x815c88) (BuildId: 62a02cbbf3426e5470e16372e3b53a18cb18ce0f)
      #1 0x5612acd63d59 in __asan_register_elf_globals (/home/jenkins-build/build/workspace/ceph-pull-requests/build/bin/rbd+0x816d59) (BuildId: 62a02cbbf3426e5470e16372e3b53a18cb18ce0f)
      #2 0x7f28d3b02eba in call_init csu/../csu/libc-start.c:145:3
      #3 0x7f28d3b02eba in __libc_start_main csu/../csu/libc-start.c:379:5
```

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

Merge pull request #64329 from afreen23/cd-icon

mgr/dashboard: Add generic component for icons

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

Merge pull request #64426 from tchaikov/wip-cxx-23

cmake: upgrade CMAKE_CXX_STANDARD from 20 to 23

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

Merge pull request #64447 from afreen23/smb-fix

mgr/dashboard: Fix smb module enablement

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

Merge pull request #64405 from rhcs-dashboard/72039-add-tab-structure-to-fs-page

mgr/dashboard: add tab structure to File Systems page and embed Ceph-Filesystem Overview dashboard

Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Ankush Behl <cloudbehl@gmail.com>
Reviewed-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>

Merge pull request #64445 from rhcs-dashboard/70720-input-field-black-on-selecting-autofill-input

mgr/dashboard: fixed input field black after selecting an autofill browser input

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

doc/cephfs: Improve mount-using-fuse.rst

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

.github/workflows/redmine-upkeep: use pull_request_target

So that we can access the action secrets.

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

Merge pull request #64327 from rhcs-dashboard/71907-remove-grafana-time-picker

mgr/dashboard: Remove the time dropdown from grafana iframe.

Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Ankush Behl <cloudbehl@gmail.com>
Reviewed-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>

mgr/dashboard:Fixed issue with clipboard icon

- clipboard icon not displaying breaking several places
- cliboard icon on click gets filed primary green color losing the visibilty of icon. The icon now remain visible on click
- clipboard button for path and copy in tables on mouseover does not give `hand` but `cursor`. which was not ideal from a usability standpoint. This behavior has been updated to use the hand cursor making the interaction semantically correct and more intuitive for users.

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

Merge pull request #64386 from cbodley/wip-72020

deb/mgr: remove deprecated distutils from ceph-mgr.requires

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

mgr/dashboard: Fix smb module enablement

- changed prop name to `module_name` to avoid confusion while pasisng input props
- the module name is required to enable module

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

Merge pull request #63852 from yuvalif/wip-yuval-multi-base-port

mstart: allow setting the base mon port from env variable

Merge pull request #64390 from Hezko/nvmeof-cli-missing-cmnds

mgr/dashboard: add missing commands for subsystem: change_key and del…

mgr/dashboard: fixed input field black after selecting an autofill browser input
fixes: https://tracker.ceph.com/issues/70720

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

Merge pull request #64305 from joscollin/wip-70441-counters-rmsnap

qa: increase the wait time to prevent check_counter failing

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

Merge pull request #63879 from ceph/BBoozmen-patch-1

rgw_rest_s3.cc: update how we report bucket quota cfg info for max size (bytes) and max objects

Merge pull request #63759 from adamemerson/wip-config-recovery-interval

rgw/multisite: Remove generally unneeded hourly runs of recovery

Merge pull request #64226 from tchaikov/wip-ec-jerasure-fix-leak

erasure-code/jerasure: fix memory leak in Galois field operations

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

mgr/dashboard: add missing commands for subsystem: change_key and del_key and missing params for host add

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

Merge pull request #63960 from aainscow/ec_remove_hinfo

osd: Remove all references to hinfo from optimized EC

Reviewed-by: Bill Scales <bill_scales@uk.ibm.com>

script/redmine-upkeep: handle invalid PRs

Leave a comment on the issue so a human can fix it.

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

Merge PR #64417 into main

* refs/pull/64417/head:
script/redmine-upkeep: trigger on merged PRs
.github: fix workflow format error

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

mgr/dashboard: differentiate account users from rgw users in bucket form

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

commit includes:
1) Added checkbox to select account user and another dropdown to show account users
2) Also fixed bucket replication as it was throwing error for 'invalidBucketARN'

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

Merge pull request #63851 from aainscow/timestamps_ceph_test_rados

test: Add optional timestamps to ceph_test_rados

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Bill Scales <bill_scales@uk.ibm.com>

Merge pull request #64310 from phlogistonjohn/jjm-smb-remotectl-prefactor

mgr/smb: general refactoring with the intent of making future additions easier

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Anoop C S <anoopcs@samba.org>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>

Merge pull request #64429 from ronen-fr/wip-rf-noempty

qa/standalone/scrub: fix "scrubbed in 0ms" in osd-scrub-test.sh

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

Merge pull request #64335 from anmolbabu/ fixes 2345460

Handle failures in metric parsing

Merge pull request #64290 from cbodley/wip-49135

rgw/s3: fix PutObject's canned_acl comparisons for BlockPublicAcls

Reviewed-by: Adam Emerson <aemerson@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@cern.ch>

Merge pull request #64361 from soumyakoduri/wip-skoduri-zoneparams-vers

 rgw: Fix the version of restore_pool and dedup_pool

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

Merge pull request #63897 from Shwetha-Acharya/configurable_mmc_options

mgr/smb: Add configurable options to share

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Anoop C S <anoopcs@samba.org>
Reviewed-by: John Mulligan <jmulligan@redhat.com>

mgr/dashboard: add tab structure to File Systems page and embed Ceph-Filesystem Overview dashboard
fixes: https://tracker.ceph.com/issues/72039
Signed-off-by: Abhishek Desai <abhishek.desai1@ibm.com>

osd: Remove all references to hinfo from optimized EC

    Legacy EC used hinfo to store two things:
    1. Shard size
    2. CRCs of the shards

    However:
    * Optimized EC stores different object sizes on each shard
    * Optimized EC scrub calculates the correct sizes of shards and checks them, so shard size checks are not needed in hinfo.
    * Bluestore checks the CRC.
    * Seastore checks the CRC.

    As such, the hinfo object is redundant. As such we remove it in
    optimized EC:

    1. Remove all references/upgrades to hinfo.
    2. Delete hinfo attribute if found on recovery/backfill.
    3. Redirect all scrub references for hinfo to legacy EC.

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

qa: increase the wait time to prevent check_counter failing

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

erasure-code/jerasure: fix memory leak in Galois field operations

Fix a memory leak where Galois field acceleration functions created by
ErasureCodeJerasure::prepare() were never freed. ASan detected this as
a one-time leak when the plugin was unloaded.

Add jerasure_finish() destructor function in jerasure_init.cc to free
the allocated Galois field operations. Since jerasure_init.cc and
galois.c are built into the same object library, jerasure_finish() can
access and clean up the global static acceleration functions defined
in galois.c.

The destructor function is automatically called when the shared library
(plugin) is unloaded, ensuring proper cleanup without requiring explicit
calls from client code.

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

Merge pull request #64223 from tchaikov/wip-ec-clay-cleanups

erasure-code/clay: minor cleanups

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

mgr/prometheus: fix metrics service not coming up

https://github.com/ceph/ceph/pull/61468 unintentionally broke the http
metric service while it removed the code that starts the metrics. adding
them back up.

adding a basic test to catch these issues

Regression from https://github.com/ceph/ceph/pull/61468/commits/64f590cc8f03c9aab909c3ea5b9f53271ba3c15b#diff-031e09c4297d84a407cf55f8981d38764efc3c37e9827e12e638521f69284e1f

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

seastore: support validating device signature for ceph-lvm

Write the SEASTORE_SUPERBLOCK_SIGN at offset 0 before
encoding the superblock. If the signature is added inside
the block_sm_superblock_t structure (via DENC), it won't be
written at offset 0 because DENC encoding add some metadata.
Therefore prepend the signature to the bufferlist before
encoding the superblock sothat signature always appears at the
start of the written data

Fixes: https://tracker.ceph.com/issues/71954
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>

qa/standalone/scrub: fix "scrubbed in 0ms" in osd-scrub-test.sh

The specific test looks for a 'last scrub duration' higher than
0 as a sign that the scrub actually ran.  Previous code fixes
guaranteed that even a scrub duration as low as 1ms would be
reported as "1" (1s).  However, none of the 15 objects created
in this test were designated for the tested PG, which remained
empty.  As a result, the scrub duration was reported as "0".

The fix is to create a large enough number of objects so that
at least one of them is mapped to the tested PG.

Fixes: https://tracker.ceph.com/issues/71801
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

Merge pull request #63844 from aainscow/internal_map_non_const_iters

interval_map: Add non-const iterators

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