From: J. Eric Ivancich <ivancich@redhat.com>
Date: Thu, 29 Aug 2019 14:36:17 +0000 (-0400)
Subject: rgw: make sure object's idtag is updated when available
X-Git-Tag: v14.2.8~28^2~2^2~15^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2a0bcd39ee5bd3d37bd74d18e165dde1a08564af;p=ceph.git

rgw: make sure object's idtag is updated when available

This change was originally submitted by lltlo <120680451@qq.com> but
had some formatting issues and wasn't signed-off.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 7d32b082f826181b605ae02ebc914fba9ac0d449)
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index c611d8fc7a9f..a2d0fbcc2a01 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -6267,9 +6267,15 @@ int RGWRados::set_attrs(void *ctx, const RGWBucketInfo& bucket_info, rgw_obj& sr
         state->attrset.erase(iter->first);
       }
     }
+
     for (iter = attrs.begin(); iter != attrs.end(); ++iter) {
       state->attrset[iter->first] = iter->second;
     }
+
+    auto iter = state->attrset.find(RGW_ATTR_ID_TAG);
+    if (iter != state->attrset.end()) {
+      iter->second = state->obj_tag;
+    }
   }
 
   return 0;