Skip to content

Commit e80e050

Browse files
authored
Merge pull request rook#17376 from elias-dbx/fix_pg_health_regex_docs
doc: fix out of date references to default PgHealthyRegex
2 parents d39e888 + 5a06594 commit e80e050

5 files changed

Lines changed: 4 additions & 5 deletions

File tree

Documentation/CRDs/Cluster/ceph-cluster-crd.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ For more details on the mons and when to choose a number other than `3`, see the
104104
* `managePodBudgets`: if `true`, the operator will create and manage PodDisruptionBudgets for OSD, Mon, RGW, and MDS daemons. OSD PDBs are managed dynamically via the strategy outlined in the [design](https://github.com/rook/rook/blob/master/design/ceph/ceph-managed-disruptionbudgets.md). The operator will block eviction of OSDs by default and unblock them safely when drains are detected.
105105
* `osdMaintenanceTimeout`: is a duration in minutes that determines how long an entire failureDomain like `region/zone/host` will be held in `noout` (in addition to the default DOWN/OUT interval) when it is draining. The default value is `30` minutes.
106106
* `pgHealthyRegex`: The regular expression that is used to determine which PG states should be considered healthy.
107-
The default is `^(active\+clean|active\+clean\+scrubbing|active\+clean\+scrubbing\+deep)$`.
108107
* `removeOSDsIfOutAndSafeToRemove`: If `true` the operator will remove the OSDs that are down and whose data has been restored to other OSDs. In Ceph terms, the OSDs are `out` and `safe-to-destroy` when they are removed.
109108
* `cleanupPolicy`: [cleanup policy settings](#cleanup-policy)
110109
* `security`: [security page for key management configuration](../../Storage-Configuration/Advanced/key-management-system.md)

Documentation/CRDs/specification.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7009,7 +7009,7 @@ string
70097009
<td>
70107010
<em>(Optional)</em>
70117011
<p>PgHealthyRegex is the regular expression that is used to determine which PG states should be considered healthy.
7012-
The default is <code>^(active\+clean|active\+clean\+scrubbing|active\+clean\+scrubbing\+deep)$</code></p>
7012+
The default is <code>^active(\+(clean|deep|scrubbing|snaptrim|snaptrim_wait))+$</code></p>
70137013
</td>
70147014
</tr>
70157015
<tr>

deploy/charts/rook-ceph/templates/resources.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1753,7 +1753,7 @@ spec:
17531753
pgHealthyRegex:
17541754
description: |-
17551755
PgHealthyRegex is the regular expression that is used to determine which PG states should be considered healthy.
1756-
The default is `^(active\+clean|active\+clean\+scrubbing|active\+clean\+scrubbing\+deep)$`
1756+
The default is `^active(\+(clean|deep|scrubbing|snaptrim|snaptrim_wait))+$`
17571757
type: string
17581758
type: object
17591759
external:

deploy/examples/crds.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1751,7 +1751,7 @@ spec:
17511751
pgHealthyRegex:
17521752
description: |-
17531753
PgHealthyRegex is the regular expression that is used to determine which PG states should be considered healthy.
1754-
The default is `^(active\+clean|active\+clean\+scrubbing|active\+clean\+scrubbing\+deep)$`
1754+
The default is `^active(\+(clean|deep|scrubbing|snaptrim|snaptrim_wait))+$`
17551755
type: string
17561756
type: object
17571757
external:

pkg/apis/ceph.rook.io/v1/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3326,7 +3326,7 @@ type DisruptionManagementSpec struct {
33263326
PGHealthCheckTimeout time.Duration `json:"pgHealthCheckTimeout,omitempty"`
33273327

33283328
// PgHealthyRegex is the regular expression that is used to determine which PG states should be considered healthy.
3329-
// The default is `^(active\+clean|active\+clean\+scrubbing|active\+clean\+scrubbing\+deep)$`
3329+
// The default is `^active(\+(clean|deep|scrubbing|snaptrim|snaptrim_wait))+$`
33303330
// +optional
33313331
PGHealthyRegex string `json:"pgHealthyRegex,omitempty"`
33323332

0 commit comments

Comments
 (0)