RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-29 06:52:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #32830 into master

Browse Source 
* refs/pull/32830/head:
	global: ensure CEPH_ARGS is decoded before early arg processing

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2020-01-31 17:31:44 -06:00
commit b02c3ff18b
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/global/global_init.cc
View 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);