From d22246499cdd98952a9606731ef598500ddfd980 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 10 Jan 2018 12:23:20 -0600 Subject: [PATCH] common/config: interpret CEPH_LIB in parse_env() Apply to the three plugin directory options. Signed-off-by: Sage Weil --- src/common/config.cc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/common/config.cc b/src/common/config.cc index 7e0deb4dae3..1dbc383e200 100644 --- a/src/common/config.cc +++ b/src/common/config.cc @@ -475,6 +475,15 @@ void md_config_t::parse_env(const char *args_var) env_to_vec(env_args, args_var); parse_argv(env_args, CONF_ENV); } + if (const char *dir = getenv("CEPH_LIB")) { + Mutex::Locker l(lock); + for (auto name : { "erasure_code_dir", "plugin_dir", "osd_class_dir" }) { + std::string err; + const Option *o = find_option(name); + assert(o); + _set_val(dir, *o, CONF_ENV, &err); + } + } } void md_config_t::show_config(std::ostream& out) -- 2.39.5