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 <kefu@redhat.com>
Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>

diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py
index 5f0eea714bf762369fefe813bd25249886362bd3..f52eea1f9ee485759b26934a90c4e6928981778f 100644 (file)
--- 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 129cb344dac59121c9d41e41a38e04ec6cd0b842..b1c178d40b9a08206581f344b3d1c60aa923a84a 100644 (file)
--- 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 0485824bead3d0e60eccd2aa3881b5fc968986db..5cf79eee65990ada61ec331df85850d63e7fff04 100644 (file)
--- 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<std::string>;

diff --git a/src/libcephfs.cc b/src/libcephfs.cc
index 944ea87967df08e8d64dc5f8247f27add0e97185..a17577ac7fc2f828a2717d9ffa376e2a790fe852 100644 (file)
--- 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 49135f64045d7e5ab68f5a8087b3025a2c89c5de..9f5446ac60387696198f3faa3ed6c6afdcd210f5 100644 (file)
--- 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();
   }