found duplicate series for the match group {fs_id="-1"}

when 1 MDS active and 2 MDS standby (on 3Node-Cluster)
found duplicate series for the match group {fs_id="-1"} on the right hand-side of the operation
many-to-many matching not allowed: matching labels must be unique on one side

Fixes: https://tracker.ceph.com/issues/75754
Signed-off-by: bst2002git <bst2002@ios.dhs.org>

Merge pull request #68100 from bluikko/wip-doc-sphix-warnings-202604

doc: Fix Sphinx warnings

Merge pull request #68110 from aainscow/tentacle-exclude

qa: Exclude missing ceph-osd-classic and ceph-osd-crimson from tentacle installs.

Reviewed-by: Shraddha Agrawal <shraagra@in.ibm.com>

Merge pull request #67766 from VallariAg/wip-nvmeof-auto-listener-cli

mgr/dashboard: Add 'network_mask' to nvmeof cli

qa: Exclude missing ceph-osd-classic and ceph-osd-crimson from tentacle installs.

The upgrade from tentacle builds were failing because the system was attempting
to install packages whose names were changed in Umbrella.

We use the same workaround previously used for squid.

Fixes: https://tracker.ceph.com/issues/75730
Signed-off-by: Alex Ainscow <aainscow@uk.ibm.com>

Merge pull request #68104 from shraddhaag/wip-shraddhaag-fix-upgrades

qa/tasks/cephadm.py: only pass --objectstore when not bluestore

mgr/dashboard: Add 'network_mask' to nvmeof cli

This commit add the following to nvmeof cli:
0. Add new param `--network-mask` to 'subsystem add' cmd
   It's a list parameter so we can pass multiple netmask by
   `subsystem add --network-mask <subnet1> --network-mask <subnet2>`
1. Add new cli `subsystem add_network --network-mask <subnet>`
2. Add new cli `subsystem del_network --network-mask <subnet>`
3. Add column 'network_mask' to `subsystem list` output
4. Add column 'manual' to `listener list` output

Fixes: https://tracker.ceph.com/issues/75348
Signed-off-by: Vallari Agrawal <vallari.agrawal@ibm.com>

Merge pull request #67996 from guits/fix-cv-nvme-vendor

ceph-volume: fix vendor detection for nvme devices

Merge pull request #67624 from ujjawal-ibm/filter-devices

ceph-volume: skip cdrom devices in inverntory

Merge pull request #67891 from guits/tracker_75615

ceph-volume: fix inventory without /dev/vg/lv (slashed paths)

qa/tasks/cephadm.py: only pass --objectstore when not bluestore

This commit ensure that we only pass --objectstore argument to
cephadm's add/apply OSD command only when the value is not the
default value, bluestore.

This is done to ensure older ceph releases, like Squid and Tentacle
do not fail, as --objectstore argument was only added in Umbrella.

Fixes: https://tracker.ceph.com/issues/75731
Signed-off-by: Shraddha Agrawal <shraddha.agrawal000@gmail.com>

doc: Fix Sphinx warnings

Fix indentation and section title underline.
Fixes six Sphinx warnings.

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

Merge pull request #68066 from rhcs-dashboard/ui-empty-subvol-info-fix

mgr/dashboard: fix subvolume group corruption from smb share form

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

Merge pull request #66920 from kamoltat/wip-ksirivad-osd-df

src/osd/OSDMap.cc: Display SUM of PGs in ceph osd df

Merge pull request #66824 from NitzanMordhai/wip-nitzan-activepymodules-perf-schema-labels-pyformatter

mgr/ActivePyModules: fix dangling string_view in get_perf_schema_python

Merge pull request #65987 from MattyWilliams22/wip-compiler-independent-rng

IO Generator: Change random number generator to be compiler independent

Merge pull request #65939 from MattyWilliams22/wip-error-message-detail

IO Generator: Add debug to DataGeneration validation failure output

Merge pull request #65875 from MattyWilliams22/wip-plugin-ec-optimisations

test: Exit with relevant error message when enabling EC optimisations fails

Merge pull request #68099 from sunyuechi/remove-dead-arch

common: remove unused arch.h

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

Merge pull request #68020 from nbalacha/wip-nbalacha-rgw-typos

rgw/radosgw-admin: minor typo fixes

Merge pull request #68090 from tchaikov/wip-crimson-args

crimson/osd: fix wrong log arguments in get_option_value and _get_early_config

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

common: remove unused arch.h

This header has been dead code since 964a0a6e132

