From 80f6508fc25018dd9c70d05f99c40325062d129e Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Thu, 21 Sep 2017 15:19:47 -0400
Subject: [PATCH] osd: make shutdown debug conditional (and off by default)

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 6169cf64423c7554dc0630d90d8dee27437bf05f)
---
 src/common/options.cc |  4 ++++
 src/osd/OSD.cc        | 14 ++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/common/options.cc b/src/common/options.cc
index 0be052e1bc551..aa493482ddf53 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -2580,6 +2580,10 @@ std::vector<Option> get_global_options() {
     .set_default(false)
     .set_description(""),
 
+    Option("osd_debug_shutdown", Option::TYPE_BOOL, Option::LEVEL_DEV)
+    .set_default(false)
+    .set_description("Turn up debug levels during shutdown"),
+
     Option("osd_debug_crash_on_ignored_backoff", Option::TYPE_BOOL, Option::LEVEL_DEV)
     .set_default(false)
     .set_description(""),
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 8056e6283f13f..e70930f75c148 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3250,12 +3250,14 @@ int OSD::shutdown()
   set_state(STATE_STOPPING);
 
   // Debugging
-  cct->_conf->set_val("debug_osd", "100");
-  cct->_conf->set_val("debug_journal", "100");
-  cct->_conf->set_val("debug_filestore", "100");
-  cct->_conf->set_val("debug_bluestore", "100");
-  cct->_conf->set_val("debug_ms", "100");
-  cct->_conf->apply_changes(NULL);
+  if (cct->_conf->get_val<bool>("osd_debug_shutdown")) {
+    cct->_conf->set_val("debug_osd", "100");
+    cct->_conf->set_val("debug_journal", "100");
+    cct->_conf->set_val("debug_filestore", "100");
+    cct->_conf->set_val("debug_bluestore", "100");
+    cct->_conf->set_val("debug_ms", "100");
+    cct->_conf->apply_changes(NULL);
+  }
 
   // stop MgrClient earlier as it's more like an internal consumer of OSD
   mgrc.shutdown();
-- 
2.39.5