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>

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 pull request #64526 from bluikko/doc-objects-dedup-improvements-radosgw

doc/radosgw: Small improvements in s3_objects_dedup.rst

Merge pull request #64513 from gbregman/main

mgr/cephadm/nvmeof: Add Prometheus fields to NVMeOF spec file

Merge pull request #64433 from NitzanMordhai/wip-nitzan-mgr-notify_types-docs-update

doc: update mgr modules notify_types

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

Merge pull request #64391 from ljflores/wip-tracker-70917

test/rbd: remove unit tests about cache tiering

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

Merge pull request #64520 from tchaikov/wip-librados-c-iwyu

librados: remove unused includes in librados_c.cc

Reviewed-by: Nitzan Mordechai <nmordech@redhat.com>

doc/radosgw: Small improvements in s3_objects_dedup.rst

Fix sentence that had "different same" to just "different" (verified the
right one from the original author).

Remove colon at the end of section titles.

Remove rendered horizontal lines between sections.

Use double backticks for command name.

Use regular apostrophe in one sentence to be consistent with the rest.

Add missing full stop at the end of several sentences.

Very small language improvements in a few sentences.

Use consistent indent in one line.

Remove hyphens from many word pairs and don't capitalize few terms.
For consistency with rest of the docs.

Fix typos "spliting" to "splitting", "underlined" to "underlying".

Spell out "thousands" instead of using an apostrophe after the number.

Reformat table to use row separators like rest of the docs instead of
empty columns.
Separate number and unit with a space. Remove rendered underscores that
seemed to be an attempt to imprecisely align cell contents to right.

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

Merge pull request #63414 from tchaikov/osd-variant

osd: migrate from boost::variant to std::variant

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

Merge pull request #64121 from JonBailey1993/ceph_test_rados_io_sequence_chunksize_selection_bug_fix

test/osd: Fix issue where ceph_test_rados_io_sequence could select a chunksize of zero

Merge branch 'ceph:main' into main

Merge pull request #62701 from rhcs-dashboard/notification-create-api

mgr/dashboard: Notification endpoints for create ,list and delete

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

Merge PR #64325 into main

* refs/pull/64325/head:
mdstypes: Dump export_ephemeral_random_pin as double

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

Merge pull request #64518 from adk3798/fix-smb-sd-config-unit-test-cephadm

mgr/cephadm: fixing SMB service discovery UT

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

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

Merge pull request #64349 from nbalacha/wip-nbalacha-71731

rgw: fix bucket logging AuthType field

osd: migrate from boost::variant to std::variant

Replace boost::variant with std::variant throughout the OSD-related
codebase. This change reduces third-party dependencies by leveraging
the C++ standard library alternative.

Changes:
- common/inline_variant.h: Replace the existing match() helper with a
  wrapper around std::visit. The previous implementation constructed a
  visitor class from given functions; the new implementation provides
  equivalent functionality using standard library primitives.

- osd/osd_types.h: Add templated operator<< overload for std::variant.
  Since boost::variant provided a built-in operator<< that we relied on,
  and std::variant does not include this functionality, we implement our
  own formatter. To avoid ambiguous overload resolution (where types
  implicitly convertible to variant alternatives could match both the
  variant formatter and their native formatters), the template requires
  at least one alternative type parameter.

This migration maintains existing functionality while eliminating the
boost::variant dependency.

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

Merge pull request #63184 from JonBailey1993/ec_optimisation_deep_scrubbing_implementation

OSD: Optimised EC Deep Scrubbing Implementation

Merge pull request #64355 from xxhdx1985126/wip-71976

crimson/os/seastrore/omap_manager: initialize rewritten omap nodes when

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

Merge pull request #64401 from cyx1231st/wip-yingxin-fix-extent-lifecycle-upon-load

crimson/os/seastore/cache: extend extent lifecycle after wait-io

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

Merge pull request #64489 from chanyoung/cleanup-test-omap-replay

test/crimson/seastore/test_omap_manager: redesign test replay

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

Merge pull request #64499 from chanyoung/fix-leafnode-test

test/crimson/seastore/test_omap_manager: redesign test leafnodes

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

librados: remove unused includes in librados_c.cc

Remove unused header includes from librados_c.cc to reduce unnecessary
dependencies. This cleanup was initially motivated by removing unused
linkage of cls_lock_client, but expanded to address all unused includes
in the file.

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

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>

test: remove unit tests about cache tiering

Cache tiering was deprecated in the Reef release,
so we are no longer supporting any issues related
to it.

Ref: https://docs.ceph.com/en/latest/rados/operations/cache-tiering/

Fixes: https://tracker.ceph.com/issues/70917
Signed-off-by: Laura Flores <lflores@ibm.com>

mgr/cephadm: fixing SMB service discovery UT

Signed-off-by: Redouane Kachach <rkachach@ibm.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>

mgr/cephadm/nvmeof: Add Prometheus filds to NVMeOF spec file.

Fixes: https://tracker.ceph.com/issues/72142
Signed-off-by: Gil Bregman <gbregman@il.ibm.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

test/osd: Unit test to verify optimised EC deep scrub functionality

Signed-off-by: Jon Bailey <jonathan.bailey1@ibm.com>

test/osd: Add erasure coded pools support to test_scrubber_be.cc

Signed-off-by: Jon Bailey <jonathan.bailey1@ibm.com>

osd: Deep scrubbing implementation for optimised erasure coding

Signed-off-by: Jon Bailey <jonathan.bailey1@ibm.com>

mgr/dashboard: Notification endpoints for create ,list and delete

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

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>

test/crimson/seastore/test_omap_manager: redesign test leafnodes

Fixes: https://tracker.ceph.com/issues/72127
Signed-off-by: Chanyoung Park <chaney.p@kakaoenterprise.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>

test/crimson/seastore/test_omap_manager: redesign test replay

Signed-off-by: Chanyoung Park <chaney.p@kakaoenterprise.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

common: Add iterator traits to mini_flat_map and bitset_set iterator

Add iterator traits to mini_flat_map and bitset_set iterator to allow std algorithms to be able to perform operations using the mini_flat_map iterator

Signed-off-by: Jon Bailey <jonathan.bailey1@ibm.com>

erasure-code: Add new flag for whether plugins support encoding/decoding or CRCs

Add new flag for whether plugins support encoding/decoding or CRCs to get the CRC of what the encoded/decoded data would be.

Signed-off-by: Jon Bailey <jonathan.bailey1@ibm.com>

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>