Merge pull request #60517 from xxhdx1985126/wip-68737

crimson/osd/osd_operations/client_request: no need to hold head's obc lock throughout the recovery of clones

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

Merge pull request #60485 from xxhdx1985126/wip-68719

crimson/osd/backfill_state: discard CancelBackfill events when the backfill is done

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

Merge pull request #60439 from xxhdx1985126/wip-68662

crimson/osd/shard_services: fix dangling reference caused by rvalue reference of ShardSercies::dispatch_context()

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

Merge pull request #60313 from xxhdx1985126/wip-68541

crimson/osd/pg: trigger PG::wait_for_active_blocker only when the pg is going active

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

Merge pull request #60584 from zdover23/wip-doc-2024-11-01-whereas

doc: s/Whereas,/Although/

doc: s/Whereas,/Although/

Change the subordinating conjunction "Whereas" followed by a comma to
the less grammatically-incorrect "Although". I've been meaning to do
this since 22 Mar 2023.

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

Merge pull request #60362 from mchangir/doc-add-note-about-vol-delete-wrt-snap-schedule

doc/cephfs: add note to remind user about snap-schedule during volume delete

Merge pull request #60540 from ronen-fr/wip-rf-revert-57582

osd: revert PR#57582

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

Merge pull request #60549 from phlogistonjohn/jjm-smb-dataclass-config

cephadm/smb: convert config object to use a dataclass

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

Merge pull request #60451 from rhcs-dashboard/nvmeof-conf-rm-fix

mgr/dashboard: rm nvmeof conf based on its daemon name

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Afreen Misbah <afreen23.git@gmail.com>

Merge pull request #60377 from adk3798/cephadm-share-default-images

cephadm: use shared spot for default container image names

Reviewed-by: John Mulligan <jmulligan@redhat.com>
Reviewed-by: Redouane Kachach <rkachach@ibm.com>

Merge pull request #60281 from phlogistonjohn/jjm-change-cluster-validate

smb: prevent switching between clustering modes

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

Merge pull request #60096 from adk3798/maintenance-mode-dead-host

mgr/cephadm: offline host handling for maintenance exit command

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

Merge pull request #59957 from adk3798/cephadm-bootstrap-global-public-network

cephadm: make bootstrap default to "global" section for public_network setting

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

Merge pull request #59838 from cbodley/wip-68083

os: remove unused btrfs_ioctl.h and tests

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

Merge pull request #59644 from wlritchi/boost-1.86-compat

src/include/uuid.h: fix for boost 1.86.0

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

Merge pull request #59568 from badone/wip-tracker-65235-noscrub-to-ignorelist

qa: Add ignorelist entries for reef-x tests

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

Merge pull request #60453 from cbodley/wip-librados-dup

librados: dont duplicate class names in member definitions

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

Merge pull request #54954 from diffs/main

osd: add clear_shards_repaired command

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

Merge pull request #55693 from adk3798/cephadm-nfsv3

mgr/nfs: add NFSv3 protocol to default protocols

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

cephadm: update default image imports to point to common location

Additionally, remove the image defaults from the two previous locations
and update the check for the number of instances of "quay" and "docker"
in these areas respectively.

Fixes: https://tracker.ceph.com/issues/68120
Signed-off-by: Adam King <adking@redhat.com>

cephadm: add python-common/ceph to MYPYPATH and pytest PYTHONPATH

Otherwise the unit tests will fail trying to import from here.

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

python-common: add spot in python-common for cephadm default images

To be shared between the binary and mgr module.

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

cephadm: add python-common/ceph to cephadm zipapp

We want to use this location for files to be shared between
the cephadm binary and cephadm mgr module so it must be included
as part of the zipapp

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

Merge pull request #60541 from gbregman/main

mgr/cephadm: Change NVME image version to 1.3.3.

Merge pull request #60546 from phlogistonjohn/jjm-python-common-codeowners

CODEOWNERS: let orchestration cover all of python-common

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

Merge pull request #60520 from zdover23/wip-doc-2024-10-29-start-os-recs-add-supported-squid-distros

doc/start: add supported Squid distros

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

Merge branch 'ceph:main' into main

Merge pull request #60422 from rhcs-dashboard/modal-carbonized

mgr/dashboard: Replacing bootstrap modal service with cds modal service

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

Merge pull request #50105 from zhsgao/mds_export_state

mds: add an asok command to dump export states

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