Signed-off-by: Sun Yuechi <sunyuechi@iscas.ac.cn>

crimson/osd: fix wrong log arguments in get_option_value and _get_early_config

Both log calls referenced option.config_key (the ceph config key name)
where option.option_name (the CLI flag) was intended:

  logger().warn("get_option_value --option_name {} ...", option.config_key);
  logger().info("Configure option_name {} with value : {}", option.config_key, ...);

Fix both to log option.option_name. Also remove the trailing space
before the colon in the info format string.

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

Merge pull request #67192 from indirasawant/wip-isawant-rfe-osd-health-warn

os/bluestore: add health warn for shared DB/WAL ratio

Reviewed-by: Igor Fedotov <igor.fedotov@croit.io>

Merge pull request #67992 from VallariAg/wip-nvmeof-submodule-172

mgr/dashboard: bump nvmeof submodule to 1.7.2

Merge pull request #68083 from lumir-sliva/fix-received-typos

src: fix 'recieved' typo across codebase

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

Merge pull request #68047 from leiwen2025/rv64-crc32c

src/arch: fix hwprobe include path and ZBC/ZVBC offsets for riscv64

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

Merge pull request #68081 from lumir-sliva/fix-running-tests-locally-typos

doc/dev: fix typos in running-tests-locally.rst

doc/dev: fix typos in running-tests-locally.rst

Fix grammar error ('is be tested' -> 'can be tested'), misspellings
of 'bootstrap', 'teuthology', and 'environment', a repeated word
('manually manually'), and a missing article ('maybe bootstrap' ->
'maybe the bootstrap').

Signed-off-by: Lumir Sliva <lumir.sliva@firma.seznam.cz>

src: fix 'recieved' typo across codebase

Fix misspelling of 'received' in comments, log messages, and perf
counter descriptions across mon, osd, erasure-code, and common.

Signed-off-by: Lumir Sliva <lumir.sliva@firma.seznam.cz>

Merge pull request #68082 from lumir-sliva/fix-dev-guide-docs

doc: fix typos and outdated refs across developer guide

doc: fix typos and outdated refs across developer guide

Fix 'elipsis' to 'ellipsis' in SubmittingPatches.rst, update
outdated 'master' branch references to 'main' in essentials.rst
and running-tests-locally.rst, fix 'sometime' to 'sometimes' in
merging.rst, and remove duplicated word in teuthology-intro.rst.

Signed-off-by: Lumir Sliva <lumir.sliva@firma.seznam.cz>

Merge pull request #68080 from lumir-sliva/fix-basic-workflow-typo

doc/dev: fix typo in basic-workflow.rst

doc/dev: fix typo in basic-workflow.rst

Fix 'sometimeseven' to 'sometimes even' in the Code Review
section of the developer guide.

Signed-off-by: Lumir Sliva <lumir.sliva@firma.seznam.cz>

mgr/dashboard: fix subvolume group corruption from smb share form

the SMB share form accidentally corrupts the subvolume group when it
issues a call to the subvolume_info API with an empty subvol_name which
then corrupts the group entirely and the following subvolume creation
gets failed.

The fix is to not call subvol_info with an empty name.

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

Merge PR #67965 into main

* refs/pull/67965/head:
mon: fix source file permissions

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

Merge pull request #67963 from ronen-fr/wip-rf-random-bench

osd: run_bench() - unify Crimson/Classic randomness implementation

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

src/arch: fix hwprobe include path and ZBC/ZVBC offsets for riscv64

Signed-off-by: WenLei <lei.wen2@zte.com.cn>
Fix runtime detection of RISC-V ZBC and ZVBC crypto extensions.

Problems fixed:
- <sys/hwprobe.h> only exists in glibc >= 2.40 (released 2024-07-22).
  Many production RISC-V distros still use older glibc (Ubuntu 22.04: 2.35,
  Debian 12: 2.36, etc.) and would fail to compile.
  Therefore we switch to the kernel UAPI header <asm/hwprobe.h>,
  which works with all current glibc versions.
  Proof:
  - Absent in glibc 2.39:
    https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/riscv/sys/hwprobe.h;hb=refs/tags/glibc-2.39
  - Present in glibc 2.40:
    https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/riscv/sys/hwprobe.h;hb=refs/tags/glibc-2.40
  - Introducing commit:
    https://sourceware.org/git/?p=glibc.git;a=commit;h=426d0e1aa8f17426d13707594111df712d2b8911

