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: v12.2.13~89^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a6453060145d6e52c0e243cc50c84725f0b776eb;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 e57d8b83ad75..86d0e181f9e1 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -10130,9 +10130,15 @@ int RGWRados::set_attrs(void *ctx, const RGWBucketInfo& bucket_info, rgw_obj& ob
         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;