]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: es module: set compression type correctly
authorAbhishek Lekshmanan <abhishek@suse.com>
Thu, 8 Mar 2018 12:55:00 +0000 (13:55 +0100)
committerAbhishek Lekshmanan <abhishek@suse.com>
Fri, 7 Dec 2018 15:35:52 +0000 (16:35 +0100)
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

using global ::encode/::decode as the large changeset that changes all
occurences of encode/decode isn't going to be backported

src/rgw/rgw_sync_module_es.cc

index 775fcd24e2d363a3aba0d9cf3495fef1a5330030..4377dd89d861fdf6884f7075b38bd213dad2d61c 100644 (file)
@@ -309,7 +309,7 @@ struct es_obj_metadata {
       } else if (name == "compression") {
         RGWCompressionInfo cs_info;
         auto vals_bl = val.begin();
-        decode(cs_info, vals_bl);
+        ::decode(cs_info, vals_bl);
         out_attrs[name] = cs_info.compression_type;
       } else {
         if (name != "pg_ver" &&