doc: Clarify that there are no tertiary OSDs

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

Merge pull request #61660 from anthonyeleven/sane-pgnum

doc/rados/operations: Improve pools.rst

Merge pull request #59334 from ivoalmeida/angular-upgrade

mgr/dashboard: upgrade angular

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

Merge pull request #61268 from ceph/wip-yuriw-release-19.2.1-main

Merge pull request #61021 from NitzanMordhai/wip-nitzan-leak-some-memory-locks-hungs

memory lock issues causing hangs during connection shutdown

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

Merge pull request #60576 from cbodley/wip-librados-asio-awaitable

librados/asio: support 'deferred' and 'use_awaitable' completions

doc/releases: fix heading types

Addresses this error:

```
/home/jenkins-build/build/workspace/ceph-pr-docs/doc/releases/squid.rst:395: CRITICAL: Title level inconsistent:

Highlights
~~~~~~~~~~
/home/jenkins-build/build/workspace/ceph-pr-docs/doc/releases/squid.rst:430: CRITICAL: Title level inconsistent:
```

Signed-off-by: Laura Flores <lflores@ibm.com>

doc/releases: move related tracker on new line

Signed-off-by: Laura Flores <lflores@ibm.com>

doc/releases: fix formatting with v19.2.1 documentation

Signed-off-by: Laura Flores <lflores@ibm.com>

Merge PR #61562 into main

* refs/pull/61562/head:
qa: remove redundant and broken test
mds: skip scrubbing damaged dirfrag
tools/cephfs/DataScan: test equality of link including frag
tools/cephfs/DataScan: skip linkages that have been removed
tools/cephfs/DataScan: do not error out when failing to read a dentry
tools/cephfs/DataScan: create all ancestors during scan_inodes
tools/cephfs/DataScan: cleanup debug prints
qa: remove old MovedDir test
qa: add data scan tests for ancestry rebuild
qa: make the directory non-empty to force migration
qa: avoid unnecessary mds restart

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

Merge PR #61555 into main

* refs/pull/61555/head:
mds: do not path traverse a damaged dirfrag
qa: test file create on damaged directory

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Christopher Hoffman <choffman@redhat.com>
Reviewed-by: Viacheslav Dubeyko <Slava.Dubeyko@ibm.com>

Merge PR #60761 into main

* refs/pull/60761/head:
client: resolve bogus self-assignment

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

Merge PR #60252 into main

* refs/pull/60252/head:
mds: combine several fixed-size `encode()` calls
common/fs_types: combine several fixed-size `encode()` calls

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

doc/releases: Add notable changes for v19.2.1

Signed-off-by: Laura Flores <lflores@ibm.com>
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

mgr/dashboard: fixed unit tests

