misc: fix various log messages

add space between __func__ and following messages

Signed-off-by: Gu Zhongyan <guzhongyan@360.cn>

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 29703137c1763fa9a4ba71c6bf358334d64d4d85..3b7337a5834a3cbfcd95e0c98273d177bc59f1d1 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -10105,9 +10105,9 @@ int Client::_sync_fs()
 
   if (nullptr != cond) {
     client_lock.Unlock();
-    ldout(cct, 15) << __func__ << "waiting on data to flush" << dendl;
+    ldout(cct, 15) << __func__ << " waiting on data to flush" << dendl;
     cond->wait();
-    ldout(cct, 15) << __func__ << "flush finished" << dendl;
+    ldout(cct, 15) << __func__ << " flush finished" << dendl;
     client_lock.Lock();
   }
 
@@ -10422,7 +10422,7 @@ int Client::ll_walk(const char* name, Inode **out, struct ceph_statx *stx,
   int rc;
   unsigned mask = statx_to_mask(flags, want);
 
-  ldout(cct, 3) << __func__ << name << dendl;
+  ldout(cct, 3) << __func__ << " " << name << dendl;
   tout(cct) << __func__ << std::endl;
   tout(cct) << name << std::endl;
 

diff --git a/src/common/LogClient.cc b/src/common/LogClient.cc
index de19cfb62aeadef854f7006d0ce799e48f9afb9e..56975d8771ebbfd9f8fe7518afb66153eccce510 100644 (file)
--- a/src/common/LogClient.cc
+++ b/src/common/LogClient.cc
@@ -315,7 +315,7 @@ void LogClient::_send_to_mon()
   assert(log_lock.is_locked());
   assert(is_mon);
   assert(messenger->get_myname().is_mon());
-  ldout(cct,10) << __func__ << "log to self" << dendl;
+  ldout(cct,10) << __func__ << " log to self" << dendl;
   Message *log = _get_mon_log_message();
   messenger->get_loopback_connection()->send_message(log);
 }

diff --git a/src/kv/KineticStore.cc b/src/kv/KineticStore.cc
index 5d5359b00960ceb469e48786499dde95795cfef5..60dadacb2f2a62f926e1d059a570e05eea396c7f 100644 (file)
--- a/src/kv/KineticStore.cc
+++ b/src/kv/KineticStore.cc
@@ -40,7 +40,7 @@ int KineticStore::_test_init(CephContext *c)
   kinetic::Status status = conn_factory.NewThreadsafeBlockingConnection(options, kinetic_conn, 10);
   kinetic_conn.reset();
   if (!status.ok())
-    derr << __func__ << "Unable to connect to kinetic store " << options.host
+    derr << __func__ << " Unable to connect to kinetic store " << options.host
          << ":" << options.port << " : " << status.ToString() << dendl;
   return status.ok() ? 0 : -EIO;
 }

