From: Brad Hubbard <bhubbard@redhat.com>
Date: Fri, 9 Dec 2016 07:52:31 +0000 (+1000)
Subject: doc: Modify documentation for mon_osd_down_out_interval
X-Git-Tag: v11.1.0~18^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F12408%2Fhead;p=ceph.git

doc: Modify documentation for mon_osd_down_out_interval

Update docs to reflect the new default of 600 set by 817d65bd4

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
---

diff --git a/doc/rados/configuration/mon-osd-interaction.rst b/doc/rados/configuration/mon-osd-interaction.rst
index be1223691f22..1e931d5f2108 100644
--- a/doc/rados/configuration/mon-osd-interaction.rst
+++ b/doc/rados/configuration/mon-osd-interaction.rst
@@ -286,7 +286,7 @@ Monitor Settings
               ``down`` and ``out`` if it doesn't respond.
               
 :Type: 32-bit Integer
-:Default: ``300``
+:Default: ``600``
 
 
 ``mon osd down out subtree limit``
diff --git a/doc/rados/operations/monitoring-osd-pg.rst b/doc/rados/operations/monitoring-osd-pg.rst
index e565fb719603..866ae8313ba4 100644
--- a/doc/rados/operations/monitoring-osd-pg.rst
+++ b/doc/rados/operations/monitoring-osd-pg.rst
@@ -439,7 +439,7 @@ still write a new object to a ``degraded`` placement group if it is ``active``.
 If an OSD is ``down`` and the ``degraded`` condition persists, Ceph may mark the
 ``down`` OSD as ``out`` of the cluster and remap the data from the ``down`` OSD
 to another OSD. The time between being marked ``down`` and being marked ``out``
-is controlled by ``mon osd down out interval``, which is set to ``300`` seconds
+is controlled by ``mon osd down out interval``, which is set to ``600`` seconds
 by default.
 
 A placement group can also be ``degraded``, because Ceph cannot find one or more
diff --git a/src/ceph.conf.twoosds b/src/ceph.conf.twoosds
index 3417cf68fce1..bc7e87daf272 100644
--- a/src/ceph.conf.twoosds
+++ b/src/ceph.conf.twoosds
@@ -23,7 +23,7 @@
 	mon data = /data/mondata/mon$num
 	debug mon = 20
 	debug ms = 20
-	mon osd down out interval = 0  ; 10 minutes
+	mon osd down out interval = 600  ; 10 minutes
 
 [mon0]
 	host = cosd0
diff --git a/src/sample.ceph.conf b/src/sample.ceph.conf
index 120dd3335cb7..3af355cb48e6 100644
--- a/src/sample.ceph.conf
+++ b/src/sample.ceph.conf
@@ -207,8 +207,8 @@
     # The number of seconds Ceph waits before marking a Ceph OSD
     # Daemon "down" and "out" if it doesn't respond.
     # Type: 32-bit Integer
-    # (Default: 300)
-    ;mon osd down out interval  = 300
+    # (Default: 600)
+    ;mon osd down out interval  = 600
 
     # The grace period in seconds before declaring unresponsive Ceph OSD
     # Daemons "down".