From 0762fc6fdb3c2dc707390016fd2d8eaca6e0a342 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Fri, 24 Jan 2020 10:38:27 -0500 Subject: [PATCH] global: ensure CEPH_ARGS is decoded before early arg processing The early args include fields like the user id/name, configuration file location, and cluster name. This support was accidentally removed in commit 7f23142f5ccc5ac8153d32b2c9a8353593831967 during "global_(pre_)init" cleanup. Fixes: https://tracker.ceph.com/issues/43795 Signed-off-by: Jason Dillaman --- src/global/global_init.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/global/global_init.cc b/src/global/global_init.cc index 97265040061..1c60534d379 100644 --- a/src/global/global_init.cc +++ b/src/global/global_init.cc @@ -90,6 +90,9 @@ void global_pre_init( std::string conf_file_list; std::string cluster = ""; + // ensure environment arguments are included in early processing + env_to_vec(args); + CephInitParameters iparams = ceph_argparse_early_args( args, module_type, &cluster, &conf_file_list); -- 2.47.3