diff --git a/Documentation/CRDs/Cluster/ceph-cluster-crd.md b/Documentation/CRDs/Cluster/ceph-cluster-crd.md index 5dcf9b63a..d213eef24 100755 --- a/Documentation/CRDs/Cluster/ceph-cluster-crd.md +++ b/Documentation/CRDs/Cluster/ceph-cluster-crd.md @@ -104,7 +104,6 @@ For more details on the mons and when to choose a number other than `3`, see the * `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. * `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. * `pgHealthyRegex`: The regular expression that is used to determine which PG states should be considered healthy. - The default is `^(active\+clean|active\+clean\+scrubbing|active\+clean\+scrubbing\+deep)$`. * `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. * `cleanupPolicy`: [cleanup policy settings](#cleanup-policy) * `security`: [security page for key management configuration](../../Storage-Configuration/Advanced/key-management-system.md) diff --git a/Documentation/CRDs/specification.md b/Documentation/CRDs/specification.md index 0114c87eb..a20c5c62f 100644 --- a/Documentation/CRDs/specification.md +++ b/Documentation/CRDs/specification.md @@ -6605,7 +6605,7 @@ string (Optional)

PgHealthyRegex is the regular expression that is used to determine which PG states should be considered healthy. -The default is ^(active\+clean|active\+clean\+scrubbing|active\+clean\+scrubbing\+deep)$

+The default is ^active(\+(clean|deep|scrubbing|snaptrim|snaptrim_wait))+$

diff --git a/deploy/charts/rook-ceph/templates/resources.yaml b/deploy/charts/rook-ceph/templates/resources.yaml index f51392759..6b55b3940 100644 --- a/deploy/charts/rook-ceph/templates/resources.yaml +++ b/deploy/charts/rook-ceph/templates/resources.yaml @@ -1753,7 +1753,7 @@ spec: pgHealthyRegex: description: |- PgHealthyRegex is the regular expression that is used to determine which PG states should be considered healthy. - The default is `^(active\+clean|active\+clean\+scrubbing|active\+clean\+scrubbing\+deep)$` + The default is `^active(\+(clean|deep|scrubbing|snaptrim|snaptrim_wait))+$` type: string type: object external: diff --git a/deploy/examples/crds.yaml b/deploy/examples/crds.yaml index 44075d5bf..e92425bfa 100644 --- a/deploy/examples/crds.yaml +++ b/deploy/examples/crds.yaml @@ -1751,7 +1751,7 @@ spec: pgHealthyRegex: description: |- PgHealthyRegex is the regular expression that is used to determine which PG states should be considered healthy. - The default is `^(active\+clean|active\+clean\+scrubbing|active\+clean\+scrubbing\+deep)$` + The default is `^active(\+(clean|deep|scrubbing|snaptrim|snaptrim_wait))+$` type: string type: object external: diff --git a/pkg/apis/ceph.rook.io/v1/types.go b/pkg/apis/ceph.rook.io/v1/types.go index ae50d4bf2..8592c8384 100755 --- a/pkg/apis/ceph.rook.io/v1/types.go +++ b/pkg/apis/ceph.rook.io/v1/types.go @@ -3170,7 +3170,7 @@ type DisruptionManagementSpec struct { PGHealthCheckTimeout time.Duration `json:"pgHealthCheckTimeout,omitempty"` // PgHealthyRegex is the regular expression that is used to determine which PG states should be considered healthy. - // The default is `^(active\+clean|active\+clean\+scrubbing|active\+clean\+scrubbing\+deep)$` + // The default is `^active(\+(clean|deep|scrubbing|snaptrim|snaptrim_wait))+$` // +optional PGHealthyRegex string `json:"pgHealthyRegex,omitempty"`