Merge pull request #49767 from cbodley/wip-rgw-replicated-from

rgw: fetch_remote_obj() adds x-rgw-replicated-from headers

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>

diff --cc src/rgw/driver/rados/rgw_cr_rados.cc
Simple merge

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

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

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

diff --cc src/rgw/rgw_common.h
index 1b317b01b6f8afa9c81f2dffbcd30cab10d4317e,1b3c95d487ac1b036c197cd144e83c60886c5933..b67f603669ecc8b6fffa5128ce34d07f842d4c6c
--- 1/src/rgw/rgw_common.h
--- 2/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@@ -137,13 -137,8 +137,14 @@@ using ceph::crypto::MD5
  
  #define RGW_ATTR_APPEND_PART_NUM    RGW_ATTR_PREFIX "append_part_num"
  
 +/* Attrs to store cloudtier config information. These are used internally
 + * for the replication of cloudtiered objects but not stored as xattrs in
 + * the head object. */
 +#define RGW_ATTR_CLOUD_TIER_TYPE    RGW_ATTR_PREFIX "cloud_tier_type"
 +#define RGW_ATTR_CLOUD_TIER_CONFIG    RGW_ATTR_PREFIX "cloud_tier_config"
 +
  #define RGW_ATTR_OBJ_REPLICATION_STATUS RGW_ATTR_PREFIX "amz-replication-status"
+ #define RGW_ATTR_OBJ_REPLICATION_TRACE RGW_ATTR_PREFIX "replication-trace"
  
  /* IAM Policy */
  #define RGW_ATTR_IAM_POLICY   RGW_ATTR_PREFIX "iam-policy"

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