Merge pull request #53989 from mchangir/mds-handle-bad-arguments-during-subvolume-create-2

mgr/volumes: handle bad arguments during subvolume create

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

Merge pull request #62709 from kshtsk/wip-another-brxnet-by-default

tasks/cephfs/mount: use 192.168.144.0.0/20 for brxnet

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

Merge pull request #62847 from Matan-B/wip-matanb-crimson-do_recovery

crimson/osd/pg_recovery: rework start_recovery_ops

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

Merge pull request #62947 from VallariAg/fix-nvmeof-limit-alerts

monitoring: Fix NVMeoF subsys/namespace limit alerts

Merge pull request #62516 from mkogan1/wip-d3n-long-cache-ident

rgw/d3n: store cached objects using hash digest

Merge pull request #63112 from ceph/wip-yuriw-build-script

qa/tests: added "tentacle" option

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

Merge pull request #62398 from AliMasarweh/wip-alimasa-rgw-standalone-zone

RGW/standalone: refactor rgw_zone.h with configstore

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

Merge pull request #62891 from ShwetaBhosale1/fix_issue_70985_nfs_add_vip_in_HAProxy_Hosts_list

mgr/nfs: Add VIP to HAProxy_Hosts list for ingress type haproxy-protocol

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

Merge pull request #62848 from ShwetaBhosale1/fix_issue_70950_add_command_to_stop_host_drain

mgr/cephadm: Add command to stop host drain

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

Merge pull request #62755 from adk3798/cephadm-upgrade-smb

mgr/cephadm: add smb to upgrade order

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

Merge pull request #62718 from adk3798/nfs-export-parse-systype

mgr/nfs: make sure sectype is a list when parsed

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

Merge pull request #62585 from adk3798/block-nvmeof-deployment-all-groups

mgr/cephadm: block deploying nvmeof daemons on the same host

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

qa/tests: added "tentacle" option

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

Merge pull request #62743 from cloudbehl/pool_metadata

mgr/dashboard: Added application label to pool_metadata query

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Anmol Babu <anmolbudugutta@gmail.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

Merge pull request #62638 from rishabh-d-dave/vols-path-gone-missing

mgr/vol: some improvements for stats_util.py and async_cloner.py

Reviewed-by: Milind Changire <mchangir@redhat.com>

Merge pull request #63093 from ronen-fr/wip-rf-restrictions

osd/scrub: check all(*) conditions in restrictions_on_scrubbing()

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

crimson/osd: Logging fixes

* Fix "failed to log message"
* PGRecovery move to new logging macro
* PGRecovery to print pg prefix as it's impossible to debug specific pg
  recovery ops without it.

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

crimson/osd/pg: Let PGListener use start_peering_event_operation

PG::start_peering_event_operation is a template function while
PGRecovery::pg is of PGRecoveryListener* type. We can't expose a template
function through the PGRecoveryListener interface since it must be
also virtual.
Instead, introduce start_peering_event_operation_listener which will act
as a wrapper to PG::start_peering_event_operation for PGRecovery to use
freely.

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

crimson/osd: Convert do_recovery() from bool to stop_iteration

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

crimson/osd/pg_recovery: rewrite start_recovery_ops

We had few confusions around the return value from start_recovery_ops.
This commit is a groundwork for the return type change.

* Move to coroutines
* Update logging macro

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

mgr/vol: log in case path goes in missing in async_cloner.py

Add a log entry in case the source and/or destination path goes missing
for a clone operation.

Fixes: https://tracker.ceph.com/issues/71019
Signed-off-by: Rishabh Dave <ridave@redhat.com>

mgr/vol: handle case where path goes missing for a clone

A thread is spawned to get the value of a certain extended attribute to
generate the progress statistics for the ongoing clone operations. In
case source and/or destination path for a clone operation goes missing,
this thread crashes. Instead of crashing, handle this case gracefully.

Fixes: https://tracker.ceph.com/issues/71019
Signed-off-by: Rishabh Dave <ridave@redhat.com>

Merge pull request #62809 from rzarzynski/wip-bug-70878

osd: fix init of op_queue_type_t due to returnable ceph_assert()

Merge pull request #62705 from NitzanMordhai/wip-nitzan-pglog-missing-validation

osd_types: Restore new_object marking for delete missing entries

osd/scrub: check all(*) conditions in restrictions_on_scrubbing()