- Incorrect fallback bit positions:
  - RISCV_HWPROBE_EXT_ZBC was (1ULL << 15) → should be (1ULL << 7)
  - RISCV_HWPROBE_EXT_ZVBC was (1ULL << 20) → should be (1ULL << 18)

Signed-off-by: WenLei <lei.wen2@zte.com.cn>

Merge pull request #67829 from sseshasa/wip-fix-test-backfilltoofull-with-compression

qa/tasks/backfill_toofull.py: Fix assert failures with & without compression

Reviewed-by: Bill Scales <bill_scales@uk.ibm.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

Merge pull request #68021 from yuvalif/wip-yuval-75712

test/rgw/notification: fix rabbitmq dependency for rocky10

Merge pull request #68045 from rhcs-dashboard/fix-subsystem-creation

mgr/dashboard: fix subsystem creation issue

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

osd/run_bench(): modify perform_write_test() to adopt Crimson's
randomness implementation.

Changed from memset with a single random byte to std::generate_n()
with per-byte randomness, matching Crimson.

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

Crimson/osd/run_bench(): make randomness follow Classic more closely

Direct gen() calls for randomness: Crimson uses dis(gen) % onum and
dis(gen) % (osize / bsize) to pick random object indices and
offsets, which limits the range to 0–255. Classic uses mt19937s
directly, allowing the full 32-bit range of randomness.

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

Merge pull request #68015 from pkalever/improve-mirror-image-status

rbd: improve mirror image status and validation error messages

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

Merge pull request #67768 from rhcs-dashboard/fix-75449-main

mgr/dashboard: use osd metrics in performance charts and remove storage type filter

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

mgr/dashboard: fix subsystem creation issue

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

Merge pull request #68030 from gbregman/main

mgr/cephadm: Add KMIP server support for NVMeoF gateway

rbd: improve mirror image status and validation error messages

When a mirror image is left in a transitional state such as DISABLING,
the current mirror image status command reports:

  $ rbd mirror image status test_pool/test_image1
  rbd: mirroring not enabled on the image

This is the same message shown when mirroring is disabled or not yet
enabled, which can give the impression that mirroring is already
disabled.

Improve the validation logic and error messages to distinguish between
the DISABLED state and other non-enabled states, and include the image
name and current state in the output.

Examples:

When the image is completely disabled:

  $ rbd mirror image status test_pool/test_image1
  rbd: mirroring disabled on image 'test_image1'

When the image is in a transitional state (ex: DISABLING):

  $ rbd mirror image status test_pool/test_image1
  rbd: mirroring not enabled on image 'test_image1' (state: disabling)

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>

mgr/cephadm: Add KMIP server support for NVMeoF gateway

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

Merge pull request #67998 from rkachach/fix_issue_75664

mgr/test_orchestrator: fixing daemon_action method signature

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

Merge pull request #68000 from cbodley/wip-qa-rgw-dont-verify-ragweed

qa/rgw: remove ragweed from verify subsuite

Reviewed-by: Oguzhan Ozmen <oozmen@bloomberg.net>

test/rgw/notification: fix rabbitmq dependency for rocky10

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

Merge pull request #68023 from rzarzynski/wip-doc-check-umbrella-initial-tag

doc/dev/release-checklist: check v21.0.0 tag

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

Merge pull request #68001 from cbodley/wip-qa-rgw-upgrade-distros-latest

qa/rgw/upgrade: symlinks are explicit about distro versions

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

Merge pull request #68003 from yuvalif/wip-yuval-75713

test/rgw/notification: fix the cloudevents package version

Merge pull request #67777 from pritha-srivastava/wip-rgw-d4n-cleaning

rgw/d4n: erasing dirty object entry for delete markers

doc/dev/release-checklist: check v21.0.0 tag

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

Merge pull request #66524 from aainscow/umbrella-release

Umbrella checklist kickoff!

Reviewed-by: Bill Scales <bill_scales@uk.ibm.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Guillaume Abrioux <gabrioux@ibm.com>
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Nitzan Mordechai <nmordech@redhat.com>

rgw/radosgw-admin: minor typo fixes

Fixes typos in user facing log/error messages in radosgw-admin.

Signed-off-by: Nithya Balachandran <nithya.balachandran@ibm.com>

Merge pull request #67997 from rhcs-dashboard/abount-window

mgr/Dashboard : [Dashboard] Not able to open "About" window

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

Merge pull request #66318 from aclamk/aclamk-fcm-plugin

FCM plugin for block device

