From c889e0a0cbba84df47b75aa145d6f7ba8a36e892 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 (cherry picked from commit dbdcb2535d0d463d92d90169175e0776a0ee58e3) Conflicts: qa/tasks/ceph_manager.py [ commit 530982129ec1 ("qa: add method run ceph cluster command with better interface") not in octopus ] --- qa/tasks/ceph_manager.py | 1 - src/common/config.cc | 3 --- src/common/config_values.h | 1 - src/libcephfs.cc | 3 +-- src/librados/RadosClient.cc | 3 +-- 5 files changed, 2 insertions(+), 9 deletions(-) diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py index dc7ff02e50c6..293d8eadd8e1 100644 --- a/qa/tasks/ceph_manager.py +++ b/qa/tasks/ceph_manager.py @@ -1352,7 +1352,6 @@ class CephManager: 'ceph', '--cluster', self.cluster, - '--log-early', ] ceph_args.extend(args) proc = self.controller.run( diff --git a/src/common/config.cc b/src/common/config.cc index 53007f925146..223b4e97b3a8 100644 --- a/src/common/config.cc +++ b/src/common/config.cc @@ -649,9 +649,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 0485824bead3..5cf79eee6599 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 b69a0b2b7b2c..e234e21d69c6 100644 --- a/src/libcephfs.cc +++ b/src/libcephfs.cc @@ -78,8 +78,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 3e591d635137..0528c0eaba93 100644 --- a/src/librados/RadosClient.cc +++ b/src/librados/RadosClient.cc @@ -228,8 +228,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.47.3