Modified OsdScrub::restrictions_on_scrubbing() to check all(*)
conditions, instead of stopping at the first one that is true.
The "new" (since Tentacle) scrub-type-to-conditions mapping is no
longer a simple one (is not "monotonic" in the sense of restrictions
always being removed as the scrub type is more important),
and the caller may want to know them all.

(*) The somewhat costly check for the random backoff is still only
    performed if the OSD is not already running too many scrubs.

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

Merge pull request #62873 from chardan/jfw-wip-rgw-support-catch2

Add Support for Catch2 unit tests

Add support for Catch2

Makes Catch2 available for C++ unit tests;
Adds GPM script availability to CMake.
Adds rudimentary test for rgw_hex.

Signed-off-by: Jesse F. Williamson <jfw@ibm.com>

Merge pull request #63081 from clwluvw/admin-bucket-rm-err-code

rgw-admin: report correct error code for non-existent bucket on deletion

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>

Merge pull request #62993 from cbodley/wip-71098

rgw/multisite: rgw_forward_request_to_master() preserves Error responses

Reviewed-by: Seena Fallah <seenafallah@gmail.com>
Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>

Merge pull request #62903 from jzhu116-bloomberg/wip-70992

rgw: prefetch data from versioned object instance head

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

Merge pull request #62011 from kchheda3/wip-allow-multiple-rgws

rgw/frontend: Allow multiple RGWs to run on same port on same host

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

Merge pull request #62851 from cbodley/wip-rgw-beast-async-disable

rgw: frontend reads/writes respect rgw_beast_enable_async

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>

Merge PR #63083 into main

* refs/pull/63083/head:
doc/cephfs: add snapshot name note

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

doc/cephfs: add snapshot name note

The charmap is not applied to snapshot names!

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

Merge pull request #63056 from ronen-fr/wip-rf-fadvise

osd/scrub: making Scrub's fadvide flags a constant

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

Merge pull request #62805 from Matan-B/wip-matanb-rep-read-perfcount

osd/PrimaryLogPG: Relax replicated reads when recovering

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

Merge pull request #62866 from ifed01/wip-ifed-osd-bench-more-logging

osd: be more verbose in OSD::run_osd_bench_test

Reviewed-by: Sridhar Seshasayee <sseshasa@redhat.com>

Merge pull request #63041 from cbodley/wip-qa-rgw-upgrade-goodbye-quincy

qa/rgw: prepare for tentacle testing

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>

rgw-admin: report correct error code for non-existent bucket on deletion

admin api should return the correct error code when the bucket doesn't
exist on bucket deletion. apparently a regression by 9ae2d8c4e95807179fc17f84be6754d2b19fe639.

Fixes: https://tracker.ceph.com/issues/71159
Signed-off-by: Seena Fallah <seenafallah@gmail.com>

Merge pull request #62827 from afreen23/bump-version

mgr/dashboard: Bump grafana version to 11.6.0

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

Merge pull request #63057 from bluikko/doc-rgw-capitalization-radosgw

doc/radosgw: Improve language, capitalization and use config database

doc/radosgw: Improve language, capitalization and use config database

Use "RADOS Gateway" instead of "Rados Gateway", "rados gateway" etc.
I am aware of the term "Ceph Object Gateway" but this change intends to
be an uncontroversial low hanging fruit fix of obviously incorrectly
capitalized terms.

Use "RGW daemon" instead of "Gateway", "Rados Gateway" etc.
Use "RGW instance" instead of "rados gateway" for consistency with
exactly similar other instance.
If referring obviously clearly to an instance of the daemon with an
obviously not preferred term, change it to "RGW daemon"; for example
when talking about restarting the RGW.
Do not touch other instances that are not 100% clear.

The files touched mostly do not use "Ceph Object Gateway" so changing
the term to it would create inconsistency, or several more changes
would need to be done to update all instances to use this terminology.

Use configuration database instead of ceph.conf in d3n_datacache.rst.

Improve language in d3n_datacache.rst.

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

rgw/frontend: Allow multiple rgw's to run on same port on same host.

The idea here is to leverage the `SO_REUSEPORT` param supported by kernel 3.9 and above, which allows the multiple services to run on the same port.

Signed-off-by: kchheda3 <kchheda3@bloomberg.net>

Merge pull request #63064 from bluikko/doc-metrics-inlinecode-radosgw

doc/radosgw: Use inline code for label syntax in metrics.rst

Merge pull request #60515 from ideepika/fix-68327

rgw: make keystone work without admin token(service ac requirement)