Merge pull request #59072 from lxbsz/wip-66991

qa: increase the http.maxRequestBuffer to 100MB and enable the git debug logs

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

cephadm/smb: convert config object to use a dataclass

While working on the smb.py file I began to be annoyed at the Config
class and the need to repeat myself. Now that cephadm is not expected to
run on python versions older than 3.7 I think it's safe to convert
Config to use a dataclass.

While making the change to a dataclass I also chose to make it a frozen
dataclass to help eliminate any future bugs wrt mutating the config object.

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

Merge branch 'ceph:main' into main

CODEOWNERS: let orchestration cover all of python-common

While it's not perfectly correct to say the orchestration team owns
src/python-common, it's closer to the truth than not. It also ensures
that someone with domain specific knowledge is looking at the rest of
python-common outside just the deployment section (short of creating
some sort of new python-sig type group). This is relevant due to the
changes in PR #60377 as python-common's ceph package will be included
in cephadm.

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

Merge pull request #57299 from rhcs-dashboard/fix-47066-main

mgr/{restful,zabbix}: remove deprecated module

Reviewed-by: @tchaikov
Reviewed-by: @ktdreyer
Reviewed-by: @jmolmo

mgr/dashboard: Replacing bootstrap modal service with cds modal service

Fixes: https://tracker.ceph.com/issues/68650
Signed-off-by: Dnyaneshwari talwekar <dtalweka@redhat.com>

Merge PR #60518 into main

* refs/pull/60518/head:
doc/governance: updates based on 2024q4 election

Reviewed-by: Anthony D Atri <anthony.datri@gmail.com>
Reviewed-by: Zac Dover <zac.dover@gmail.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #60532 from joscollin/wip-mirroring-create-snapshot

doc: mention how to initiate snapshot mirroring

mgr/cephadm: Change NVME image version to 1.3.3.
Fixes https://tracker.ceph.com/issues/68755

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

osd: revert PR#57582

The reverted commit unconditionally copies the Info
data from the primary-info message to the replica,
causing multiple tests failures.

For example:
compare the failures in
https://pulpito.ceph.com/?branch=wip-rf-store2-steps
to
https://pulpito.ceph.com/?branch=wip-rf-store2-steps-reverted
(with said PR reverted).

Revert "src/osd: pg stat are not synced between osds after deep-scrub. So if primary osd is killed, next primary osd has wrong stats. Reason behind it is PeeringState::proc_primary_info does not process or update any pg stats."

This reverts commit a24f3cf1e9088c30899ee6f4a8cbda6b0f350518.

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

Merge PR #60010 into main

* refs/pull/60010/head:
script/ceph-debug-docker: add debuginfod for ubuntu
script/ceph-debug-docker: drop /ceph mount

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>

Merge pull request #60508 from zdover23/wip-doc-2024-10-27-rados-operations-erasure-code-jerasure

doc/rados: add blaum_roth coding guidance

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

Merge pull request #60510 from Matan-B/wip-matanb-backfill-crimson-docs

doc/dev/crimson: Add BackfillMachine state graph

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

doc: mention how to initiate snapshot mirroring

Signed-off-by: Jos Collin <jcollin@redhat.com>

Merge pull request #60054 from rhcs-dashboard/realm-popup

mgr/dashboard: Carbon Design - Create realm popup

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

Merge pull request #60393 from rhcs-dashboard/nvmeofServiceUnitTest

Add API tests for nvmeof service.ts file

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

Merge pull request #60476 from rhcs-dashboard/usermanagment-roles-defect

mgr/dashboard:Roles section is not aligned with column name

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

Merge pull request #60318 from ronen-fr/wip-rf-schedlogl

osd/scrub: improve scrub information conveyed in standard

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

Merge pull request #60470 from joscollin/wip-doc-cephfs-mirroring-improve-note

doc: explain the consequence of enabling mirroring through monitor commands

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

Merge PR #60400 into main

* refs/pull/60400/head:
mon,cephfs: fix indentation level of a code block

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

doc/dev/crimson: update index

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

doc/dev/crimson: Add initial BackfillMachine docs

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

Merge pull request #60190 from avanthakkar/teuthology-smb-cluster-public-addrs

qa/suites/orch: add a tests for testing public_addr for smb cluster create cmd

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

doc/start: add supported Squid distros

Add the distros that support Squid to the chart on
start/os-recommendations.rst.

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

