]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: es module: set compression type correctly 21736/head
authorAbhishek Lekshmanan <abhishek@suse.com>
Thu, 8 Mar 2018 12:55:00 +0000 (13:55 +0100)
committerPrashant D <pdhange@redhat.com>
Mon, 30 Apr 2018 07:19:54 +0000 (03:19 -0400)
Parse compression type from the compression attr and only send this to ES.

Fixes: http://tracker.ceph.com/issues/22758
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 5dc4655a4f14547410ee9c66ab32b0c943dc4753)

Conflicts:
src/rgw/rgw_sync_module_es.cc: Resolved in es_obj_metadata

src/rgw/rgw_sync_module_es.cc

index 6c8c65c5a14cc3f8f8e6cded4cacdbb89e89636f..0c30c91ed847874418ef1f9a76e33356fca9f019 100644 (file)
@@ -306,6 +306,11 @@ struct es_obj_metadata {
       } else if (name == "x-amz-tagging") {
         auto tags_bl = val.begin();
         ::decode(obj_tags, tags_bl);
+      } else if (name == "compression") {
+        RGWCompressionInfo cs_info;
+        auto vals_bl = val.begin();
+        decode(cs_info, vals_bl);
+        out_attrs[name] = cs_info.compression_type;
       } else {
         if (name != "pg_ver" &&
             name != "source_zone" &&