Reviewed-by: Tobias Urdin <tobias.urdin@binero.com>

Merge pull request #62980 from cbodley/wip-71083

rgw/lc: stop using merge_and_store_attrs in remove_bucket_config

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>

doc/radosgw: Language and use inline code for labels in metrics.rst

Use inline code formatting for label syntax examples inside text.

Small improvements to language. Use all lower case for labels.

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

Merge PR #63046 into main

* refs/pull/63046/head:
qa/crontab: add tentacle nightlies

Reviewed-by: Yuri Weinstein <yweins@redhat.com>

osd/scrub: making Scrub's fadvide flags a constant

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

Merge pull request #63060 from zdover23/wip-doc-2025-04-30-cephadm-services-rgw-markup

doc/cephadm: correct markup in rgw.rst

Merge pull request #63062 from bluikko/doc-radogw-fix-radosgw

doc/radosgw: Use Ceph Object Gateway as term in metrics.rst

Merge pull request #62843 from rishabh-d-dave/vols-user-pool

mgr/vol: don't delete user-created pool in "volume create" command

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

Merge pull request #62760 from mohit84/pg_stuck_backfill

crimson: PG backfill is not showing any progress

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

doc/radosgw: Use Ceph Object Gateway as term in metrics.rst

The document uses mostly the term Ceph Object Gateway except in three
places where "Radosgw", "rgw" or obviously typod "radogw" is used.

Change those instances to Ceph Object Gateway consistent with the rest
of the document.

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

doc/cephadm: correct markup in rgw.rst

Correct the presentation of an example string in doc/cephadm/rgw.rst in
order to obviate an error reading "rgw.rst:202: WARNING: Inline emphasis start-string without end-string."

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

Merge pull request #62894 from rzarzynski/wip-crimson-unused-errors

crimson: fix unused variable warnings due to assert() and NDEBUG builds

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>

Merge pull request #62826 from sseshasa/wip-doc-max-iops-cap-override

doc/rados: Update mClock doc on steps to override OSD IOPS capacity config

Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
Reviewed-by: Samuel Just <sjust@redhat.com>

doc/rados: Update mClock doc on steps to override OSD IOPS capacity config

Describe the steps involved to
 - Specify a global value for osd_mclock_max_capacity_iops_{ssd,hdd}, and
 - Override existing individually scoped values for OSDs determined during
   start-up for osd_mclock_max_capacity_iops_{ssd,hdd}.

The above is to help with the following:
 - Steps to override existing setting with a global value.
 - reduce the number of entries in the mon store and instead use a single
   global specification for all OSDs in the cluster in case the underlying
   hardware is the same for all OSDs.

Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
Fixes: https://tracker.ceph.com/issues/70774

Merge pull request #62972 from laimis9133/laimis9133-compression-docs

doc/radosgw/compression: separate RGW and RADOS pool level compression

Merge pull request #62836 from athanatos/sjust/wip-crimson-repop-reply-ordering-69439

crimson: osd_operation cleanups and fix for MOSDRepOpReply ordering

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

Merge branch 'main' into laimis9133-compression-docs

Signed-off-by: Laimis Juzeliūnas <58551069+laimis9133@users.noreply.github.com>

Merge pull request #59206 from ygtzf/bugfix-compress-use-isal

compressor: compressor_zlib_isal did not take effect in compression

Reviewed-by: Igor Fedotov <ifedotov@suse.com>

qa/crontab: add tentacle nightlies

And delete reef nightlies. This is primarily because we do not have capacity to also test reef.

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

Merge PR #62904 into main

* refs/pull/62904/head:
pybind/mgr/volumes: make casesensitive attr uniform in interface

Reviewed-by: Milind Changire <mchangir@redhat.com>

Merge pull request #63035 from Matan-B/wip-matanb-crimson-scan_for_backfill-fix

crimson/osd/recovery_backend: scan_for_backfill_primary correctly handle missing object

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #63033 from bluikko/doc-placement-formatting-radosgw

doc/radosgw: Promptify cmds and improve formatting in placement.rst

Merge pull request #63028 from bluikko/doc-d3n-formatting-radosgw

doc/radosgw: Improve formatting in d3n_datacache.rst

Merge pull request #63029 from bluikko/doc-admin-privprompts-radosgw

doc/radosgw: Use privileged prompt for CLI commands in admin.rst

Merge pull request #63032 from bluikko/doc-compression-typo-radosgw

