From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 4 May 2016 14:23:25 +0000 (-0400)
Subject: rbd-mirror: clean up image sync debug messages
X-Git-Tag: v10.2.1~14^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d3dc919991a013eb45d55a8b6a04628d089d000a;p=ceph.git

rbd-mirror: clean up image sync debug messages

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit acca475fe5c9ff024c7f76397e7f49e4c4558b09)
---

diff --git a/src/tools/rbd_mirror/ImageSync.cc b/src/tools/rbd_mirror/ImageSync.cc
index f2f6784b84cd..f71dfdd6e570 100644
--- a/src/tools/rbd_mirror/ImageSync.cc
+++ b/src/tools/rbd_mirror/ImageSync.cc
@@ -82,7 +82,7 @@ void ImageSync<I>::handle_prune_catch_up_sync_point(int r) {
   ldout(cct, 20) << ": r=" << r << dendl;
 
   if (r < 0) {
-    lderr(cct) << "failed to prune catch-up sync point: "
+    lderr(cct) << ": failed to prune catch-up sync point: "
                << cpp_strerror(r) << dendl;
     finish(r);
     return;
@@ -118,7 +118,7 @@ void ImageSync<I>::handle_create_sync_point(int r) {
   ldout(cct, 20) << ": r=" << r << dendl;
 
   if (r < 0) {
-    lderr(cct) << "failed to create sync point: " << cpp_strerror(r)
+    lderr(cct) << ": failed to create sync point: " << cpp_strerror(r)
                << dendl;
     finish(r);
     return;
@@ -148,7 +148,7 @@ void ImageSync<I>::handle_copy_snapshots(int r) {
   ldout(cct, 20) << ": r=" << r << dendl;
 
   if (r < 0) {
-    lderr(cct) << "failed to copy snapshot metadata: "
+    lderr(cct) << ": failed to copy snapshot metadata: "
                << cpp_strerror(r) << dendl;
     finish(r);
     return;
@@ -196,11 +196,11 @@ void ImageSync<I>::handle_copy_image(int r) {
   ldout(cct, 20) << ": r=" << r << dendl;
 
   if (r == -ECANCELED) {
-    ldout(cct, 10) << "image copy canceled" << dendl;
+    ldout(cct, 10) << ": image copy canceled" << dendl;
     finish(r);
     return;
   } else if (r < 0) {
-    lderr(cct) << "failed to copy image: " << cpp_strerror(r) << dendl;
+    lderr(cct) << ": failed to copy image: " << cpp_strerror(r) << dendl;
     finish(r);
     return;
   }
@@ -298,7 +298,7 @@ void ImageSync<I>::handle_prune_sync_points(int r) {
   ldout(cct, 20) << ": r=" << r << dendl;
 
   if (r < 0) {
-    lderr(cct) << "failed to prune sync point: "
+    lderr(cct) << ": failed to prune sync point: "
                << cpp_strerror(r) << dendl;
     finish(r);
     return;