common: add crash_dir option

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index 323175c1f2f187ea51a485865680603b2507efc5..1df4177884a96f5199765a8c26b3aadf71f5a707 100644 (file)
--- 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 fc7df3b4df8977b97423bd8f18bac589a5cb7e70..a4c54a19b7f0ff57b648afcb772138ad4236d570 100644 (file)
--- 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 97d17bbbdd436f5b7c3a19e6c9397b9d2e566b68..84e84e4c19ae063137158e0993c3efc149244ada 100755 (executable)
--- 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