From da11800d308ea08373b095f50c4871bca12f1d6b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 13 Nov 2017 09:24:03 -0600 Subject: [PATCH] common/config: record is_daemon Signed-off-by: Sage Weil --- src/common/config.cc | 5 +++-- src/common/config.h | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/common/config.cc b/src/common/config.cc index d903ca4e13d..cbba1c80b7b 100644 --- a/src/common/config.cc +++ b/src/common/config.cc @@ -75,8 +75,9 @@ int ceph_resolve_file_search(const std::string& filename_list, md_config_t::md_config_t(bool is_daemon) - : cluster(""), - lock("md_config_t", true, false) + : is_daemon(is_daemon), + cluster(""), + lock("md_config_t", true, false) { // Load the compile-time list of Option into // a map so that we can resolve keys quickly. diff --git a/src/common/config.h b/src/common/config.h index 112e328963f..e92813ab92c 100644 --- a/src/common/config.h +++ b/src/common/config.h @@ -65,6 +65,8 @@ public: bool md_config_t::*, entity_addr_t md_config_t::*, uuid_d md_config_t::*> member_ptr_t; + /// true if we are a daemon (as per CephContext::code_env) + const bool is_daemon; /* Maps configuration options to the observer listening for them. */ typedef std::multimap obs_map_t; -- 2.39.5