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>

diff --cc src/cls/rbd/cls_rbd.cc
Simple merge

diff --cc src/cls/rbd/cls_rbd_client.cc
Simple merge

diff --cc src/cls/rbd/cls_rbd_client.h
index 8e6673a25e23c05348654f71337736bfa02f4661,e483e5a4327a9cf8b46ea066fe6a151005901c5a..05f8571972b7a17e6f3a83ddc054dc169fbeb713
--- 1/src/cls/rbd/cls_rbd_client.h
--- 2/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);

diff --cc src/common/options.cc
Simple merge

diff --cc src/librbd/journal/Replay.cc
Simple merge

diff --cc src/librbd/journal/Replay.h
Simple merge

diff --cc src/test/cls_rbd/test_cls_rbd.cc
Simple merge

diff --cc src/tools/rbd_mirror/ImageReplayer.cc
Simple merge

diff --cc src/tools/rbd_mirror/LeaderWatcher.cc
Simple merge

diff --cc src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc
Simple merge