From: Sage Weil <sage@redhat.com>
Date: Fri, 15 Jun 2018 19:40:10 +0000 (-0500)
Subject: common: add crash_dir option
X-Git-Tag: v13.2.6~86^2~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=583f5920ea840269101a896455ae047de2a4c591;p=ceph.git

common: add crash_dir option

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 72139f0d23a9173448298c60fd3d3f1c48a97eeb)
---

diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index 82e81d24a97..f375e210ce9 100644
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -34,6 +34,7 @@ OPTION(chdir, OPT_STR)
 OPTION(restapi_log_level, OPT_STR) 	// default set by Python code
 OPTION(restapi_base_url, OPT_STR)	// "
 OPTION(fatal_signal_handlers, OPT_BOOL)
+OPTION(crash_dir, OPT_STR)
 SAFE_OPTION(erasure_code_dir, OPT_STR) // default location for erasure-code plugins
 
 OPTION(log_file, OPT_STR) // default changed by common_preinit()
diff --git a/src/common/options.cc b/src/common/options.cc
index 878f84b71f5..9e567b6f438 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -537,6 +537,10 @@ std::vector<Option> get_global_options() {
     .add_service({"mon", "mgr", "osd", "mds"})
     .add_tag("service"),
 
+    Option("crash_dir", Option::TYPE_STR, Option::LEVEL_ADVANCED)
+    .set_default("/var/lib/ceph/crash")
+    .set_description("Directory where crash reports are archived"),
+
     // restapi
     Option("restapi_log_level", Option::TYPE_STR, Option::LEVEL_ADVANCED)
     .set_description("default set by python code"),
diff --git a/src/vstart.sh b/src/vstart.sh
index 97d17bbbdd4..84e84e4c19a 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -458,6 +458,7 @@ prepare_conf() {
         plugin dir = $CEPH_LIB
         filestore fd cache size = 32
         run dir = $CEPH_OUT_DIR
+	crash dir = $CEPH_OUT_DIR
         enable experimental unrecoverable data corrupting features = *
 	osd_crush_chooseleaf_type = 0
 $extra_conf