From dbdcb2535d0d463d92d90169175e0776a0ee58e3 Mon Sep 17 00:00:00 2001 From: Changcheng Liu Date: Tue, 13 Oct 2020 09:47:16 +0800 Subject: [PATCH] common: remove log_early configuration option After deciding to always enable tracking log in early phase, there's no need to keep "log_early" option here and remove it directly. Suggested-by: Kefu Chai Signed-off-by: Changcheng Liu --- qa/tasks/ceph_manager.py | 2 +- src/common/config.cc | 3 --- src/common/config_values.h | 1 - src/libcephfs.cc | 3 +-- src/librados/RadosClient.cc | 3 +-- 5 files changed, 3 insertions(+), 9 deletions(-) diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py index 5f0eea714bf76..f52eea1f9ee48 100644 --- a/qa/tasks/ceph_manager.py +++ b/qa/tasks/ceph_manager.py @@ -1342,7 +1342,7 @@ class CephManager: testdir = teuthology.get_testdir(self.ctx) prefix = ['sudo', 'adjust-ulimits', 'ceph-coverage', f'{testdir}/archive/coverage', 'timeout', '120', 'ceph', - '--cluster', self.cluster, '--log-early'] + '--cluster', self.cluster] kwargs['args'] = prefix + list(kwargs['args']) return self.controller.run(**kwargs) diff --git a/src/common/config.cc b/src/common/config.cc index 129cb344dac59..b1c178d40b9a0 100644 --- a/src/common/config.cc +++ b/src/common/config.cc @@ -667,9 +667,6 @@ int md_config_t::parse_argv(ConfigValues& values, else if (ceph_argparse_flag(args, i, "--no-mon-config", (char*)NULL)) { values.no_mon_config = true; } - else if (ceph_argparse_flag(args, i, "--log-early", (char*)NULL)) { - values.log_early = true; - } else if (ceph_argparse_flag(args, i, "--mon-config", (char*)NULL)) { values.no_mon_config = false; } diff --git a/src/common/config_values.h b/src/common/config_values.h index 0485824bead3d..5cf79eee65990 100644 --- a/src/common/config_values.h +++ b/src/common/config_values.h @@ -28,7 +28,6 @@ public: std::string cluster; ceph::logging::SubsystemMap subsys; bool no_mon_config = false; - bool log_early = false; // Set of configuration options that have changed since the last // apply_changes using changed_set_t = std::set; diff --git a/src/libcephfs.cc b/src/libcephfs.cc index 944ea87967df0..a17577ac7fc2f 100644 --- a/src/libcephfs.cc +++ b/src/libcephfs.cc @@ -80,8 +80,7 @@ public: { int ret; - if (cct->_conf->log_early && - !cct->_log->is_started()) { + if (!cct->_log->is_started()) { cct->_log->start(); } diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc index 49135f64045d7..9f5446ac60387 100644 --- a/src/librados/RadosClient.cc +++ b/src/librados/RadosClient.cc @@ -212,8 +212,7 @@ int librados::RadosClient::connect() return -EISCONN; state = CONNECTING; - if (cct->_conf->log_early && - !cct->_log->is_started()) { + if (!cct->_log->is_started()) { cct->_log->start(); } -- 2.39.5