From: Patrick Donnelly Date: Tue, 24 Jun 2025 18:52:09 +0000 (-0400) Subject: Revert "Merge pull request #64111 from zdover23/wip-doc-2025-06-23-tr71796-rados... X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=bee86373e6001f74763d0b69df65c3c5d3389e78;p=ceph.git Revert "Merge pull request #64111 from zdover23/wip-doc-2025-06-23-tr71796-rados-ops-balancer" This reverts commit f2b7c0465ea2727537ea58b44b2f17c6dda7d556, reversing changes made to e5868d88dd3ada55a7cacd7a5faec5aa9bc96aff. Signed-off-by: Patrick Donnelly --- diff --git a/doc/rados/operations/balancer.rst b/doc/rados/operations/balancer.rst index f30f19a30f8ab..8789df70cf552 100644 --- a/doc/rados/operations/balancer.rst +++ b/doc/rados/operations/balancer.rst @@ -60,14 +60,12 @@ of the following form: A larger value may increase the speed of cluster balancing / convergence at the potential cost of greater impact on client operations. -The setting ``upmax_max_deviation`` sets the threshold at which the balancer -module considers the cluster's distribution of PGs adequately balanced. At the -time of writing (June 2025), this value defaults to ``5``, which means that a -given OSD's PG replicas are considered adequately balanced when they vary by -five or fewer above or below the cluster's average. Here are the details of -this configurable: - -.. confval:: upmap_max_deviation +There is a separate setting ``upmap_max_deviation`` for how uniform the +distribution of PGs must be for the module to consider the cluster adequately +balanced. At the time of writing (June 2025), this value defaults to ``5``, +which means that if a given OSD's PG replicas vary by five or fewer above or +below the cluster's average, it will be considered sufficiently balanced. + This value of PG replicas / shards (as distinct from logical PGs) is reported by the ``ceph osd df`` command under the ``PGS`` column and the variance diff --git a/src/common/options/global.yaml.in b/src/common/options/global.yaml.in index 6122ac275771f..0999c791ba67f 100644 --- a/src/common/options/global.yaml.in +++ b/src/common/options/global.yaml.in @@ -6834,8 +6834,3 @@ options: level: dev default: 0 desc: When EC writes should generate PDWs (development only) 0=optimal 1=never 2=when possible -- name: upmap_max_deviation - type: int - level: unknown (fixme) - default: 5 - desc: If the number of PGs is within this count then no optimization is attempted