From 5952acdd9309142ec804b73b05106537d46d1ea3 Mon Sep 17 00:00:00 2001
From: "Wickersham, Brian (bw6938)" <bw6938@att.com>
Date: Mon, 16 Mar 2020 19:47:28 +0000
Subject: [PATCH] [ceph-osd] A rack's OSDs are not marked out after down_out
 interval

An entire rack's OSDs are not being marked out after
down_out interval. This manifested itself during
resiliency testing when all interfaces were brought
down on a control plan host and the down_interval
was surpassed.

Change-Id: I6f4a69ec442c3e768feb7bd74c7d610aa9d4aa67
---
 ceph-mon/values.yaml | 3 +++
 ceph-osd/values.yaml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/ceph-mon/values.yaml b/ceph-mon/values.yaml
index 527f9f5b4..9444112a2 100644
--- a/ceph-mon/values.yaml
+++ b/ceph-mon/values.yaml
@@ -189,6 +189,9 @@ conf:
       objecter_inflight_ops: 10240
       debug_ms: "0/0"
       mon_osd_down_out_interval: 1800
+      mon_osd_down_out_subtree_limit: root
+      mon_osd_min_in_ratio: 0
+      mon_osd_min_up_ratio: 0
       mon_data_avail_warn: 15
       log_file: /dev/stdout
       mon_cluster_log_file: /dev/stdout
diff --git a/ceph-osd/values.yaml b/ceph-osd/values.yaml
index 985e379cf..59ec192a2 100644
--- a/ceph-osd/values.yaml
+++ b/ceph-osd/values.yaml
@@ -163,6 +163,9 @@ conf:
       objecter_inflight_ops: 10240
       debug_ms: "0/0"
       mon_osd_down_out_interval: 1800
+      mon_osd_down_out_subtree_limit: root
+      mon_osd_min_in_ratio: 0
+      mon_osd_min_up_ratio: 0
     osd:
       osd_mkfs_type: xfs
       osd_mkfs_options_xfs: -f -i size=2048