Skip to content

Commit 4a6fe28

Browse files
mds: Simplify logging messages and ensure consistent use of std::move in quiesce_cluster_update and quiesce_dispatch
Fixes: https://tracker.ceph.com/issues/73428 Signed-off-by: Edwin Rodriguez <[email protected]>
1 parent 353eaff commit 4a6fe28

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/mds/MDSRankQuiesce.cc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,9 @@ void MDSRank::quiesce_cluster_update() {
284284
}
285285
auto addrs = mdsmap->get_info_gid(membership.leader).addrs;
286286

287-
auto ack_msg = make_message<MMDSQuiesceDbAck>(QuiesceDbPeerAck{me, std::move(ack)});
288287
dout(10) << "sending ack " << ack << " to the leader " << membership.leader << dendl;
288+
auto ack_msg = make_message<MMDSQuiesceDbAck>(
289+
QuiesceDbPeerAck{me, std::move(ack)});
289290
return send_message_mds(ack_msg, addrs);
290291
}
291292
};
@@ -297,8 +298,9 @@ void MDSRank::quiesce_cluster_update() {
297298
return -ENOENT;
298299
}
299300
auto addrs = mdsmap->get_info_gid(to).addrs;
300-
auto listing_msg = make_message<MMDSQuiesceDbListing>(QuiesceDbPeerListing{me, std::move(db)});
301301
dout(10) << "sending listing " << db << " to the peer " << to << dendl;
302+
auto listing_msg = make_message<MMDSQuiesceDbListing>(
303+
QuiesceDbPeerListing{me, std::move(db)});
302304
return send_message_mds(listing_msg, addrs);
303305
};
304306
}
@@ -380,7 +382,7 @@ bool MDSRank::quiesce_dispatch(const cref_t<Message> &m) {
380382
dout(10) << "got " << peer_listing << dendl;
381383
int result = quiesce_db_manager->submit_peer_listing(std::move(peer_listing));
382384
if (result != 0) {
383-
dout(3) << "error (" << result << ") submitting " << peer_listing << dendl;
385+
dout(3) << "submit error (" << result << ")" << dendl;
384386
}
385387
} else {
386388
dout(5) << "no db manager to process " << peer_listing << dendl;
@@ -397,7 +399,7 @@ bool MDSRank::quiesce_dispatch(const cref_t<Message> &m) {
397399
dout(10) << "got " << peer_ack << dendl;
398400
int result = quiesce_db_manager->submit_peer_ack(std::move(peer_ack));
399401
if (result != 0) {
400-
dout(3) << "error (" << result << ") submitting and ack from " << peer_ack.origin << dendl;
402+
dout(3) << "error (" << result << ") submitting and ack" << dendl;
401403
}
402404
} else {
403405
dout(5) << "no db manager to process " << peer_ack << dendl;

0 commit comments

Comments
 (0)