From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 24 Jan 2020 15:38:27 +0000 (-0500)
Subject: global: ensure CEPH_ARGS is decoded before early arg processing
X-Git-Tag: v15.1.1~583^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0762fc6fdb3c2dc707390016fd2d8eaca6e0a342;p=ceph.git

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 <dillaman@redhat.com>
---

diff --git a/src/global/global_init.cc b/src/global/global_init.cc
index 97265040061c..1c60534d3793 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);