doc/radosgw: Remove stray full stop mid-sentence in compression.rst

test/rgw/multisite: test error handling of forwarded s3:PutBucketPolicy

PutBucketPolicy doesn't parse the given policy until after it's
forwarded and applied on the master zone, so add a test that sends a
non-json policy document that will fail to parse

without the fix to rgw_forward_request_to_master(), the InvalidArgument
error Code is still mapped correctly, but the error Message is not
preserved:

>     assert e.response['Error']['Message']
> AssertionError

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

test/rgw/multisite: test error handling of forwarded iam:DeleteRole

DeleteRole's conflict handling happens after forwarding, so use
test_role_delete_sync() to test that forwarded 409 Conflict errors
preserve the DeleteConflict code and error message

without the fix to forward_iam_request_to_master(), DeleteRole instead
fails with:

> botocore.exceptions.ClientError: An error occurred (BucketNotEmpty) when calling the DeleteRole operation: None

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

rgw/multisite: forward_iam_request_to_master() preserves ErrorResponse responses

same changes as rgw_forward_request_to_master(), except the <Error>
element is wrapped in a <ErrorResponse>

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

rgw/multisite: rgw_forward_request_to_master() preserves Error responses

when a forwarded request fails on the master zone, the local zone should
return that same error response back to the client. this means
reproducing both the http error and the aws xml <Error> response

rgw_forward_request_to_master() stores these errors in s->err, and
set_req_state_err() now avoids overwriting existing an error

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

rgw/rest: RGWRESTConn::forward() prefers to return http errors

callers need to distinguish between transport errors (a failure to
forward the request) and http errors (successfully forwarded and got a
response). forward() was losing this information by mapping any http
errors to errnos

use tl::expected to differentiate between transport errors and http
errors, with the latter being the successful/expected case

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

rgw: remove unused RGWObjVersionTracker from RGWDeleteBucket

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

rgw/rest: removed unused 'objv' from RGWRESTConn::forward()

all callers of forward() and forward_iam_request() were passing null

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

Merge pull request #62672 from adamemerson/wip-test-common-signed-comparison

test/common: Fix signed comparison

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

Merge pull request #62670 from adamemerson/wip-not-before-queue-signed-comparison

common/not_before_queue: Fix signed comparison warning

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

qa/rgw/upgrade: add upgrade from tentacle

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

qa/rgw/upgrade: add upgrade from squid

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

qa/rgw/upgrade: remove upgrade from reef

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

Merge pull request #61962 from clwluvw/replication-perms

rgw: add support replication actions in policy

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

qa/rgw/upgrade: remove upgrade from quincy

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

Merge pull request #62922 from saif-0987/refactor/testid-update-01

mgr/dashboard: Replace data-cy with data-testid for cypress IDs

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

RGW/standalone: refactoring issues for ConfigStore and rgw_zone

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

RGW/standalone: fixed jenkins issues

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

RGW/standalone: fixed teuthology issues

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

RGW/standalone: fixed issues emerged when testing mulsite

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

RGW/standalone: fix issue emerged when vstart-ing cluster

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

RGW/standalone: removed RGWSystemMetaObj from rgw_zone

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

RGW/standalone: refactor RGWZoneParams with configstore

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

RGW/standalone: refactor RGWZoneGroup with configstore

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

RGW/standalone: review fixes

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

RGW/standalone: refactor RGWRealm with configstore

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

RGW/standalone: refactor RGWPeriodConfig with configstore

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

RGW/standalone: refactor RGWPeriod with configstore

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

Merge pull request #63010 from ronen-fr/wip-rf-repair-62451

qa/standalone/scrub: fix expected outputs in repair tests

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

crimson/osd/recovery_backend: scan_for_backfill_primary correctly handle
missing object

scan_for_backfill was seperated to scan_for_backfill_primary and
scan_for_backfill_replica.
The fix from:
https://github.com/ceph/ceph/pull/62837/commits/88432ebd7432c513ccd495e77425401beddb9953
was only copied to the replica version.

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

Merge pull request #62978 from afreen23/main

mgr/dashboard: Update translations

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

doc/radosgw: Promptify cmds and improve formatting in placement.rst

Use preformatted blocks with a privileged bash prompt instead of
hardcoding prompts in the beginning of each line for CLI commands.

Indent continuation lines of multi-line CLI example commands the same
way they are indented elsewhere.

Use inline code formatting consistently, add double-backticks for
inside text references to CLI commands, configuration data, etc.

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