diff --git a/src/kv/RocksDBStore.cc b/src/kv/RocksDBStore.cc
index b81a103bd90b3f14e3d2fb3bbcd83eaa55886261..40cca225e577b1fb688c17d81a750ee7dc362c85 100644 (file)
--- a/src/kv/RocksDBStore.cc
+++ b/src/kv/RocksDBStore.cc
@@ -674,7 +674,7 @@ void RocksDBStore::split_stats(const std::string &s, char delim, std::vector<std
 void RocksDBStore::get_statistics(Formatter *f)
 {
   if (!g_conf->rocksdb_perf)  {
-    dout(20) << __func__ << "RocksDB perf is disabled, can't probe for stats"
+    dout(20) << __func__ << " RocksDB perf is disabled, can't probe for stats"
             << dendl;
     return;
   }

diff --git a/src/librbd/operation/DisableFeaturesRequest.cc b/src/librbd/operation/DisableFeaturesRequest.cc
index 34cc9579fe84567a41fdf6c7cd4a400cc6dfddbc..a67bc1e187457ed733bbebe09d125510760b4c9f 100644 (file)
--- a/src/librbd/operation/DisableFeaturesRequest.cc
+++ b/src/librbd/operation/DisableFeaturesRequest.cc
@@ -53,7 +53,7 @@ template <typename I>
 bool DisableFeaturesRequest<I>::should_complete(int r) {
   I &image_ctx = this->m_image_ctx;
   CephContext *cct = image_ctx.cct;
-  ldout(cct, 20) << this << " " << __func__ << "r=" << r << dendl;
+  ldout(cct, 20) << this << " " << __func__ << " r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "encountered error: " << cpp_strerror(r) << dendl;

diff --git a/src/librbd/operation/EnableFeaturesRequest.cc b/src/librbd/operation/EnableFeaturesRequest.cc
index c82fb937477744d7c6754e591327db72dfe9800d..241b6206d4c9b25dc79fe2abd2f1a2ba88a3c7f1 100644 (file)
--- a/src/librbd/operation/EnableFeaturesRequest.cc
+++ b/src/librbd/operation/EnableFeaturesRequest.cc
@@ -49,7 +49,7 @@ template <typename I>
 bool EnableFeaturesRequest<I>::should_complete(int r) {
   I &image_ctx = this->m_image_ctx;
   CephContext *cct = image_ctx.cct;
-  ldout(cct, 20) << this << " " << __func__ << "r=" << r << dendl;
+  ldout(cct, 20) << this << " " << __func__ << " r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "encountered error: " << cpp_strerror(r) << dendl;

diff --git a/src/librbd/operation/MetadataRemoveRequest.cc b/src/librbd/operation/MetadataRemoveRequest.cc
index 3c5a7448dd2091d008dd9be0ecd594ceedf705e1..e8f00a5a239677ea92eb25e1ba8631b069f1ba81 100644 (file)
--- a/src/librbd/operation/MetadataRemoveRequest.cc
+++ b/src/librbd/operation/MetadataRemoveRequest.cc
@@ -29,7 +29,7 @@ template <typename I>
 bool MetadataRemoveRequest<I>::should_complete(int r) {
   I &image_ctx = this->m_image_ctx;
   CephContext *cct = image_ctx.cct;
-  ldout(cct, 20) << this << " " << __func__ << "r=" << r << dendl;
+  ldout(cct, 20) << this << " " << __func__ << " r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "encountered error: " << cpp_strerror(r) << dendl;

diff --git a/src/librbd/operation/MetadataSetRequest.cc b/src/librbd/operation/MetadataSetRequest.cc
index 0142d827c9593b1f09ee1e8f31fdaba7c3fa218e..0cc2bc7646c50bbb9845050c85c9283d0bd201c1 100644 (file)
--- a/src/librbd/operation/MetadataSetRequest.cc
+++ b/src/librbd/operation/MetadataSetRequest.cc
@@ -30,7 +30,7 @@ template <typename I>
 bool MetadataSetRequest<I>::should_complete(int r) {
   I &image_ctx = this->m_image_ctx;
   CephContext *cct = image_ctx.cct;
-  ldout(cct, 20) << this << " " << __func__ << "r=" << r << dendl;
+  ldout(cct, 20) << this << " " << __func__ << " r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "encountered error: " << cpp_strerror(r) << dendl;

diff --git a/src/librbd/operation/SnapshotLimitRequest.cc b/src/librbd/operation/SnapshotLimitRequest.cc
index 670e0f0c165fe7783f4545e25cf872365c3dc04a..74f4723e91607723476ddcac5794dbff887fce2f 100644 (file)
--- a/src/librbd/operation/SnapshotLimitRequest.cc
+++ b/src/librbd/operation/SnapshotLimitRequest.cc
@@ -29,7 +29,7 @@ template <typename I>
 bool SnapshotLimitRequest<I>::should_complete(int r) {
   I &image_ctx = this->m_image_ctx;
   CephContext *cct = image_ctx.cct;
-  ldout(cct, 5) << this << " " << __func__ << "r=" << r << dendl;
+  ldout(cct, 5) << this << " " << __func__ << " r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "encountered error: " << cpp_strerror(r) << dendl;

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 9caf909c00e3b5da1ef66cd727769b63ee75710c..fd7c817f5c1eb03ce2e9d3e1716bd903f8b96d8e 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -12331,7 +12331,7 @@ void MDCache::enqueue_scrub(
     bool force, bool recursive, bool repair,
     Formatter *f, Context *fin)
 {
-  dout(10) << __func__ << path << dendl;
+  dout(10) << __func__ << " " << path << dendl;
   MDRequestRef mdr = request_start_internal(CEPH_MDS_OP_ENQUEUE_SCRUB);
   filepath fp(path);
   mdr->set_filepath(fp);

diff --git a/src/mds/ScrubStack.cc b/src/mds/ScrubStack.cc
index 290c30a5d26d8f870f4c11546fdf369c74f7b93d..59bab3387894054ddec4ce719bcfe1a2697d42e7 100644 (file)
--- a/src/mds/ScrubStack.cc
+++ b/src/mds/ScrubStack.cc
@@ -128,7 +128,7 @@ void ScrubStack::scrub_dir_inode(CInode *in,
                                  bool *terminal,
                                  bool *done)
 {
-  dout(10) << __func__ << *in << dendl;
+  dout(10) << __func__ << " " << *in << dendl;
 
   *added_children = false;
   bool all_frags_terminal = true;
@@ -266,7 +266,7 @@ class C_InodeValidated : public MDSInternalContext
 
 void ScrubStack::scrub_dir_inode_final(CInode *in)
 {
-  dout(20) << __func__ << *in << dendl;
+  dout(20) << __func__ << " " << *in << dendl;
 
   // Two passes through this function.  First one triggers inode validation,
   // second one sets finally_done

diff --git a/src/mgr/ActivePyModules.cc b/src/mgr/ActivePyModules.cc
index 7bf51450977921162f44a6da35d4ef90fc36c543..31884427fd97a2fcf2d08b7d03c7c9446474a1ea 100644 (file)
--- a/src/mgr/ActivePyModules.cc
+++ b/src/mgr/ActivePyModules.cc
@@ -420,7 +420,7 @@ bool ActivePyModules::get_config(const std::string &module_name,
   const std::string global_key = PyModuleRegistry::config_prefix
     + module_name + "/" + key;
 
-  dout(4) << __func__ << "key: " << global_key << dendl;
+  dout(4) << __func__ << " key: " << global_key << dendl;
 
   if (config_cache.count(global_key)) {
     *val = config_cache.at(global_key);
@@ -440,7 +440,7 @@ PyObject *ActivePyModules::get_config_prefix(const std::string &module_name,
   const std::string base_prefix = PyModuleRegistry::config_prefix
                                     + module_name + "/";
   const std::string global_prefix = base_prefix + prefix;
-  dout(4) << __func__ << "prefix: " << global_prefix << dendl;
+  dout(4) << __func__ << " prefix: " << global_prefix << dendl;
 
   PyFormatter f;
   for (auto p = config_cache.lower_bound(global_prefix);

diff --git a/src/mgr/StandbyPyModules.cc b/src/mgr/StandbyPyModules.cc
index 5430658bf10ef63f692d322bf0b62ba692d52ca1..756b8be74294fd5cdd0b9103159fb919fd6992c3 100644 (file)
--- a/src/mgr/StandbyPyModules.cc
+++ b/src/mgr/StandbyPyModules.cc
@@ -170,7 +170,7 @@ bool StandbyPyModule::get_config(const std::string &key,
   const std::string global_key = PyModuleRegistry::config_prefix
     + get_name() + "/" + key;
 
-  dout(4) << __func__ << "key: " << global_key << dendl;
+  dout(4) << __func__ << " key: " << global_key << dendl;
 
   return state.with_config([global_key, value](const PyModuleConfig &config){
     if (config.count(global_key)) {

diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index 8997f6d214ad8d2bfed2605e7913a2a89ca4a489..a6be9a6d06b045049033a5d26cf119d97bc3cbeb 100644 (file)
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -672,7 +672,7 @@ bool MonmapMonitor::prepare_command(MonOpRequestRef op)
     pending_map.last_changed = ceph_clock_now();
     propose = true;
 
-    dout(1) << __func__ << ss.str() << "; new features will be: "
+    dout(1) << __func__ << " " << ss.str() << "; new features will be: "
             << "persistent = " << pending_map.persistent_features
             // output optional nevertheless, for auditing purposes.
             << ", optional = " << pending_map.optional_features << dendl;

diff --git a/src/msg/async/AsyncMessenger.cc b/src/msg/async/AsyncMessenger.cc
index d56ca7bd6be0fbeae377517f8e945869b2b5202a..bcb78e67056afa6556e94ab9f8301530ee29f172 100644 (file)
--- a/src/msg/async/AsyncMessenger.cc
+++ b/src/msg/async/AsyncMessenger.cc
@@ -583,7 +583,7 @@ void AsyncMessenger::submit_message(Message *m, AsyncConnectionRef con,
 {
   if (cct->_conf->ms_dump_on_send) {
     m->encode(-1, MSG_CRC_ALL);
-    ldout(cct, 0) << __func__ << "submit_message " << *m << "\n";
+    ldout(cct, 0) << __func__ << " submit_message " << *m << "\n";
     m->get_payload().hexdump(*_dout);
     if (m->get_data().length() > 0) {
       *_dout << " data:\n";

diff --git a/src/msg/async/dpdk/DPDK.cc b/src/msg/async/dpdk/DPDK.cc
index 0b8fb5db65cc822543b5eadaa8ad09b26f3c0e7b..d76101cb2f13e558fd0d5d3b6b4584f2dfab8709 100644 (file)
--- a/src/msg/async/dpdk/DPDK.cc
+++ b/src/msg/async/dpdk/DPDK.cc
@@ -562,7 +562,7 @@ int DPDKDevice::check_port_link_status()
         ldout(cct, 20) << __func__ << " not ready, continue to wait." << dendl;
         usleep(sleep_time);
       } else {
-        lderr(cct) << __func__ << "done port " << _port_idx << " link down" << dendl;
+        lderr(cct) << __func__ << " done port " << _port_idx << " link down" << dendl;
         return -1;
       }
     }

diff --git a/src/msg/async/rdma/Infiniband.cc b/src/msg/async/rdma/Infiniband.cc
index 0f82554e96aff03667542e6c6ca97f44048b5c45..b99100139c70149403a3ae5d43e8fae75d3364aa 100644 (file)
--- a/src/msg/async/rdma/Infiniband.cc
+++ b/src/msg/async/rdma/Infiniband.cc
@@ -705,14 +705,14 @@ char *Infiniband::MemoryManager::PoolAllocator::malloc(const size_type bytes)
 
   m = static_cast<mem_info *>(manager->malloc(bytes + sizeof(*m)));
   if (!m) {
-    lderr(cct) << __func__ << "failed to allocate " <<
+    lderr(cct) << __func__ << " failed to allocate " <<
         bytes << " + " << sizeof(*m) << " bytes of memory for " << nbufs << dendl;
     return NULL;
   }
 
   m->mr = ibv_reg_mr(manager->pd->pd, m->chunks, bytes, IBV_ACCESS_REMOTE_WRITE | IBV_ACCESS_LOCAL_WRITE);
   if (m->mr == NULL) {
-    lderr(cct) << __func__ << "failed to register " <<
+    lderr(cct) << __func__ << " failed to register " <<
         bytes << " + " << sizeof(*m) << " bytes of memory for " << nbufs << dendl;
     manager->free(m);
     return NULL;

diff --git a/src/msg/simple/Accepter.cc b/src/msg/simple/Accepter.cc
index b95cb4337372d04c46f4e5cada70a23b399f805e..a95e046c7ba0870cea53464abe5c66791cd04cd6 100644 (file)
--- a/src/msg/simple/Accepter.cc
+++ b/src/msg/simple/Accepter.cc
@@ -383,7 +383,7 @@ void Accepter::stop()
   char ch = 0x0;
   int ret = safe_write(shutdown_wr_fd, &ch, sizeof(ch));
   if (ret < 0) {
-    ldout(msgr->cct,1) << __func__ << "close failed: "
+    ldout(msgr->cct,1) << __func__ << " close failed: "
              << " errno " << errno << " " << cpp_strerror(errno) << dendl;
   } else {
     ldout(msgr->cct,15) << __func__ << " signaled poll" << dendl;
@@ -400,14 +400,14 @@ void Accepter::stop()
 
   if (listen_sd >= 0) {
     if (::close(listen_sd) < 0) {
-      ldout(msgr->cct,1) << __func__ << "close listen_sd failed: "
+      ldout(msgr->cct,1) << __func__ << " close listen_sd failed: "
              << " errno " << errno << " " << cpp_strerror(errno) << dendl;
     }
     listen_sd = -1;
   }
   if (shutdown_rd_fd >= 0) {
     if (::close(shutdown_rd_fd) < 0) {
-      ldout(msgr->cct,1) << __func__ << "close shutdown_rd_fd failed: "
+      ldout(msgr->cct,1) << __func__ << " close shutdown_rd_fd failed: "
              << " errno " << errno << " " << cpp_strerror(errno) << dendl;
     }
     shutdown_rd_fd = -1;

diff --git a/src/msg/xio/XioMessenger.cc b/src/msg/xio/XioMessenger.cc
index 2b2d7b3e1beb8c7d4602adce0dd9204d16429bf8..d62713b9beb679a5838643d3df3086d59ad98e49 100644 (file)
--- a/src/msg/xio/XioMessenger.cc
+++ b/src/msg/xio/XioMessenger.cc
@@ -866,9 +866,9 @@ int XioMessenger::_send_message_impl(Message* m, XioConnection* xcon)
     switch (m->get_type()) {
     case 43:
     // case 15:
-      ldout(cct,4) << __func__ << "stop 43 " << m->get_type() << " " << *m << dendl;
+      ldout(cct,4) << __func__ << " stop 43 " << m->get_type() << " " << *m << dendl;
       buffer::list &payload = m->get_payload();
-      ldout(cct,4) << __func__ << "payload dump:" << dendl;
+      ldout(cct,4) << __func__ << " payload dump:" << dendl;
       payload.hexdump(cout);
     }
   }

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 9a7185fd1e76cf35cd49229a16c4bd24092c9134..d863ccf0f2943adab8650fe734341e78a2b4129a 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -9855,7 +9855,7 @@ void BlueStore::_txc_add_transaction(TransContext *txc, Transaction *t)
       break;
 
     default:
-      derr << __func__ << "bad op " << op->op << dendl;
+      derr << __func__ << " bad op " << op->op << dendl;
       ceph_abort();
     }
 
@@ -11405,7 +11405,7 @@ void BlueStore::_do_omap_clear(TransContext *txc, const string& omap_prefix,
   get_omap_header(id, &prefix);
   get_omap_tail(id, &tail);
   txc->t->rm_range_keys(omap_prefix, prefix, tail);
-  dout(20) << __func__ << "remove range start: "
+  dout(20) << __func__ << " remove range start: "
            << pretty_binary_string(prefix) << " end: "
            << pretty_binary_string(tail) << dendl;
 }
@@ -11549,7 +11549,7 @@ int BlueStore::_omap_rmkey_range(TransContext *txc,
     get_omap_key(o->onode.nid, first, &key_first);
     get_omap_key(o->onode.nid, last, &key_last);
     txc->t->rm_range_keys(prefix, key_first, key_last);
-    dout(20) << __func__ << "remove range start: "
+    dout(20) << __func__ << " remove range start: "
              << pretty_binary_string(key_first) << " end: "
              << pretty_binary_string(key_last) << dendl;
   }
@@ -12132,7 +12132,7 @@ void BlueStore::_flush_cache()
   }
   for (auto& p : coll_map) {
     if (!p.second->onode_map.empty()) {
-      derr << __func__ << "stray onodes on " << p.first << dendl;
+      derr << __func__ << " stray onodes on " << p.first << dendl;
       p.second->onode_map.dump<0>(cct);
     }
     if (!p.second->shared_blob_set.empty()) {

diff --git a/src/os/filestore/FileJournal.cc b/src/os/filestore/FileJournal.cc
index 0c0940dc506dccc0c46644d1a8ce159b801e94ea..ba40620c2725f4a989bea2bbb46c2a62881dcb55 100644 (file)
--- a/src/os/filestore/FileJournal.cc
+++ b/src/os/filestore/FileJournal.cc
@@ -1749,7 +1749,7 @@ void FileJournal::commit_start(uint64_t seq)
  */
 void FileJournal::do_discard(int64_t offset, int64_t end)
 {
-  dout(10) << __func__ << "trim(" << offset << ", " << end << dendl;
+  dout(10) << __func__ << " trim(" << offset << ", " << end << dendl;
 
   offset = round_up_to(offset, block_size);
   if (offset >= end)
@@ -1758,7 +1758,7 @@ void FileJournal::do_discard(int64_t offset, int64_t end)
   assert(end >= offset);
   if (offset < end)
     if (block_device_discard(fd, offset, end - offset) < 0)
-       dout(1) << __func__ << "ioctl(BLKDISCARD) error:" << cpp_strerror(errno) << dendl;
+       dout(1) << __func__ << " ioctl(BLKDISCARD) error:" << cpp_strerror(errno) << dendl;
 }
 
 void FileJournal::committed_thru(uint64_t seq)

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index c94e2d6957cf9dbfa4c6a58f7f1288ffeb97b1d1..d14806a4c333a3cb5fd52836d894e44a794ce8d7 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1490,7 +1490,7 @@ bool PG::recoverable_and_ge_min_size(const vector<int> &want) const
   boost::scoped_ptr<IsPGRecoverablePredicate> recoverable_predicate(
       get_pgbackend()->get_is_recoverable_predicate());
   if (!(*recoverable_predicate)(have)) {
-    dout(10) << __func__ << "failed, not recoverable" << dendl;
+    dout(10) << __func__ << " failed, not recoverable" << dendl;
     return false;
   }
 
@@ -5571,7 +5571,7 @@ bool PG::append_log_entries_update_missing(
   }
   info.stats.stats_invalid = info.stats.stats_invalid || invalidate_stats;
 
-  dout(20) << __func__ << "trim_to bool = " << bool(trim_to) << " trim_to = " << (trim_to ? *trim_to : eversion_t()) << dendl;
+  dout(20) << __func__ << " trim_to bool = " << bool(trim_to) << " trim_to = " << (trim_to ? *trim_to : eversion_t()) << dendl;
   if (trim_to)
     pg_log.trim(*trim_to, info);
   dirty_info = true;

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index e45d33f7bc04d8bd11d83a57b15db6d8bba561bc..a3c5dd63f06331c6ed0a780d7f5ef262d34c12aa 100644 (file)
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -13952,7 +13952,7 @@ bool PrimaryLogPG::agent_choose_mode(bool restart, OpRequestRef op)
   bool requeued = false;
   // Let delay play out
   if (agent_state->delaying) {
-    dout(20) << __func__ << this << " delaying, ignored" << dendl;
+    dout(20) << __func__ << " " << this << " delaying, ignored" << dendl;
     return requeued;
   }
 

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 89fc7bcc6326cf7f5894983aa17b4e8b7e5c0c3f..ec4e0e2e72e0785fbea51fd4c5f142edde886965 100644 (file)
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -3674,7 +3674,7 @@ uint32_t Objecter::list_nobjects_seek(NListContext *list_context,
   shared_lock rl(rwlock);
   list_context->pos = hobject_t(object_t(), string(), CEPH_NOSNAP,
                                pos, list_context->pool_id, string());
-  ldout(cct, 10) << __func__ << list_context
+  ldout(cct, 10) << __func__ << " " << list_context
                 << " pos " << pos << " -> " << list_context->pos << dendl;
   pg_t actual = osdmap->raw_pg_to_pg(pg_t(pos, list_context->pool_id));
   list_context->current_pg = actual.ps();

diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc
index cb62f7ce54f88dd285a3be15b1bc1a31c68e895d..90ac01f75bb372b3b7ca2466ac745a98fa249ff7 100644 (file)
--- a/src/rgw/rgw_file.cc
+++ b/src/rgw/rgw_file.cc
@@ -1767,7 +1767,7 @@ int rgw_lookup(struct rgw_fs *rgw_fs,
     if (unlikely((strcmp(path, "..") == 0))) {
       rgw_fh = parent;
       lsubdout(fs->get_context(), rgw, 17)
-       << __func__ << "BANG"<< *rgw_fh
+       << __func__ << " BANG"<< *rgw_fh
        << dendl;
       fs->ref(rgw_fh);
     } else {

diff --git a/src/rgw/rgw_http_client_curl.cc b/src/rgw/rgw_http_client_curl.cc
index 174a95e02faae82dc4ffaeec106b5ffee411ee1b..4129c4d9045beb58d977cf9a36882f31c0fbf369 100644 (file)
--- a/src/rgw/rgw_http_client_curl.cc
+++ b/src/rgw/rgw_http_client_curl.cc
@@ -27,7 +27,7 @@ public:
     try {
       locks.at(id).lock();
     } catch (std::out_of_range& e) {
-      dout(0) << __func__ << "failed to set locks" << dendl;
+      dout(0) << __func__ << " failed to set locks" << dendl;
     }
   }
 
@@ -35,7 +35,7 @@ public:
     try {
       locks.at(id).unlock();
     } catch (std::out_of_range& e) {
-      dout(0) << __func__ << "failed to unlock" << dendl;
+      dout(0) << __func__ << " failed to unlock" << dendl;
     }
   }
 };

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 425538732bf55d6907fb0636e470214fd929fdaa..08fdbb8ab5ca5a10b3f44471c5ea78659d0f5f91 100644 (file)
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -2173,7 +2173,7 @@ void RGWSetBucketVersioning::execute()
   if (!store->is_meta_master()) {
     op_ret = forward_request_to_master(s, NULL, store, in_data, nullptr);
     if (op_ret < 0) {
-      ldout(s->cct, 20) << __func__ << "forward_request_to_master returned ret=" << op_ret << dendl;
+      ldout(s->cct, 20) << __func__ << " forward_request_to_master returned ret=" << op_ret << dendl;
       return;
     }
   }
@@ -4915,7 +4915,7 @@ void RGWPutACLs::execute()
     }
     op_ret = forward_request_to_master(s, NULL, store, in_data, NULL);
     if (op_ret < 0) {
-      ldout(s->cct, 20) << __func__ << "forward_request_to_master returned ret=" << op_ret << dendl;
+      ldout(s->cct, 20) << __func__ << " forward_request_to_master returned ret=" << op_ret << dendl;
       return;
     }
   }
@@ -5152,7 +5152,7 @@ void RGWPutCORS::execute()
   if (!store->is_meta_master()) {
     op_ret = forward_request_to_master(s, NULL, store, in_data, nullptr);
     if (op_ret < 0) {
-      ldout(s->cct, 20) << __func__ << "forward_request_to_master returned ret=" << op_ret << dendl;
+      ldout(s->cct, 20) << __func__ << " forward_request_to_master returned ret=" << op_ret << dendl;
       return;
     }
   }

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index b5f5760e9de87e896fd62fa601929c418fcce0c4..131e19a99dd94c8cd5d2506bbab4bd22cf9c2ed6 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -4073,7 +4073,7 @@ int RGWRados::replace_region_with_zonegroup()
   /* create zonegroups */
   for (iter = regions.begin(); iter != regions.end(); ++iter)
   {
-    ldout(cct, 0) << __func__ << "Converting  " << *iter << dendl;
+    ldout(cct, 0) << __func__ << " Converting  " << *iter << dendl;
     /* check to see if we don't have already a zonegroup with this name */
     RGWZoneGroup new_zonegroup(*iter);
     ret = new_zonegroup.init(cct , this);

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index e2054a7412204f6dd613e4cf3112117ce286dd3c..23ea77ecf301eec29f6406adff2a3bcb6cfeb72a 100644 (file)
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -3458,7 +3458,7 @@ int RGWHandler_REST_S3Website::init(RGWRados *store, req_state *s,
 
 int RGWHandler_REST_S3Website::retarget(RGWOp* op, RGWOp** new_op) {
   *new_op = op;
-  ldout(s->cct, 10) << __func__ << "Starting retarget" << dendl;
+  ldout(s->cct, 10) << __func__ << " Starting retarget" << dendl;
 
   if (!(s->prot_flags & RGW_REST_WEBSITE))
     return 0;