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 [ already dropped in nautilus, commit
	  b8dd87424ecb ("qa/tasks/ceph_manager.py: don't use log-early
	  in raw_cluster_cmd") ]

diff --git a/src/common/config.cc b/src/common/config.cc
index 863525efe78a08cf73ea4afd2729e02a8aec21d6..5e19e8c06ed06b9b785f9d04cf74ca9ecf44a180 100644 (file)
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -651,9 +651,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 ab52060e462928c25be5abcf9c3e17ee7ac6029a..fdfff2b16f33eea5872411330d378507b3cf2541 100644 (file)
--- a/src/common/config_values.h
+++ b/src/common/config_values.h
@@ -28,7 +28,6 @@ public:
   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 66c066436d2e748918322efeb69ec010f13f98e5..a48e83163fea333db4603cfd0d1b2ba214a50746 100755 (executable)
--- a/src/libcephfs.cc
+++ b/src/libcephfs.cc
@@ -79,8 +79,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 0ee2985ed3f28fb409519ace6d2858298d89146d..e56ec101c409508a69d712a0ecf8f67419867475 100644 (file)
--- a/src/librados/RadosClient.cc
+++ b/src/librados/RadosClient.cc
@@ -238,8 +238,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();
   }