From b654de9ea56ca96111f991b8321863118b9febe4 Mon Sep 17 00:00:00 2001 From: Abhishek Lekshmanan Date: Thu, 8 Mar 2018 13:55:00 +0100 Subject: [PATCH] rgw: es module: set compression type correctly 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 (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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_sync_module_es.cc b/src/rgw/rgw_sync_module_es.cc index 775fcd24e2d36..4377dd89d861f 100644 --- a/src/rgw/rgw_sync_module_es.cc +++ b/src/rgw/rgw_sync_module_es.cc @@ -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" && -- 2.39.5