From: Yehuda Sadeh <yehuda@redhat.com>
Date: Fri, 19 Aug 2016 11:39:38 +0000 (-0700)
Subject: rgw: es sync module, keep object mtime
X-Git-Tag: v11.1.0~681^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4c96e9b29ace338f7966632ae277186ca36aacf5;p=ceph.git

rgw: es sync module, keep object mtime

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_sync_module_es.cc b/src/rgw/rgw_sync_module_es.cc
index 3aed75ac6b4..3e74f488266 100644
--- a/src/rgw/rgw_sync_module_es.cc
+++ b/src/rgw/rgw_sync_module_es.cc
@@ -24,12 +24,14 @@ struct es_obj_metadata {
   CephContext *cct;
   RGWBucketInfo bucket_info;
   rgw_obj_key key;
+  ceph::real_time mtime;
   uint64_t size;
   map<string, bufferlist> attrs;
 
-  es_obj_metadata(CephContext *_cct, const RGWBucketInfo& _bucket_info, const rgw_obj_key& _key,
-                  uint64_t _size, map<string, bufferlist>& _attrs) : cct(_cct), bucket_info(_bucket_info), key(_key),
-                                                                     size(_size), attrs(std::move(_attrs)) {}
+  es_obj_metadata(CephContext *_cct, const RGWBucketInfo& _bucket_info,
+                  const rgw_obj_key& _key, ceph::real_time& _mtime, uint64_t _size,
+                  map<string, bufferlist>& _attrs) : cct(_cct), bucket_info(_bucket_info), key(_key),
+                                                     mtime(_mtime), size(_size), attrs(std::move(_attrs)) {}
 
   void dump(Formatter *f) const {
     map<string, string> out_attrs;
@@ -82,6 +84,10 @@ struct es_obj_metadata {
     ::encode_json("permissions", permissions, f);
     f->open_object_section("meta");
     ::encode_json("size", size, f);
+
+    string mtime_str;
+    rgw_to_iso8601(mtime, &mtime_str);
+    ::encode_json("mtime", mtime_str, f);
     for (auto i : out_attrs) {
       ::encode_json(i.first.c_str(), i.second, f);
     }
@@ -103,7 +109,7 @@ public:
                               << " attrs=" << attrs << dendl;
       yield {
         string path = es_get_obj_path(bucket_info, key);
-        es_obj_metadata doc(sync_env->cct, bucket_info, key, size, attrs);
+        es_obj_metadata doc(sync_env->cct, bucket_info, key, mtime, size, attrs);
 
         call(new RGWPutRESTResourceCR<es_obj_metadata, int>(sync_env->cct, conf.conn,
                                                             sync_env->http_manager,