From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 10 Mar 2020 02:08:01 +0000 (-0400)
Subject: librbd: properly copy primary mirror uuid to out param
X-Git-Tag: v15.1.1~31^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a594e543965e413376d2f1892bec172dadc589e4;p=ceph.git

librbd: properly copy primary mirror uuid to out param

This variable is not currently used in snapshot-based mirroring
mode but it should be populated for consistency.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/librbd/mirror/GetInfoRequest.cc b/src/librbd/mirror/GetInfoRequest.cc
index 0f6981fc743..4ec529ba898 100644
--- a/src/librbd/mirror/GetInfoRequest.cc
+++ b/src/librbd/mirror/GetInfoRequest.cc
@@ -269,6 +269,7 @@ void GetInfoRequest<I>::calc_promotion_state(
         break;
       case cls::rbd::MIRROR_SNAPSHOT_STATE_NON_PRIMARY:
         *m_promotion_state = PROMOTION_STATE_NON_PRIMARY;
+        *m_primary_mirror_uuid = mirror_ns->primary_mirror_uuid;
         break;
       case cls::rbd::MIRROR_SNAPSHOT_STATE_PRIMARY_DEMOTED:
       case cls::rbd::MIRROR_SNAPSHOT_STATE_NON_PRIMARY_DEMOTED: