summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-06-10 11:48:25 -0700
committerSage Weil <sage@inktank.com>2013-06-20 11:29:55 -0700
commit38ddae04bb974a93f1718c509363f1afbe6b612d (patch)
tree726c3d00e8c53077401df939b0fe223267a2b07f
parent1669132fcfc27d0c0b5e5bb93ade59d147e23404 (diff)
downloadceph-38ddae04bb974a93f1718c509363f1afbe6b612d.tar.gz
mon: fix raw use of *_dout in sync_requester_abort()
Signed-off-by: Sage Weil <sage@inktank.com> (cherry picked from commit 8a4ed58e39b287fd8667c62b45848487515bdc80)
-rw-r--r--src/mon/Monitor.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 5b6f8786642..f38e57054cf 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -1302,13 +1302,13 @@ void Monitor::sync_requester_abort()
assert(sync_role == SYNC_ROLE_REQUESTER);
if (sync_leader.get() != NULL) {
- *_dout << " " << sync_leader->entity;
+ dout(10) << __func__ << " leader " << sync_leader->entity << dendl;
sync_leader->cancel_timeout();
sync_leader.reset();
}
if (sync_provider.get() != NULL) {
- *_dout << " " << sync_provider->entity;
+ dout(10) << __func__ << " provider " << sync_provider->entity << dendl;
sync_provider->cancel_timeout();
MMonSync *msg = new MMonSync(MMonSync::OP_ABORT);
@@ -1316,7 +1316,6 @@ void Monitor::sync_requester_abort()
sync_provider.reset();
}
- *_dout << " clearing potentially inconsistent store" << dendl;
// Given that we are explicitely aborting the whole sync process, we should
// play it safe and clear the store.