doc/governance: updates based on 2024q4 election

https://vote.heliosvoting.org/helios/elections/e03494ce-e04c-41d0-bb05-ec5ccc632ce4/view

Question #1
    Update election requirements for Ceph Executive Council Elections?
        Remove "ranked-choice" requirement 13
        Keep "ranked-choice" requirement (no change) 16

Question #2
    Require periodic elections in governance charter?
        No (no change) 8
        Annual 15
        Semi-annual 3
        Quarterly 2

Question #3
    Update the Ceph Executive Council term length?
        Change to 3 years 14
        Keep 2 years (no change) 14

Question #4
    Amend governance document to require a supermajority of votes for amendments to the governance model? The current requirement is a simple majority.
        Require a supermajority 20
        Require a simple majority (no change) 9

Question #5
    Clarify "supermajority" and "majority" election requirements?
        Of members voting on a given question (abstaining does not bias the vote) 18
        Of members voting on the election (abstaining is an implicit "no") 6
        Of members in the CSC 3

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

librados: dont duplicate class names in member definitions

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

crimson/osd/osd_operations/client_request: no need to hold head's obc
lock throughout the recovery of clones

Fixes: https://tracker.ceph.com/issues/68737
Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>

mgr/{restful,zabbix}: document removal

Fixes: https://tracker.ceph.com/issues/47066
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>

mgr/zabbix: remove deprecated module

This (already deprecated) module is removed as a side-effect of the
deprecation and removal of the `restful` module.

Fixes: https://tracker.ceph.com/issues/47066
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>

mgr/restful: remove deprecated module

Detailed changes:
* Remove `restful` mgr module dir,
* Remove Python depedencies (`pecan`, `werkzeug`) from ceph.spec and
  debian control,
* Remove docs,
* Remove associated QA tests,
* Update vstart.

Fixes: https://tracker.ceph.com/issues/47066
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>

Merge pull request #59465 from galsalomon66/limit_mem_usage_on_parquet_flow

rgw/s3select: limit memory usage on Parquet flow

Merge pull request #60454 from batrick/mds-warn-cleanup

mds: remove obsolete comments

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

doc/rados: add blaum_roth coding guidance

Direct Ceph administrators using blaum_roth coding for erasure-coded
pools to change the default value of w=7 to a different value in order
to ensure that w+1 is prime.

This information was provided to the Ceph upstream by Benjamin Mare in
September of 2024.

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

Merge pull request #60357 from ronen-fr/wip-rf-transitive

osd/scrub: make sched-targets comparator transitive

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

osd/scrub: improve scrub information conveyed in standard
PG log line references

When "mentioning" a PG in a log message, we include a set of data
items, including some scrub related information. This
commit improves the scrubber information conveyed, following
changes to the scrub scheduler.

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

Merge pull request #60506 from zdover23/2024-10-26-fix-grammar-check_license_name-main

.github/check-license: correct grammar in "license check"

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

.github/check-license: correct grammar in "license check"

Change "Check Incompatible Licenses" to "Check for Incompatible
Licenses".

This commit is made as part of a project to separate the changes in
https://github.com/ceph/ceph/pull/60448 into individual pull requests.

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

Merge pull request #60434 from zdover23/wip-doc-2024-10-23-glossary-plp

doc/glossary: add "PLP" to glossary

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

Merge pull request #60444 from zdover23/wip-doc-2024-10-23-rados-ops-health-checks

doc/rados: standardize markup of "clean"

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

Merge pull request #60471 from Jayaprakash-ibm/patch-2

Update .githubmap

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge PR #60386 into main

* refs/pull/60386/head:
qa/cephfs: override testing kernel with -k option

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

qa/suites/orch: add a tests for testing public_addr for smb cluster create cmd

Signed-off-by: Avan Thakkar <athakkar@redhat.com>

Merge pull request #60117 from rishabh-d-dave/mgr-vol-base-init

mgr/vol: better to call base class __init__() at beginning

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

Merge pull request #60153 from rishabh-d-dave/mgr-vol-cv-waiting

mgr/vol: remove unused variable

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

mgr/dashboard: Carbon Design - Create realm popup

Fixes: https://tracker.ceph.com/issues/68341
Signed-off-by: Dnyaneshwari Talwekar <dtalweka@redhat.com>

Merge pull request #60395 from guits/replace-osd-enhancement

