From 693132eb00b1803d5e97a79908521d5a6903e9f8 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 5 Mar 2017 21:59:45 -0500 Subject: [PATCH] common: remove \n on clog messages Confirmed these aren't needed, and are inconsistently included. Remove them where they do appear. Signed-off-by: Sage Weil --- src/mds/CDir.cc | 4 ++-- src/mds/CInode.cc | 14 ++++++------- src/mds/InoTable.cc | 4 ++-- src/mds/Locker.cc | 4 ++-- src/mds/MDCache.cc | 10 +++++----- src/mds/MDSDaemon.cc | 4 ++-- src/mds/MDSTable.cc | 2 +- src/mds/RecoveryQueue.cc | 2 +- src/mds/Server.cc | 12 ++++++------ src/mds/StrayManager.cc | 2 +- src/mds/journal.cc | 6 +++--- src/mgr/DaemonServer.cc | 1 - src/mon/DataHealthService.cc | 2 +- src/mon/MDSMonitor.cc | 4 ++-- src/mon/Monitor.cc | 18 ++++++++--------- src/mon/MonmapMonitor.cc | 2 +- src/mon/OSDMonitor.cc | 38 ++++++++++++++++++------------------ src/mon/PGMonitor.cc | 2 +- src/osd/ECBackend.cc | 6 +++--- src/osd/OSD.cc | 7 +++---- src/osd/PG.cc | 23 +++++++++------------- src/osd/PrimaryLogPG.cc | 33 +++++++++++++++---------------- src/osd/ReplicatedBackend.cc | 4 ++-- 23 files changed, 98 insertions(+), 106 deletions(-) diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc index 89c0016dda62c..26f7e6a506c9e 100644 --- a/src/mds/CDir.cc +++ b/src/mds/CDir.cc @@ -1698,7 +1698,7 @@ CDentry *CDir::_load_dentry( << " [" << first << "," << last << "] v" << inode_data.inode.version << " at " << dirpath << "/" << dname << ", but inode " << in->vino() << " v" << in->inode.version - << " already exists at " << inopath << "\n"; + << " already exists at " << inopath; return dn; } } @@ -2218,7 +2218,7 @@ void CDir::_committed(int r, version_t v) if (r < 0) { dout(1) << "commit error " << r << " v " << v << dendl; cache->mds->clog->error() << "failed to commit dir " << dirfrag() << " object," - << " errno " << r << "\n"; + << " errno " << r; cache->mds->handle_write_error(r); return; } diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc index 1f27f9a222202..31e87d5cf29c1 100644 --- a/src/mds/CInode.cc +++ b/src/mds/CInode.cc @@ -990,7 +990,7 @@ void CInode::_stored(int r, version_t v, Context *fin) if (r < 0) { dout(1) << "store error " << r << " v " << v << " on " << *this << dendl; mdcache->mds->clog->error() << "failed to store ino " << ino() << " object," - << " errno " << r << "\n"; + << " errno " << r; mdcache->mds->handle_write_error(r); fin->complete(r); return; @@ -1207,7 +1207,7 @@ void CInode::_stored_backtrace(int r, version_t v, Context *fin) mdcache->mds->clog->error() << "failed to store backtrace on ino " << ino() << " object" << ", pool " << get_backtrace_pool() - << ", errno " << r << "\n"; + << ", errno " << r; mdcache->mds->handle_write_error(r); if (fin) fin->complete(r); @@ -1272,7 +1272,7 @@ void CInode::verify_diri_backtrace(bufferlist &bl, int err) if (err) { MDSRank *mds = mdcache->mds; - mds->clog->error() << "bad backtrace on dir ino " << ino() << "\n"; + mds->clog->error() << "bad backtrace on dir ino " << ino(); assert(!"bad backtrace" == (g_conf->mds_verify_backtrace > 1)); _mark_dirty_parent(mds->mdlog->get_current_segment(), false); @@ -2020,7 +2020,7 @@ void CInode::finish_scatter_gather_update(int type) if (pf->fragstat.nfiles < 0 || pf->fragstat.nsubdirs < 0) { clog->error() << "bad/negative dir size on " - << dir->dirfrag() << " " << pf->fragstat << "\n"; + << dir->dirfrag() << " " << pf->fragstat; assert(!"bad/negative fragstat" == g_conf->mds_verify_scatter); if (pf->fragstat.nfiles < 0) @@ -2057,7 +2057,7 @@ void CInode::finish_scatter_gather_update(int type) dout(20) << " dirstat mismatch, fixing" << dendl; } else { clog->error() << "unmatched fragstat on " << ino() << ", inode has " - << pi->dirstat << ", dirfrags have " << dirstat << "\n"; + << pi->dirstat << ", dirfrags have " << dirstat; assert(!"unmatched fragstat" == g_conf->mds_verify_scatter); } // trust the dirfrags for now @@ -2074,7 +2074,7 @@ void CInode::finish_scatter_gather_update(int type) if (pi->dirstat.nfiles < 0 || pi->dirstat.nsubdirs < 0) { clog->error() << "bad/negative fragstat on " << ino() - << ", inode has " << pi->dirstat << "\n"; + << ", inode has " << pi->dirstat; assert(!"bad/negative fragstat" == g_conf->mds_verify_scatter); if (pi->dirstat.nfiles < 0) @@ -2164,7 +2164,7 @@ void CInode::finish_scatter_gather_update(int type) dout(20) << " rstat mismatch, fixing" << dendl; } else { clog->error() << "unmatched rstat on " << ino() << ", inode has " - << pi->rstat << ", dirfrags have " << rstat << "\n"; + << pi->rstat << ", dirfrags have " << rstat; assert(!"unmatched rstat" == g_conf->mds_verify_scatter); } // trust the dirfrag for now diff --git a/src/mds/InoTable.cc b/src/mds/InoTable.cc index e21543cde1aa3..f192b12ac05c6 100644 --- a/src/mds/InoTable.cc +++ b/src/mds/InoTable.cc @@ -108,7 +108,7 @@ void InoTable::replay_alloc_id(inodeno_t id) projected_free.erase(id); } else { mds->clog->error() << "journal replay alloc " << id - << " not in free " << free << "\n"; + << " not in free " << free; } projected_version = ++version; } @@ -124,7 +124,7 @@ void InoTable::replay_alloc_ids(interval_set& ids) projected_free.subtract(ids); } else { mds->clog->error() << "journal replay alloc " << ids << ", only " - << is << " is in free " << free << "\n"; + << is << " is in free " << free; free.subtract(is); projected_free.subtract(is); } diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc index 8d3e34deb3227..e9cd6434dc4d0 100644 --- a/src/mds/Locker.cc +++ b/src/mds/Locker.cc @@ -2586,7 +2586,7 @@ void Locker::handle_client_caps(MClientCaps *m) ss << "client." << session->get_client() << " does not advance its oldest_flush_tid (" << m->get_oldest_flush_tid() << "), " << session->get_num_completed_flushes() - << " completed flushes recorded in session\n"; + << " completed flushes recorded in session"; mds->clog->warn() << ss.str(); dout(20) << __func__ << " " << ss.str() << dendl; } @@ -3499,7 +3499,7 @@ void Locker::caps_tick() stringstream ss; ss << "client." << cap->get_client() << " isn't responding to mclientcaps(revoke), ino " << cap->get_inode()->ino() << " pending " << ccap_string(cap->pending()) - << " issued " << ccap_string(cap->issued()) << ", sent " << age << " seconds ago\n"; + << " issued " << ccap_string(cap->issued()) << ", sent " << age << " seconds ago"; mds->clog->warn() << ss.str(); dout(20) << __func__ << " " << ss.str() << dendl; } else { diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index db750025ee814..34d69ec4f2cc8 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -2270,7 +2270,7 @@ void MDCache::predirty_journal_parents(MutationRef mut, EMetaBlob *blob, if (pi->dirstat.size() != pf->fragstat.size()) { mds->clog->error() << "unmatched fragstat size on single dirfrag " << parent->dirfrag() << ", inode has " << pi->dirstat - << ", dirfrag has " << pf->fragstat << "\n"; + << ", dirfrag has " << pf->fragstat; // trust the dirfrag for now pi->dirstat = pf->fragstat; @@ -2318,7 +2318,7 @@ void MDCache::predirty_journal_parents(MutationRef mut, EMetaBlob *blob, if (pi->rstat.rbytes != pf->rstat.rbytes) { mds->clog->error() << "unmatched rstat rbytes on single dirfrag " << parent->dirfrag() << ", inode has " << pi->rstat - << ", dirfrag has " << pf->rstat << "\n"; + << ", dirfrag has " << pf->rstat; // trust the dirfrag for now pi->rstat = pf->rstat; @@ -5617,7 +5617,7 @@ void MDCache::export_remaining_imported_caps() cap_reconnect_waiters.clear(); if (warn_str.peek() != EOF) { - mds->clog->warn() << "failed to reconnect caps for missing inodes:" << "\n"; + mds->clog->warn() << "failed to reconnect caps for missing inodes:"; mds->clog->warn(warn_str); } } @@ -5775,7 +5775,7 @@ void MDCache::open_snap_parents() ++q) warn_str << " client." << q->first << " snapid " << q->second << "\n"; } - mds->clog->warn() << "open_snap_parents has:" << "\n"; + mds->clog->warn() << "open_snap_parents has:"; mds->clog->warn(warn_str); } assert(rejoin_waiters.empty()); @@ -11615,7 +11615,7 @@ void MDCache::force_readonly() return; dout(1) << "force file system read-only" << dendl; - mds->clog->warn() << "force file system read-only\n"; + mds->clog->warn() << "force file system read-only"; set_readonly(); diff --git a/src/mds/MDSDaemon.cc b/src/mds/MDSDaemon.cc index b857dafaf297f..8942315deaf04 100644 --- a/src/mds/MDSDaemon.cc +++ b/src/mds/MDSDaemon.cc @@ -851,7 +851,7 @@ int MDSDaemon::_handle_command_legacy(std::vector args) } else if (args[0] == "heap") { if (!ceph_using_tcmalloc()) - clog->info() << "tcmalloc not enabled, can't use heap profiler commands\n"; + clog->info() << "tcmalloc not enabled, can't use heap profiler commands"; else { ostringstream ss; vector cmdargs; @@ -1368,7 +1368,7 @@ bool MDSDaemon::ms_verify_authorizer(Connection *con, int peer_type, dout(1) << __func__ << ": auth cap parse error: " << errstr.str() << " parsing '" << auth_cap_str << "'" << dendl; clog->warn() << name << " mds cap '" << auth_cap_str - << "' does not parse: " << errstr.str() << "\n"; + << "' does not parse: " << errstr.str(); } } catch (buffer::error& e) { // Assume legacy auth, defaults to: diff --git a/src/mds/MDSTable.cc b/src/mds/MDSTable.cc index 937ae41abc29f..13a007d29bb25 100644 --- a/src/mds/MDSTable.cc +++ b/src/mds/MDSTable.cc @@ -92,7 +92,7 @@ void MDSTable::save_2(int r, version_t v) if (r < 0) { dout(1) << "save error " << r << " v " << v << dendl; mds->clog->error() << "failed to store table " << table_name << " object," - << " errno " << r << "\n"; + << " errno " << r; mds->handle_write_error(r); return; } diff --git a/src/mds/RecoveryQueue.cc b/src/mds/RecoveryQueue.cc index b0dec74b3a644..bd8fe0dd88dab 100644 --- a/src/mds/RecoveryQueue.cc +++ b/src/mds/RecoveryQueue.cc @@ -90,7 +90,7 @@ void RecoveryQueue::_start(CInode *in) // blech if (pi->client_ranges.size() && !pi->get_max_size()) { mds->clog->warn() << "bad client_range " << pi->client_ranges - << " on ino " << pi->ino << "\n"; + << " on ino " << pi->ino; } if (pi->client_ranges.size() && pi->get_max_size()) { diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 3ed62037817a3..9b693c0dbba94 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -672,7 +672,7 @@ void Server::find_idle_sessions() utime_t age = now; age -= session->last_cap_renew; mds->clog->info() << "closing stale session " << session->info.inst - << " after " << age << "\n"; + << " after " << age; dout(10) << "autoclosing stale session " << session->info.inst << " last " << session->last_cap_renew << dendl; kill_session(session, NULL); } @@ -779,17 +779,17 @@ void Server::handle_client_reconnect(MClientReconnect *m) mds->clog->info() << "denied reconnect attempt (mds is " << ceph_mds_state_name(mds->get_state()) << ") from " << m->get_source_inst() - << " after " << delay << " (allowed interval " << g_conf->mds_reconnect_timeout << ")\n"; + << " after " << delay << " (allowed interval " << g_conf->mds_reconnect_timeout << ")"; deny = true; } else if (session->is_closed()) { dout(1) << " session is closed, ignoring reconnect, sending close" << dendl; mds->clog->info() << "denied reconnect attempt (mds is " << ceph_mds_state_name(mds->get_state()) - << ") from " << m->get_source_inst() << " (session is closed)\n"; + << ") from " << m->get_source_inst() << " (session is closed)"; deny = true; } else if (mdcache->is_readonly()) { dout(1) << " read-only FS, ignoring reconnect, sending close" << dendl; - mds->clog->info() << "denied reconnect attempt (mds is read-only)\n"; + mds->clog->info() << "denied reconnect attempt (mds is read-only)"; deny = true; } @@ -801,7 +801,7 @@ void Server::handle_client_reconnect(MClientReconnect *m) // notify client of success with an OPEN m->get_connection()->send_message(new MClientSession(CEPH_SESSION_OPEN)); - mds->clog->debug() << "reconnect by " << session->info.inst << " after " << delay << "\n"; + mds->clog->debug() << "reconnect by " << session->info.inst << " after " << delay; // snaprealms for (vector::iterator p = m->realms.begin(); @@ -2345,7 +2345,7 @@ CInode* Server::prepare_new_inode(MDRequestRef& mdr, CDir *dir, inodeno_t useino dout(0) << "WARNING: client specified " << useino << " and i allocated " << in->inode.ino << dendl; mds->clog->error() << mdr->client_request->get_source() << " specified ino " << useino - << " but mds." << mds->get_nodeid() << " allocated " << in->inode.ino << "\n"; + << " but mds." << mds->get_nodeid() << " allocated " << in->inode.ino; //ceph_abort(); // just for now. } diff --git a/src/mds/StrayManager.cc b/src/mds/StrayManager.cc index 47cee6341475e..de2955a55345b 100644 --- a/src/mds/StrayManager.cc +++ b/src/mds/StrayManager.cc @@ -661,7 +661,7 @@ bool StrayManager::__eval_stray(CDentry *dn, bool delay) << in->snaprealm->srnode.past_parents << dendl; if (in->state_test(CInode::STATE_MISSINGOBJS)) { mds->clog->error() << "previous attempt at committing dirfrag of ino " - << in->ino() << " has failed, missing object\n"; + << in->ino() << " has failed, missing object"; mds->handle_write_error(-ENOENT); } return false; // not until some snaps are deleted. diff --git a/src/mds/journal.cc b/src/mds/journal.cc index 51ee9b244081c..49d4fbb267546 100644 --- a/src/mds/journal.cc +++ b/src/mds/journal.cc @@ -1550,7 +1550,7 @@ void EMetaBlob::replay(MDSRank *mds, LogSegment *logseg, MDSlaveUpdate *slaveup) // [repair bad inotable updates] if (inotablev > mds->inotable->get_version()) { mds->clog->error() << "journal replay inotablev mismatch " - << mds->inotable->get_version() << " -> " << inotablev << "\n"; + << mds->inotable->get_version() << " -> " << inotablev; mds->inotable->force_replay_version(inotablev); } @@ -1576,7 +1576,7 @@ void EMetaBlob::replay(MDSRank *mds, LogSegment *logseg, MDSlaveUpdate *slaveup) inodeno_t i = session->take_ino(used_preallocated_ino); if (next != i) mds->clog->warn() << " replayed op " << client_reqs << " used ino " << i - << " but session next is " << next << "\n"; + << " but session next is " << next; assert(i == used_preallocated_ino); session->info.used_inos.clear(); } @@ -1598,7 +1598,7 @@ void EMetaBlob::replay(MDSRank *mds, LogSegment *logseg, MDSlaveUpdate *slaveup) assert(sessionmapv == mds->sessionmap.get_version()); } else { mds->clog->error() << "journal replay sessionmap v " << sessionmapv - << " -(1|2) > table " << mds->sessionmap.get_version() << "\n"; + << " -(1|2) > table " << mds->sessionmap.get_version(); assert(g_conf->mds_wipe_sessions); mds->sessionmap.wipe(); mds->sessionmap.set_version(sessionmapv); diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc index ebbb6056059c0..c2243bfee09b5 100644 --- a/src/mgr/DaemonServer.cc +++ b/src/mgr/DaemonServer.cc @@ -327,7 +327,6 @@ bool DaemonServer::handle_command(MCommand *m) rs = ss.str(); odata.append(ds); dout(1) << "do_command r=" << r << " " << rs << dendl; - //clog->info() << rs << "\n"; if (con) { MCommandReply *reply = new MCommandReply(r, rs); reply->set_tid(m->get_tid()); diff --git a/src/mon/DataHealthService.cc b/src/mon/DataHealthService.cc index 67ce4d4f91414..6305263a80920 100644 --- a/src/mon/DataHealthService.cc +++ b/src/mon/DataHealthService.cc @@ -219,7 +219,7 @@ void DataHealthService::service_tick() if (ours.fs_stats.avail_percent != last_warned_percent) mon->clog->warn() << "reached concerning levels of available space on local monitor storage" - << " (" << ours.fs_stats.avail_percent << "% free)\n"; + << " (" << ours.fs_stats.avail_percent << "% free)"; last_warned_percent = ours.fs_stats.avail_percent; } else { last_warned_percent = 0; diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc index cfc4510dc08cb..0758eca19d372 100644 --- a/src/mon/MDSMonitor.cc +++ b/src/mon/MDSMonitor.cc @@ -676,7 +676,7 @@ void MDSMonitor::_updated(MonOpRequestRef op) MMDSBeacon *m = static_cast(op->get_req()); dout(10) << "_updated " << m->get_orig_source() << " " << *m << dendl; mon->clog->info() << m->get_orig_source_inst() << " " - << ceph_mds_state_name(m->get_state()) << "\n"; + << ceph_mds_state_name(m->get_state()); if (m->get_state() == MDSMap::STATE_STOPPED) { // send the map manually (they're out of the map, so they won't get it automatic) @@ -701,7 +701,7 @@ void MDSMonitor::on_active() update_logger(); if (mon->is_leader()) - mon->clog->info() << "fsmap " << fsmap << "\n"; + mon->clog->info() << "fsmap " << fsmap; } void MDSMonitor::get_health(list >& summary, diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index b09638dd09737..cdc7f4b5ab049 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -1988,7 +1988,7 @@ void Monitor::start_election() logger->inc(l_mon_num_elections); logger->inc(l_mon_election_call); - clog->info() << "mon." << name << " calling new monitor election\n"; + clog->info() << "mon." << name << " calling new monitor election"; elector.call_election(); } @@ -2056,7 +2056,7 @@ void Monitor::win_election(epoch_t epoch, set& active, uint64_t features, outside_quorum.clear(); clog->info() << "mon." << name << "@" << rank - << " won leader election with quorum " << quorum << "\n"; + << " won leader election with quorum " << quorum; set_leader_supported_commands(cmdset, cmdsize); @@ -4415,9 +4415,9 @@ void Monitor::handle_timecheck_leader(MonOpRequestRef op) ostringstream ss; health_status_t status = timecheck_status(ss, skew_bound, latency); if (status == HEALTH_ERR) - clog->error() << other << " " << ss.str() << "\n"; + clog->error() << other << " " << ss.str(); else if (status == HEALTH_WARN) - clog->warn() << other << " " << ss.str() << "\n"; + clog->warn() << other << " " << ss.str(); dout(10) << __func__ << " from " << other << " ts " << m->timestamp << " delta " << delta << " skew_bound " << skew_bound @@ -4759,7 +4759,7 @@ int Monitor::scrub_start() assert(is_leader()); if (!scrub_result.empty()) { - clog->info() << "scrub already in progress\n"; + clog->info() << "scrub already in progress"; return -EBUSY; } @@ -4947,13 +4947,13 @@ void Monitor::scrub_check_results() continue; if (p->second != mine) { ++errors; - clog->error() << "scrub mismatch" << "\n"; - clog->error() << " mon." << rank << " " << mine << "\n"; - clog->error() << " mon." << p->first << " " << p->second << "\n"; + clog->error() << "scrub mismatch"; + clog->error() << " mon." << rank << " " << mine; + clog->error() << " mon." << p->first << " " << p->second; } } if (!errors) - clog->info() << "scrub ok on " << quorum << ": " << mine << "\n"; + clog->info() << "scrub ok on " << quorum << ": " << mine; } inline void Monitor::scrub_timeout() diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc index 8d9ef32f37a55..d90c4acbedfae 100644 --- a/src/mon/MonmapMonitor.cc +++ b/src/mon/MonmapMonitor.cc @@ -168,7 +168,7 @@ void MonmapMonitor::on_active() } if (mon->is_leader()) - mon->clog->info() << "monmap " << *mon->monmap << "\n"; + mon->clog->info() << "monmap " << *mon->monmap; apply_mon_features(mon->get_quorum_mon_features()); } diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 52c3cf49953a8..3939a2f8ebafa 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -361,7 +361,7 @@ void OSDMonitor::on_active() update_logger(); if (mon->is_leader()) - mon->clog->info() << "osdmap " << osdmap << "\n"; + mon->clog->info() << "osdmap " << osdmap; if (!mon->is_leader()) { list ls; @@ -1643,7 +1643,7 @@ bool OSDMonitor::prepare_mark_me_down(MonOpRequestRef op) assert(osdmap.is_up(target_osd)); assert(osdmap.get_addr(target_osd) == m->get_target().addr); - mon->clog->info() << "osd." << target_osd << " marked itself down\n"; + mon->clog->info() << "osd." << target_osd << " marked itself down"; pending_inc.new_state[target_osd] = CEPH_OSD_UP; if (m->request_ack) wait_for_finished_proposal(op, new C_AckMarkedDown(this, op)); @@ -1813,7 +1813,7 @@ bool OSDMonitor::check_failure(utime_t now, int target_osd, failure_info_t& fi) mon->clog->info() << osdmap.get_inst(target_osd) << " failed (" << (int)reporters_by_subtree.size() << " reporters from different " << reporter_subtree_level << " after " - << failed_for << " >= grace " << grace << ")\n"; + << failed_for << " >= grace " << grace << ")"; return true; } return false; @@ -1831,7 +1831,7 @@ void OSDMonitor::force_failure(utime_t now, int target_osd) dout(1) << " we're forcing failure of osd." << target_osd << dendl; pending_inc.new_state[target_osd] = CEPH_OSD_UP; - mon->clog->info() << osdmap.get_inst(target_osd) << " failed (forced)\n"; + mon->clog->info() << osdmap.get_inst(target_osd) << " failed (forced)"; return; } @@ -1857,12 +1857,12 @@ bool OSDMonitor::prepare_failure(MonOpRequestRef op) // add a report if (m->is_immediate()) { mon->clog->debug() << m->get_target() << " reported immediately failed by " - << m->get_orig_source_inst() << "\n"; + << m->get_orig_source_inst(); force_failure(now, target_osd); return true; } mon->clog->debug() << m->get_target() << " reported failed by " - << m->get_orig_source_inst() << "\n"; + << m->get_orig_source_inst(); failure_info_t& fi = failure_info[target_osd]; MonOpRequestRef old_op = fi.add_report(reporter, failed_since, op); @@ -1874,7 +1874,7 @@ bool OSDMonitor::prepare_failure(MonOpRequestRef op) } else { // remove the report mon->clog->debug() << m->get_target() << " failure report canceled by " - << m->get_orig_source_inst() << "\n"; + << m->get_orig_source_inst(); if (failure_info.count(target_osd)) { failure_info_t& fi = failure_info[target_osd]; MonOpRequestRef report_op = fi.cancel_report(reporter); @@ -2001,7 +2001,7 @@ bool OSDMonitor::preprocess_boot(MonOpRequestRef op) << m->get_orig_source_inst() << " because the osdmap requires" << " CEPH_FEATURE_SERVER_LUMINOUS" - << " but the osd lacks CEPH_FEATURE_SERVER_LUMINOUS\n"; + << " but the osd lacks CEPH_FEATURE_SERVER_LUMINOUS"; goto ignore; } @@ -2011,7 +2011,7 @@ bool OSDMonitor::preprocess_boot(MonOpRequestRef op) << m->get_orig_source_inst() << " because the osdmap requires" << " CEPH_FEATURE_SERVER_JEWEL" - << " but the osd lacks CEPH_FEATURE_SERVER_JEWEL\n"; + << " but the osd lacks CEPH_FEATURE_SERVER_JEWEL"; goto ignore; } @@ -2021,7 +2021,7 @@ bool OSDMonitor::preprocess_boot(MonOpRequestRef op) << m->get_orig_source_inst() << " because the osdmap requires" << " CEPH_FEATURE_SERVER_KRAKEN" - << " but the osd lacks CEPH_FEATURE_SERVER_KRAKEN\n"; + << " but the osd lacks CEPH_FEATURE_SERVER_KRAKEN"; goto ignore; } @@ -2029,7 +2029,7 @@ bool OSDMonitor::preprocess_boot(MonOpRequestRef op) !(m->osd_features & CEPH_FEATURE_OSD_BITWISE_HOBJ_SORT)) { mon->clog->info() << "disallowing boot of OSD " << m->get_orig_source_inst() - << " because 'sortbitwise' osdmap flag is set and OSD lacks the OSD_BITWISE_HOBJ_SORT feature\n"; + << " because 'sortbitwise' osdmap flag is set and OSD lacks the OSD_BITWISE_HOBJ_SORT feature"; goto ignore; } @@ -2052,7 +2052,7 @@ bool OSDMonitor::preprocess_boot(MonOpRequestRef op) !osdmap.test_flag(CEPH_OSDMAP_REQUIRE_LUMINOUS)) { mon->clog->info() << "disallowing boot of post-luminous OSD " << m->get_orig_source_inst() - << " because require_luminous_osds is not set\n"; + << " because require_luminous_osds is not set"; goto ignore; } @@ -2061,7 +2061,7 @@ bool OSDMonitor::preprocess_boot(MonOpRequestRef op) !osdmap.test_flag(CEPH_OSDMAP_REQUIRE_JEWEL)) { mon->clog->info() << "disallowing boot of post-jewel OSD " << m->get_orig_source_inst() - << " because require_jewel_osds is not set\n"; + << " because require_jewel_osds is not set"; goto ignore; } @@ -2073,14 +2073,14 @@ bool OSDMonitor::preprocess_boot(MonOpRequestRef op) !(osdmap.get_up_osd_features() & CEPH_FEATURE_HAMMER_0_94_4)) { mon->clog->info() << "disallowing boot of post-hammer OSD " << m->get_orig_source_inst() - << " because one or more up OSDs is pre-hammer v0.94.4\n"; + << " because one or more up OSDs is pre-hammer v0.94.4"; goto ignore; } if (!(m->osd_features & CEPH_FEATURE_HAMMER_0_94_4) && (osdmap.get_up_osd_features() & CEPH_FEATURE_MON_METADATA)) { mon->clog->info() << "disallowing boot of pre-hammer v0.94.4 OSD " << m->get_orig_source_inst() - << " because all up OSDs are post-hammer\n"; + << " because all up OSDs are post-hammer"; goto ignore; } } @@ -2289,7 +2289,7 @@ void OSDMonitor::_booted(MonOpRequestRef op, bool logit) << " w " << m->sb.weight << " from " << m->sb.current_epoch << dendl; if (logit) { - mon->clog->info() << m->get_orig_source_inst() << " boot\n"; + mon->clog->info() << m->get_orig_source_inst() << " boot"; } send_latest(op, m->sb.current_epoch+1); @@ -2343,7 +2343,7 @@ bool OSDMonitor::prepare_alive(MonOpRequestRef op) int from = m->get_orig_source().num(); if (0) { // we probably don't care much about these - mon->clog->debug() << m->get_orig_source_inst() << " alive\n"; + mon->clog->debug() << m->get_orig_source_inst() << " alive"; } dout(7) << "prepare_alive want up_thru " << m->want << " have " << m->version @@ -2872,7 +2872,7 @@ void OSDMonitor::tick() do_propose = true; - mon->clog->info() << "osd." << o << " out (down for " << down << ")\n"; + mon->clog->info() << "osd." << o << " out (down for " << down << ")"; } else continue; } @@ -2947,7 +2947,7 @@ void OSDMonitor::handle_osd_timeouts(const utime_t &now, } else if (can_mark_down(i)) { utime_t diff = now - t->second; if (diff > timeo) { - mon->clog->info() << "osd." << i << " marked down after no pg stats for " << diff << "seconds\n"; + mon->clog->info() << "osd." << i << " marked down after no pg stats for " << diff << "seconds"; derr << "no osd or pg stats from osd." << i << " since " << t->second << ", " << diff << " seconds ago. marking down" << dendl; pending_inc.new_state[i] = CEPH_OSD_UP; diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc index ca6334722b312..b50b9e50e9eb5 100644 --- a/src/mon/PGMonitor.cc +++ b/src/mon/PGMonitor.cc @@ -74,7 +74,7 @@ void PGMonitor::on_active() update_logger(); if (mon->is_leader()) - mon->clog->info() << "pgmap " << pg_map << "\n"; + mon->clog->info() << "pgmap " << pg_map; } void PGMonitor::update_logger() diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc index eabb026665716..c4b40902cc7c3 100644 --- a/src/osd/ECBackend.cc +++ b/src/osd/ECBackend.cc @@ -953,7 +953,7 @@ void ECBackend::handle_sub_read( hinfo = get_hash_info(i->first); if (!hinfo) { r = -EIO; - get_parent()->clog_error() << __func__ << ": No hinfo for " << i->first << "\n"; + get_parent()->clog_error() << __func__ << ": No hinfo for " << i->first; dout(5) << __func__ << ": No hinfo for " << i->first << dendl; goto error; } @@ -997,7 +997,7 @@ void ECBackend::handle_sub_read( h << bl; if (h.digest() != hinfo->get_chunk_hash(shard)) { get_parent()->clog_error() << __func__ << ": Bad hash for " << i->first << " digest 0x" - << hex << h.digest() << " expected 0x" << hinfo->get_chunk_hash(shard) << dec << "\n"; + << hex << h.digest() << " expected 0x" << hinfo->get_chunk_hash(shard) << dec; dout(5) << __func__ << ": Bad hash for " << i->first << " digest 0x" << hex << h.digest() << " expected 0x" << hinfo->get_chunk_hash(shard) << dec << dendl; r = -EIO; @@ -1187,7 +1187,7 @@ void ECBackend::handle_sub_read_reply( rop.complete[iter->first].r = err; } else { get_parent()->clog_error() << __func__ << ": Error(s) ignored for " - << iter->first << " enough copies available" << "\n"; + << iter->first << " enough copies available"; dout(10) << __func__ << " Error(s) ignored for " << iter->first << " enough copies available" << dendl; rop.complete[iter->first].errors.clear(); diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 69930c1e91745..4a788ffb9efa7 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -1449,8 +1449,7 @@ void OSDService::handle_misdirected_op(PG *pg, OpRequestRef op) << " pg " << m->get_raw_pg() << " to osd." << whoami << " not " << pg->acting - << " in e" << m->get_map_epoch() << "/" << osdmap->get_epoch() - << "\n"; + << " in e" << m->get_map_epoch() << "/" << osdmap->get_epoch(); if (g_conf->osd_enxio_on_misdirected_op) { reply_op_error(op, -ENXIO); } @@ -5981,7 +5980,7 @@ void OSD::do_command(Connection *con, ceph_tid_t tid, vector& cmd, buffe rs = ss.str(); odata.append(ds); dout(0) << "do_command r=" << r << " " << rs << dendl; - clog->info() << rs << "\n"; + clog->info() << rs; if (con) { MCommandReply *reply = new MCommandReply(r, rs); reply->set_tid(tid); @@ -6844,7 +6843,7 @@ void OSD::handle_osd_map(MOSDMap *m) dout(2) << "got incremental " << e << " but failed to encode full with correct crc; requesting" << dendl; - clog->warn() << "failed to encode map e" << e << " with expected crc\n"; + clog->warn() << "failed to encode map e" << e << " with expected crc"; dout(20) << "my encoded map was:\n"; fbl.hexdump(*_dout); *_dout << dendl; diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 885ce69776950..3a75d8932e928 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -3294,14 +3294,12 @@ void PG::log_weirdness() { if (pg_log.get_tail() != info.log_tail) osd->clog->error() << info.pgid - << " info mismatch, log.tail " << pg_log.get_tail() - << " != info.log_tail " << info.log_tail - << "\n"; + << " info mismatch, log.tail " << pg_log.get_tail() + << " != info.log_tail " << info.log_tail; if (pg_log.get_head() != info.last_update) osd->clog->error() << info.pgid - << " info mismatch, log.head " << pg_log.get_head() - << " != info.last_update " << info.last_update - << "\n"; + << " info mismatch, log.head " << pg_log.get_head() + << " != info.last_update " << info.last_update; if (!pg_log.get_log().empty()) { // sloppy check @@ -3311,15 +3309,13 @@ void PG::log_weirdness() << pg_log.get_head() << "]" << " actual [" << pg_log.get_log().log.begin()->version << "," - << pg_log.get_log().log.rbegin()->version << "]" - << "\n"; + << pg_log.get_log().log.rbegin()->version << "]"; } if (pg_log.get_log().caller_ops.size() > pg_log.get_log().log.size()) { osd->clog->error() << info.pgid << " caller_ops.size " << pg_log.get_log().caller_ops.size() - << " > log size " << pg_log.get_log().log.size() - << "\n"; + << " > log size " << pg_log.get_log().log.size(); } } @@ -4702,7 +4698,6 @@ void PG::scrub_finish() << " remaining deep scrub error details lost)"; if (repair) oss << ", " << scrubber.fixed << " fixed"; - oss << "\n"; if (total_errors) osd->clog->error(oss); else @@ -4917,7 +4912,7 @@ void PG::fulfill_log( if (query.since != eversion_t() && query.since < pg_log.get_tail()) { osd->clog->error() << info.pgid << " got broken pg_query_t::LOG since " << query.since << " when my log.tail is " << pg_log.get_tail() - << ", sending full log instead\n"; + << ", sending full log instead"; mlog->log = pg_log.get_log(); // primary should not have requested this!! } else mlog->log.copy_after(pg_log.get_log(), query.since); @@ -6891,9 +6886,9 @@ boost::statechart::result PG::RecoveryState::Active::react(const ActMap&) pg->all_unfound_are_queried_or_lost(pg->get_osdmap())) { if (pg->cct->_conf->osd_auto_mark_unfound_lost) { pg->osd->clog->error() << pg->info.pgid.pgid << " has " << unfound - << " objects unfound and apparently lost, would automatically marking lost but NOT IMPLEMENTED\n"; + << " objects unfound and apparently lost, would automatically marking lost but NOT IMPLEMENTED"; } else - pg->osd->clog->error() << pg->info.pgid.pgid << " has " << unfound << " objects unfound and apparently lost\n"; + pg->osd->clog->error() << pg->info.pgid.pgid << " has " << unfound << " objects unfound and apparently lost"; } if (pg->is_active()) { diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index ecdedae9a74a9..656a9db2c7a50 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -1739,7 +1739,7 @@ void PrimaryLogPG::do_op(OpRequestRef& op) << head << " pg_num " << pool.info.get_pg_num() << " hash " << std::hex << head.get_hash() << std::dec << dendl; osd->clog->warn() << info.pgid.pgid << " does not contain " << head - << " op " << *m << "\n"; + << " op " << *m; assert(!cct->_conf->osd_debug_misdirected_ops); return; } @@ -2098,7 +2098,7 @@ void PrimaryLogPG::do_op(OpRequestRef& op) << " != object's " << obc->obs.oi.soid << dendl; osd->clog->warn() << "bad locator " << m->get_object_locator() << " on object " << oloc - << " op " << *m << "\n"; + << " op " << *m; } // io blocked on obc? @@ -3433,7 +3433,7 @@ PrimaryLogPG::OpContextUPtr PrimaryLogPG::trim_object(bool first, const hobject_ object_info_t &coi = obc->obs.oi; set old_snaps(coi.snaps.begin(), coi.snaps.end()); if (old_snaps.empty()) { - osd->clog->error() << __func__ << " No object info snaps for " << coid << "\n"; + osd->clog->error() << __func__ << " No object info snaps for " << coid; return NULL; } @@ -3442,7 +3442,7 @@ PrimaryLogPG::OpContextUPtr PrimaryLogPG::trim_object(bool first, const hobject_ dout(10) << coid << " old_snaps " << old_snaps << " old snapset " << snapset << dendl; if (snapset.seq == 0) { - osd->clog->error() << __func__ << " No snapset.seq for " << coid << "\n"; + osd->clog->error() << __func__ << " No snapset.seq for " << coid; return NULL; } @@ -3459,7 +3459,7 @@ PrimaryLogPG::OpContextUPtr PrimaryLogPG::trim_object(bool first, const hobject_ if (new_snaps.empty()) { p = std::find(snapset.clones.begin(), snapset.clones.end(), coid.snap); if (p == snapset.clones.end()) { - osd->clog->error() << __func__ << " Snap " << coid.snap << " not in clones" << "\n"; + osd->clog->error() << __func__ << " Snap " << coid.snap << " not in clones"; return NULL; } } @@ -4078,7 +4078,7 @@ struct FillInVerifyExtent : public Context { if (maybe_crc != crc) { osd->clog->error() << std::hex << " full-object read crc 0x" << crc << " != expected 0x" << *maybe_crc - << std::dec << " on " << soid << "\n"; + << std::dec << " on " << soid; if (!(flags & CEPH_OSD_OP_FLAG_FAILOK)) { *rval = -EIO; *r = 0; @@ -4397,10 +4397,10 @@ int PrimaryLogPG::do_osd_ops(OpContext *ctx, vector& ops) if (r < 0) { osd->clog->error() << coll << " " << soid << " sparse-read failed to read: " - << r << "\n"; + << r; } else if (!t.is_zero()) { osd->clog->error() << coll << " " << soid << " sparse-read found data in hole " - << last << "~" << len << "\n"; + << last << "~" << len; } } @@ -4432,10 +4432,10 @@ int PrimaryLogPG::do_osd_ops(OpContext *ctx, vector& ops) if (r < 0) { osd->clog->error() << coll << " " << soid << " sparse-read failed to read: " - << r << "\n"; + << r; } else if (!t.is_zero()) { osd->clog->error() << coll << " " << soid << " sparse-read found data in hole " - << last << "~" << len << "\n"; + << last << "~" << len; } } } @@ -9759,7 +9759,7 @@ void PrimaryLogPG::mark_all_unfound_lost( << " objects unfound and apparently lost marking"; string rs = ss.str(); dout(0) << "do_command r=" << 0 << " " << rs << dendl; - osd->clog->info() << rs << "\n"; + osd->clog->info() << rs; if (con) { MCommandReply *reply = new MCommandReply(0, rs); reply->set_tid(tid); @@ -10330,14 +10330,14 @@ bool PrimaryLogPG::start_recovery_ops( if (missing.num_missing() > 0) { // this shouldn't happen! osd->clog->error() << info.pgid << " recovery ending with " << missing.num_missing() - << ": " << missing.get_items() << "\n"; + << ": " << missing.get_items(); return work_in_progress; } if (needs_recovery()) { // this shouldn't happen! // We already checked num_missing() so we must have missing replicas - osd->clog->error() << info.pgid << " recovery ending with missing replicas\n"; + osd->clog->error() << info.pgid << " recovery ending with missing replicas"; return work_in_progress; } @@ -10561,11 +10561,10 @@ int PrimaryLogPG::prep_object_replica_pushes( } } if (uhoh) - osd->clog->error() << info.pgid << " missing primary copy of " << soid << ", unfound\n"; + osd->clog->error() << info.pgid << " missing primary copy of " << soid << ", unfound"; else osd->clog->error() << info.pgid << " missing primary copy of " << soid - << ", will try copies on " << missing_loc.get_locations(soid) - << "\n"; + << ", will try copies on " << missing_loc.get_locations(soid); return 0; } @@ -12925,7 +12924,7 @@ void PrimaryLogPG::_scrub_finish() << scrub_cstat.sum.num_objects_hit_set_archive << "/" << info.stats.stats.sum.num_objects_hit_set_archive << " hit_set_archive, " << scrub_cstat.sum.num_whiteouts << "/" << info.stats.stats.sum.num_whiteouts << " whiteouts, " << scrub_cstat.sum.num_bytes << "/" << info.stats.stats.sum.num_bytes << " bytes, " - << scrub_cstat.sum.num_bytes_hit_set_archive << "/" << info.stats.stats.sum.num_bytes_hit_set_archive << " hit_set_archive bytes.\n"; + << scrub_cstat.sum.num_bytes_hit_set_archive << "/" << info.stats.stats.sum.num_bytes_hit_set_archive << " hit_set_archive bytes."; ++scrubber.shallow_errors; if (repair) { diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc index 4ba63117286d4..1ae2d0d0de9ce 100644 --- a/src/osd/ReplicatedBackend.cc +++ b/src/osd/ReplicatedBackend.cc @@ -2022,7 +2022,7 @@ int ReplicatedBackend::build_push_op(const ObjectRecoveryInfo &recovery_info, << recovery_info.soid << " v " << recovery_info.version << " failed because local copy is " - << oi.version << "\n"; + << oi.version; return -EINVAL; } @@ -2280,7 +2280,7 @@ void ReplicatedBackend::handle_pull(pg_shard_t peer, PullOp &op, PushOp *reply) if (r != 0) { get_parent()->clog_error() << get_info().pgid << " " << peer << " tried to pull " << soid - << " but got " << cpp_strerror(-r) << "\n"; + << " but got " << cpp_strerror(-r); prep_push_op_blank(soid, reply); } else { ObjectRecoveryInfo &recovery_info = op.recovery_info;