Merge pull request #23298 from yehudasa/wip-rgw-ps-3

rgw: pub-sub

diff --cc src/cls/rgw/cls_rgw_client.cc
Simple merge

diff --cc src/rgw/rgw_admin.cc
Simple merge

diff --cc src/rgw/rgw_common.h
Simple merge

diff --cc src/rgw/rgw_coroutine.cc
Simple merge

diff --cc src/rgw/rgw_cr_rados.h
Simple merge

diff --cc src/rgw/rgw_data_sync.cc
Simple merge

diff --cc src/rgw/rgw_data_sync.h
Simple merge

diff --cc src/rgw/rgw_lc.h
Simple merge

diff --cc src/rgw/rgw_op.h
Simple merge

diff --cc src/rgw/rgw_rados.cc
Simple merge

diff --cc src/rgw/rgw_rados.h
Simple merge

diff --cc src/rgw/rgw_sync_module.cc
Simple merge

diff --cc src/rgw/rgw_sync_module.h
Simple merge

diff --cc src/rgw/rgw_sync_module_es.h
Simple merge

diff --cc src/rgw/rgw_user.cc
Simple merge

diff --cc src/rgw/rgw_zone.h
Simple merge

diff --cc src/rgw/services/svc_zone.cc
index eeaffc23a18785a8e7d2adf205a2808cc2abe560,013a3c2d1cd70260db530c3c8f3ba3d8740d660d..ea6518427f553feb4ebcdf96b3ece1c1e79794a8
--- 1/src/rgw/services/svc_zone.cc
--- 2/src/rgw/services/svc_zone.cc
+++ b/src/rgw/services/svc_zone.cc
@@@ -1027,10 -1040,10 +1033,10 @@@ int RGWSI_Zone::select_bucket_location_
    return 0;
  }
  
- int RGWSI_Zone::select_bucket_placement(RGWUserInfo& user_info, const string& zonegroup_id, const string& placement_rule,
+ int RGWSI_Zone::select_bucket_placement(const RGWUserInfo& user_info, const string& zonegroup_id, const string& placement_rule,
                                        string *pselected_rule_name, RGWZonePlacementInfo *rule_info)
  {
 -  if (!get_zone_params().placement_pools.empty()) {
 +  if (!zone_params->placement_pools.empty()) {
      return select_new_bucket_location(user_info, zonegroup_id, placement_rule,
                                        pselected_rule_name, rule_info);
    }

diff --cc src/rgw/services/svc_zone.h
Simple merge