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>
(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 ]

diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py
index dc7ff02e50c66d85b85e5bdfa8617abdc508f855..293d8eadd8e1bb2a6b822250a5bfdb02c369bfef 100644 (file)
--- 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 53007f925146d65489b0840b6905f528266312aa..223b4e97b3a8f9d77fe96abe6d840e2260f3b13e 100644 (file)
--- 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 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 b69a0b2b7b2c63f16a2b21f0cde59426b5af9cd8..e234e21d69c626a998783dd62412a754660cccb3 100644 (file)
--- 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 3e591d6351376e6de2e3002c63f5d012f00eea7c..0528c0eaba93dedf310ae408e02ef526ba4c4df9 100644 (file)
--- 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();
   }