From: Mykola Golub <mgolub@suse.com>
Date: Fri, 18 May 2018 07:32:49 +0000 (+0300)
Subject: Merge pull request #21915 from dillaman/wip-rbd-mirror-policy
X-Git-Tag: v14.0.0~95
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=42dac1669fcb92b4c4427a16155af274e6f1f93b;p=ceph.git

Merge pull request #21915 from dillaman/wip-rbd-mirror-policy

rbd-mirror: optionally support active/active replication

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
---

42dac1669fcb92b4c4427a16155af274e6f1f93b
diff --cc src/cls/rbd/cls_rbd_client.h
index 8e6673a25e23c,e483e5a4327a9..05f8571972b7a
--- a/src/cls/rbd/cls_rbd_client.h
+++ b/src/cls/rbd/cls_rbd_client.h
@@@ -436,8 -436,11 +436,11 @@@ namespace librbd 
      void mirror_image_map_list_start(librados::ObjectReadOperation *op,
                                       const std::string &start_after,
                                       uint64_t max_read);
 -    int mirror_image_map_list_finish(bufferlist::iterator *iter,
 +    int mirror_image_map_list_finish(bufferlist::const_iterator *iter,
                                       std::map<std::string, cls::rbd::MirrorImageMap> *image_mapping);
+     int mirror_image_map_list(librados::IoCtx *ioctx,
+                               const std::string &start_after, uint64_t max_read,
+                               std::map<std::string, cls::rbd::MirrorImageMap> *image_mapping);
      void mirror_image_map_update(librados::ObjectWriteOperation *op,
                                   const std::string &global_image_id,
                                   const cls::rbd::MirrorImageMap &image_map);