* fixed unit tests due to upgrade to angular v18
* run npm fix in order to fix code style violations
* upgraded eslint/* packages' versions
* fixed eslint errors and warnings

Fixes: https://tracker.ceph.com/issues/68896
Signed-off-by: Ivo Almeida <ialmeida@redhat.com>

Merge pull request #60102 from MaxKellermann/dispatch_notify_one

msg/DispatchQueue: wake up only one dispatch thread

Merge pull request #60763 from rzarzynski/wip-cls-dont-format-dead-logs

objclass: don't do costly string formatting when not needed

Merge pull request #60262 from MaxKellermann/ms_tcp_prefetch_max_size_64k

common/options: increase `ms_tcp_prefetch_max_size` default to 64 kB

Merge pull request #60176 from MaxKellermann/protocol_locks

msg: Reduce ProtocolV[12] locks

Merge pull request #57718 from NitzanMordhai/wip-nitzan-monclient-try-resent-mon-command-to-same-mon

monclient: try to resend the mon commands to the same monitor if avai…

Merge pull request #61623 from ronen-fr/wip-rf-m2ore-keys

common,osd: replace obsolete get_tracked_conf_keys()

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

doc/rados/operations: Improve pools.rst

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

Merge pull request #59841 from phlogistonjohn/jjm-containerized-build-pyalt

containerized build tools [V2]

Merge pull request #61616 from zdover23/wip-doc-2025-02-02-cephadm-services

doc/cephadm: clarify "Monitoring OSD State"

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

src/script: add a script to help build ceph using containers

The build-with-container script tries to encapsulate nearly all major
build tasks using docker/podman containers. If there's no build image
locally it will create one for your. It provides targets for building
(make), testing (make check), building rpm packages or deb packages and
is designed to be fairly easily extended.

View the comment at the top of the source file for usage details.

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

build: add files needed to create a build container

A build container contains all the tools and dependencies needed to
build ceph. It provides a Container file and small script that
helps bootstrap the container setup. This script installs a few extra
things we need before farming most of the work out to install-deps.sh.

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

build: small script tweak to allow different build dirs

Move the mkdir line to allow for other builds dir naming schemes outside
of what appears in the .gitignore file. A tiny bit of added flexibility
at little cost.

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

src/script: add helper function has_build_dir

This function returns successfully if $BUILD_DIR exists and is valid.
This is a useful building block for automation around the build and
can be used to avoid re-running commands that fail is the build dir
exists already.

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

Merge pull request #61470 from aclamk/wip-aclamk-bluefs-bdev-expand-addendum

os/bluestore: CBT bluefs-bdev-expand addendum

Merge pull request #61019 from MaxKellermann/test_objectstore__WITH_BLUESTORE-1

test/objectstore: extend `#ifdef WITH_BLUESTORE`

Merge pull request #60547 from MaxKellermann/without_bluestore

Fix two build failures with `WITH_BLUESTORE=no`

Merge pull request #59633 from YiteGu/optimize-offline-trim-report-info

tools/ceph-bluestore-tool: optimize offline trim report info

qa: remove redundant and broken test

Scrub does not fix damaged dirfrags for any type of damage we currently mark
dirfrags damaged for (corrupt fnode / missing dirfrag object).

In any case, this scenario is covered in cephfs_data_scan with correct checks
for damage / handling.

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

Merge pull request #61633 from chardan/wip-jfw-rgw-fix-editor-mode

rgw: fixup for emacs/vim modes, moved to top of file.

Merge pull request #61594 from adk3798/test-nfs-task-cluster-purge-fixup

mgr/cephadm: continue in nfs service purge if grace file is already deleted

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

Merge pull request #61593 from adk3798/cephadm-osd-extra-args-initial-deploy

mgr/cephadm: create OSD daemon deploy specs through make_daemon_spec

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

Merge pull request #61579 from phlogistonjohn/jjm-cephadm-small-moves

cephadm: move three functions out of cephadm.py

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

Merge pull request #61578 from omidyoosefi/monitor-port-nfs

pybind/mgr/cephadm: allow setting custom monitoring_port for nfs

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

Merge pull request #61571 from adk3798/cephadm-ganesha-server-scope

mgr/cephadm: add Server_Scope = <fsid> to NFSv4 section of ganesha conf

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

Merge pull request #61389 from Kushal-deb/fix-issue-69435_NVMe-of_service

mgr/cephadm: Abort nvme deployment with pool that doesn't exist

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

Merge pull request #60991 from ShwetaBhosale1/fix_issue_69153_nfs_to_show_ingress_mode

mgr/nfs: Show ingress mode in output of 'ceph nfs cluster info' command

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

Merge pull request #60915 from Kushal-deb/fix-issue-2313279

cephadm: Add pre_remove and ensure deployment values are reset and API settings are updated when  removing Prometheus or Alertmanager daemons

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

Merge pull request #61368 from cbodley/wip-69527

rgw/s3: remove local variable 'uri' that shadows member variable

Reviewed-by: Yixin Jin yjin77@yahoo.ca

Merge pull request #61037 from thotz/make-restore-attrs-humanreadable

rgw/rgw_admin.cc : Make restore attrs readable in admin cli

Reviewed-by: Soumya Koduri <skoduri@redhat.com>
Reviewed-by: Adam Emerson <aemerson@redhat.com>
Shreyansh Sancheti <ssanchet@redhat.com>

Merge pull request #59937 from BBoozmen/oozmen-enhancing-fetch-remote-obj-logs

RGW: add src/dest object info to fetch_remote_obj()'s debug log events

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

Merge pull request #61505 from cbodley/wip-69582

examples/rgw: add type to HeadBucketOutput for old boto

Reviewed-by: Yuval Lifshitz <ylifshit@ibm.com>

Merge pull request #59913 from clwluvw/bucketreplication-uid

rgw: use effective owner in PutBucketReplication

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

Merge pull request #61366 from aclamk/wip-aclamk-bluefs-unittest-string-fill-fix

os/bluestore: Fix unittest_bluefs

Merge pull request #61466 from rhcs-dashboard/storage-class-management

mgr/dashboard: Storage Class Management

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

mgr/dashboard: Storage Class Management

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

Merge pull request #61067 from MaxKellermann/librados_static

librados: disable symbol versions when building statically

Merge pull request #61025 from MaxKellermann/config_legacy_values__static

common/config: make `legacy_values` static

Merge pull request #58706 from xxhdx1985126/wip-67065

test: fix ld link errors

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

mgr/cephadm: continue in nfs service purge if grace file is already deleted

The test_nfs task we run in teuthology creates and removes a number of
nfs clusters during the task. I think it's possible based on timing for
it to end up in a situation where it tries to remove an nfs service before
the grace file has been created. In that case, cephadm doesn't know it
hasn't created the grace file and just repeatedly fails forever attempting
to remove the nonexistent file. This patch adds handling for the error
case where we get a nonzero rc but the error message implies the command
failed because the file already does not exist.

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

Merge pull request #61589 from piyushagarwal1411/fix-69727-main

mgr/dashboard: Add 'Browse Dashboards' button in Grafana dashboards

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

Merge pull request #61634 from VallariAg/wip-vallari-nvme-maxgroup-alert

monitoring: add NVMeoFMaxGatewayGroups alert

Merge pull request #61357 from VallariAg/wip-nvmeof-teuthology-test-fix-ha

qa: fix nvmeof teuthology thrasher fix

Merge pull request #61620 from anthonyeleven/remove-obsolete-sample-conf

src: modernize sample.ceph.conf

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

qa/suites/nvmeof: use SCALING_DELAYS: '120'

Increase delays for qa/workunits/nvmeof/scalability_test.sh
as namespace rebalancing takes more time. After upscaling,
gateway initially could be 'CREATED', it is a valid state during
gateway initialization, but then the state should progress
to 'AVAILABLE' within couple of seconds.

Signed-off-by: Vallari Agrawal <vallari.agrawal@ibm.com>

common,osd: replace obsolete get_tracked_conf_keys()

... with get_tracked_keys().

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

Merge pull request #61567 from idryomov/wip-58185

librbd: stop filtering async request error codes

Reviewed-by: Ramana Raja <rraja@redhat.com>

mgr/dashboard: Add 'Browse Dashboards' button in Grafana dashboards

Fixes: https://tracker.ceph.com/issues/69727
Signed-off-by: Piyush Agarwal <piyushagarwal14.pa@gmail.com>

Merge pull request #60686 from zhsgao/mds_bal_overload_epochs

mds: fix option mds_bal_overload_epochs

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

cephadm: Add pre_remove and ensure deployment values are reset and API settings are updated when removing Prometheus or Alertmanager daemons

This fixes an issue where the dashboard API settings are not updated
properly when the active Prometheus or Alertmanager daemon is removed.
If the active daemon is removed, the settings are reconfigured to point
to a remaining daemon or reset if no daemons are available.

This avoids dashboard errors like "404 Not Found" caused by stale API
host settings.

Signed-off-by: Kushal Deb <Kushal.Deb@ibm.com>

Fixup for emacs/vim modes, moved to top of file.

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

Merge pull request #61632 from gbregman/main

mgr/cephadm/nvmeof: Add max_hosts field to NVMeOF configuration

mgr/cephadm/nvmeof: Add max_hosts field to NVMeOF configuration and update default values
Fixes https://tracker.ceph.com/issues/69759

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

Merge pull request #61627 from petrutlucian94/zlib-fix

win32_deps_build.sh: pin zlib tag

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

Merge pull request #61374 from myoungwon/fix-68518

src/test: allow ENOENT if target object of tier_flush has snapshots

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

monitoring: add tests for NVMeoFMaxGatewayGroups

Add unit tests for alert NVMeoFMaxGatewayGroups
in monitoring/ceph-mixin/tests_alerts/test_alerts.yml

Signed-off-by: Vallari Agrawal <vallari.agrawal@ibm.com>

monitoring: add alert NVMeoFMaxGatewayGroups

Add alert NVMeoFMaxGatewayGroups to prometheus_alerts.yml
and prometheus_alerts.libsonnet.

This alerts is to indicate if max number of NVMeoF gateway
groups have been reached in a cluster.

Signed-off-by: Vallari Agrawal <vallari.agrawal@ibm.com>

monitoring: add NVMeoFMaxGatewayGroups

Add config NVMeoFMaxGatewayGroups to config.libsonnet
and set it to 4 (groups).

Signed-off-by: Vallari Agrawal <vallari.agrawal@ibm.com>

Merge pull request #61628 from kamoltat/wip-ksirivad-fix-stretch-mode-doc

doc/rados/operations/stretch-mode: fix mistake in stretch mode

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

doc/rados/operations/stretch-mode: fix mistake in stretch mode

Degraded stretch mode should only half the "min_size" not
"size".

Fixes: No tracker (doc changes)
Signed-off-by: Kamoltat Sirivadhna <ksirivad@redhat.com>

Merge pull request #61232 from xxhdx1985126/wip-67888-followup

osd/PeeringState: rename "cancel_backfill" to "suspend_backfill"

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

Merge pull request #61397 from amathuria/wip-amat-test-osdmap-pruning

mon/test_mon_osdmap_prune: Use first_pinned instead of first_committed

Merge pull request #61365 from Matan-B/wip-matanb-snapmapper-logs

osd/SnapMapper: Improve logging

Merge pull request #61328 from adamemerson/wip-64191

test/neorados: Silence mismatched new/delete warning

Merge pull request #60945 from NitzanMordhai/wip-nitzan-crushwrapper-corpus-squid

dencoder tests fix type backwards incompatible checks

win32_deps_build.sh: pin zlib tag

The zlib Windows build started to fail, probably because of this:
https://github.com/madler/zlib/issues/1038

  Cloning into 'zlib'...
  make: *** No rule to make target 'zconf.h', needed by 'adler32.o'.

We'll pin the zlib version for now to unblock the Windows build.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>

qa/suites/nvmeof: Remove watchdog from thrasher

This commit does the following:
1. remove watchdog from thrasher
1. remove wait from fio_test
3. change thrasher switcher wait-time to 10 mins

Signed-off-by: Vallari Agrawal <vallari.agrawal@ibm.com>

src: modernize sample.ceph.conf

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

Merge pull request #61577 from ronen-fr/wip-rf-just-me

osd/scrub: remove unnecessary loop

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

Merge pull request #61538 from leonidc/fix-duplicated-optimized

nvmeofgw* : fix duplicated optimized host's pathes

Merge pull request #61590 from ronen-fr/wip-rf-noinfo-repair

osd/scrub: discard repair_oinfo_oid()

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

Merge pull request #61394 from ronen-fr/wip-rf-cacher-v2

common: modify md_config_obs_impl API

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

Merge pull request #60426 from ronen-fr/wip-rf-svwperf

common/perf_counters: enabling 'find()' by logger name

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

doc/cephadm: clarify "Monitoring OSD State"

Change "Remove an OSD" to "Monitoring OSD State During OSD Removal" and
reword a sentence so that it more clearly refers to the process under
discussion.

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

Merge pull request #61613 from zdover23/wip-doc-2025-02-02-architecture

doc/architecture: remove sentence

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

doc/architecture: remove sentence

Remove a sentence that is more marketing than reference.

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

Merge pull request #61561 from athanatos/sjust/wip-crimson-recovery-69412

crimson: take obc lock during push commit on primary

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

Merge pull request #61001 from MaxKellermann/common_includes

common: add missing includes

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

Merge pull request #61598 from idryomov/wip-rbd-migration-https-doc

doc/rbd: use https links in live import examples

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

crimson/.../replicated_recovery_backend: take excl lock while pushes commit

Fixes: https://tracker.ceph.com/issues/69412
Signed-off-by: Samuel Just <sjust@redhat.com>

crimson/.../replicated_recovery_backend: route pushes earlier

Let ReplicatedRecoveryBackend::handle_recovery_op route pushes
between handle_push and handle_pull_response instead of
ReplicatedRecoveryBackend::handle_push.

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

pybind/mgr/cephadm: allow setting custom monitoring_port for nfs

ganesha config allows this, so allow users to set their own custom
ports in case they wish to do so.

Signed-off-by: Omid Yoosefi <omidyoosefi@ibm.com>

mgr/cephadm: add Server_Scope = <fsid> to NFSv4 section of ganesha conf

From the ganesha team

"""
In the NFSv4 param block, we need a parameter Server_Scope set to some value common among all servers in a cluster.

The default with it blank is to use the hostname which may be different for each server in the cluster.
"""

This is related to ongoing work on high availability nfs. From the cephadm side
we just need to make sure all nfs daemons in the cluster end up with
the same value for the Server_Scope field. This patch uses the cluster
id (which we already brought into the template as the "namespace" attribute)

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

doc/rbd: use https links in live import examples

Even though it's explicitly said that "http" stream can be used to
import via both HTTP and HTTPS, it can still be confusing that "type":
"http" is expected to go with "url": "https://...".  Switch example
URLs from HTTP to HTTPS to make it more obvious.

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

Merge pull request #57551 from linuxbox2/wip-rgwlc-66111

rgwlc: send pool transition notifications too

Merge pull request #60250 from aainscow/interval_set_enhancements

include: interval_set: Relax requirements and enhance performance of interval sets