]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
global: ensure CEPH_ARGS is decoded before early arg processing 32830/head
authorJason Dillaman <dillaman@redhat.com>
Fri, 24 Jan 2020 15:38:27 +0000 (10:38 -0500)
committerJason Dillaman <dillaman@redhat.com>
Fri, 24 Jan 2020 15:40:06 +0000 (10:40 -0500)
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 <dillaman@redhat.com>
src/global/global_init.cc

index 97265040061c0b54309e453ef456184e3a2c5505..1c60534d3793b5a0f9d35f9f0d556e728861ecca 100644 (file)
@@ -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);