ceph-volume: support zapping by osd-id for RAW OSDs

ceph-volume: support zapping by osd-id for RAW OSDs

Currently it is only possible to zap by osd-id for LVM-based OSDs.

This commit introduces the required changes in order to support zapping
by osd-id for RAW-based OSDs.

Fixes: https://tracker.ceph.com/issues/68576
Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>

Merge pull request #59847 from rishabh-d-dave/mgr-vol-spawn-threads

mgr/vol: reuse code to spawn threads

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

Add API tests for nvmeof service.ts file

Fixes: https://tracker.ceph.com/issues/68551
Signed-off-by: Achint Kaur <ackaur@redhat.com>

crimson/osd/backfill_state: discard CancelBackfill events when the
backfill is done

Fixes: https://tracker.ceph.com/issues/68719
Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>

Merge pull request #60480 from truongsinh/patch-2

doc: Note that to set layouts or quotas, clients require the `p` flag

doc/cephfs: use 'p' flag to set layouts or quotas

Remind users that clients must use the 'p' flag when writing file
layouts.

This PR is made in response to
https://www.reddit.com/r/ceph/comments/1gbad51/comment/ltkgd5v/

Co-authored-by: Zac Dover <zac.dover@proton.me>
Signed-off-by: TruongSinh Tran-Nguyen <i@truongsinh.pro>

mgr/dashboard:Roles section is not aligned with column name

Fixes:https://tracker.ceph.com/issues/68706

Signed-off-by:Puja Shahu pshahu@redhat.com
Signed-off-by: pujaoshahu <pshahu@redhat.com>

doc: explain the consequence of enabling mirroring through monitor commands

Signed-off-by: Jos Collin <jcollin@redhat.com>

Merge pull request #59982 from rkachach/fix_issue_mgmt_gw_high_availability

Adding HA support for mgmt-gateway and oauth2-proxy services

Reviewed-by: Adam king <adking@redhat.com>
Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>

Merge pull request #58898 from neesingh-rh/wip-fix-strict-iec-cast

src/common : proper handling of units in `strict_iec_cast`

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Dhairya Parmar <dparmar@redhat.com>

mgr/vol: add helpers to spawn all threads and more threads

Also add log messages for in these helper methods to allow tracking when
and why more threads were spawned.

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

mgr/vol: reuse code for spawning threads

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

Merge PR #60473 into main

* refs/pull/60473/head:
mailmap, githubmap, organisationmap: Add Anuradha Gadge

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

Merge PR #60457 into main

* refs/pull/60457/head:
.github/check-license: add friendly name

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

Merge pull request #59002 from neesingh-rh/wip-65820

qa/tasks/fwd_scrub: remove unnecessary traceback

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

Merge pull request #60119 from rishabh-d-dave/mgr-vol-comments

mgr/vol: add comments to explain queuing data structures

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

Merge pull request #60042 from sunilangadi2/migration_with_namespace_test

qa/workunits/rbd: cover native migration between namespaces

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

mgr/dashboard: rm nvmeof conf based on its daemon name

don't remove an entire entry of a service from the config if only the daemon is
removed, instead just remove the entry of that particular daemon. and
once all the entry are succesfully removed, remove the entry for service

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

mailmap, githubmap, organisationmap: Add Anuradha Gadge

Signed-off-by: Anuradha Gadge <anuradha.gadge@ibm.com>

Merge pull request #60420 from nbalacha/wip-nbalacha-namespace-doc

doc/rbd: namespace mirroring updates

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

Update .githubmap

Signed-off-by: Jayaprakash-ibm <jayaprakash@ibm.com>

Merge pull request #60355 from rhcs-dashboard/carbonize-hosts-form

mgr/dashboard: carbonize Cluster > Hosts form

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

Merge pull request #60465 from zdover23/wip-doc-2024-10-24-cephfs-troubleshooting

doc/cephfs: edit "Disabling Volumes Plugin"

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

doc/cephfs: edit "Disabling Volumes Plugin"

Improve the English language in the section 'Disabling Volumes Plugin"
(which here becomes "Disabling the Volumes Plugin") in the
doc/cephfs/troubleshooting.rst file.

The change here is similar to a change introduced in
https://github.com/ceph/ceph/pull/60448/. That PR seems to be unable to
pass the "make check", and this PR is part of a test to see if breaking
the changes in that PR into several smaller changes results in mergeable
PRs.

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