Skip to content

Commit

Permalink
Merge pull request #9522 from subhamkrai/fix-doc
Browse files Browse the repository at this point in the history
docs: add section for `disruptionManagement`
  • Loading branch information
satoru-takeuchi committed Jan 5, 2022
2 parents 5b26cb1 + 0b0c8da commit 51d569e
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Documentation/ceph-cluster-crd.md
Expand Up @@ -221,6 +221,7 @@ For more details on the mons and when to choose a number other than `3`, see the
* `onlyApplyOSDPlacement`: Whether the placement specific for OSDs is merged with the `all` placement. If `false`, the OSD placement will be merged with the `all` placement. If true, the `OSD placement will be applied` and the `all` placement will be ignored. The placement for OSDs is computed from several different places depending on the type of OSD:
- For non-PVCs: `placement.all` and `placement.osd`
- For PVCs: `placement.all` and inside the storageClassDeviceSets from the `placement` or `preparePlacement`
* `disruptionManagement`: The section for configuring management of daemon disruptions
* `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. This is only relevant when `managePodBudgets` is `true`. The default value is `30` minutes.
* `manageMachineDisruptionBudgets`: if `true`, the operator will create and manage MachineDisruptionBudgets to ensure OSDs are only fenced when the cluster is healthy. Only available on OpenShift.
Expand All @@ -238,10 +239,10 @@ These are general purpose Ceph container with all necessary daemons and dependen

| TAG | MEANING |
| -------------------- | --------------------------------------------------------- |
| vRELNUM | Latest release in this series (e.g., *v15* = Octopus) |
| vRELNUM | Latest release in this series (e.g., *v15* = Octopus) |
| vRELNUM.Y | Latest stable release in this stable series (e.g., v15.2) |
| vRELNUM.Y.Z | A specific release (e.g., v15.2.5) |
| vRELNUM.Y.Z-YYYYMMDD | A specific build (e.g., v15.2.11-20200419) |
| vRELNUM.Y.Z-YYYYMMDD | A specific build (e.g., v15.2.11-20200419) |

A specific will contain a specific release of Ceph as well as security fixes from the Operating System.

Expand Down

0 comments on commit 51d569e

Please sign in to comment.