From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 15 Apr 2020 20:26:09 +0000 (-0400)
Subject: librbd: mirror peer add error message should include site name
X-Git-Tag: v15.2.2~64^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=38e97fd5d156edb01636f2a37e5ed246e743ebc9;p=ceph.git

librbd: mirror peer add error message should include site name

It previously included the pointer to string holding the generated
uuid (neither of which would mean much to an end user).

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

diff --git a/src/librbd/api/Mirror.cc b/src/librbd/api/Mirror.cc
index 304611dd9e01f..de8e58604d559 100644
--- a/src/librbd/api/Mirror.cc
+++ b/src/librbd/api/Mirror.cc
@@ -1474,7 +1474,7 @@ int Mirror<I>::peer_site_add(librados::IoCtx& io_ctx, std::string *uuid,
     if (r == -ESTALE) {
       ldout(cct, 5) << "duplicate UUID detected, retrying" << dendl;
     } else if (r < 0) {
-      lderr(cct) << "failed to add mirror peer '" << uuid << "': "
+      lderr(cct) << "failed to add mirror peer '" << site_name << "': "
                  << cpp_strerror(r) << dendl;
       return r;
     }