extblkdev/fcm: Add plugin identification for fcm

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

extblkdev/fcm: Do not enable set_keepcaps by default

When one runs FCM enabled hardware config.set_keepcaps must be set.
However, having it as default is inadvised.

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

extblkdev/fcm: Change douts/derrs

Remove printing fcm values to dout(1).
Upgraded inability to access FCM log from dout to derr.

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

extblkdev/fcm: Create perf counters with fcm stats

Created "extblkdev" section.
Each time plugin is asked to `get_stats()` also write to perf counters.

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

fixup warning of fcm plugin core

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

extblkdev/fcm: derr when FCM and no block device discard

Add derr message when FCM is in use but discard is not enabled.

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

extblkdev/fcm: Refuse to operate on multimedia lvm block devices

BlueStore is selecting were data is put to the device.
Merging 2 FCM devices together means that BlueStore will see free space
on one of the devices, but not know the other is full and asking to put
data there. It will cause -ENOSPC while free space is reported.

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

extblkdev/fcm: Adapt FCM plugin to RHCS9

Device /sys content is different from what original plugin expected.
Adapted to it.

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

added FCM plugin

Signed-off-by: Martin Ohmacht <mohmacht@us.ibm.com>

Merge pull request #67289 from aclamk/aclamk-extblkdev-mandatory

os/bluestore: Make extblkdev mandatory

Merge pull request #65847 from pritha-srivastava/wip-rgw-sts-expired-creds

rgw/sts: correct error code to 400 (from 403)

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

test/rgw/notification: fix the cloudevents package version

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

Merge pull request #64641 from phlogistonjohn/jjm-smb-keybridge

smb: add keybridge support and fscrypt configuration

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

docs: reorder mon and mds for future new releases

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

doc: Check redmine-upkeep.yml to add umbrella.

Previous PR already added umbrella, therefore adding redmin-upkeep is a no-op.
Any future developer copying this needs to look at PR 67316

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

script/ceph-release-notes: add umbrella

Just add umbrella.

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

osd: Remove unused osd_perf_counter "scrbcnt_write_blocked"

This counter is no longer needed in umbrella.

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

qa: qa tasks from the release checklist for Umbrella

All the qa tasks in the umbrella release checklist.
This includes removing X-3 releases and adding X-1 releases
(where appropriate).

Also updated release-checklist.rst

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

include: Remove incorrect "available" comment for feature bit. (cleanup)

This flag was not available, so I have deleted it.

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

qa: add X-1 release (tentacle) to fs upgrade suite

Add files for the tentacle release (X-1) to the qa/suites/fs/upgrade suites

Signed-off-by: Chris Harris <harriscr@uk.ibm.com>

qa: remove reef code from fs

Remove the reef code from the fs upgrade suites as we no longer want to test X-3 releases

Signed-off-by: Chris Harris <harriscr@uk.ibm.com>

osd: Remove octopus-depending code in Fast EC

We are leaving alone legacy EC

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

osd: Update remove after squid to remove after umbrella comment

Following consulting with author, we don't yet want to remove.

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

qa Upgrade to Umbrella

All the qa tasks in the umbrella release checklist

Signed-off-by: Chris Harris <harriscr@uk.ibm.com>
Signed-off-by: Alex Ainscow <aainscow@uk.ibm.com>
# Conflicts:
# qa/suites/upgrade/telemetry-upgrade/tentacle-x/1-tasks.yaml
# qa/workunits/test_telemetry_tentacle.sh
# qa/workunits/test_telemetry_tentacle_x.sh

doc: Confirm DEPRECATED checklist item and clean up pg_scrubber

No DEPRECATED features.

Remove some code labeled as "Remove in Umbrella"

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

qa: update require-osd-release to umbrella

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

tools/monmaptool: bump new cluster version to X

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

osd/OSDMap: update to umbrella

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

qa/workunits/cephtool/test: update to umbrella

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

mon/OSDMonitor: update to umbrella

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

common/options/global.yaml.in: update for umbrella

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

mon/MgrMonitor: update for umbrella

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

qa/standalone/mon/misc: update for umbrella

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

doc: update compatset for umbrella

The unknown bit shown in commit was picked as being "far in the future".
We have now used it and now need to move the bit one release at a time.

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

include/ceph_features: add SERVER_UMBRELLA feature bit

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

cephadm,ceph-volume: update to umbrella

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

doc/dev/release-checklist: add backport-create-issue

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

*: add constants and release names

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

ceph_release: update to umbrella

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