RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-19 01:46:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw: es: fix attrs trimming

Browse Source 
Fixes: http://tracker.ceph.com/issues/38028

Since we don't necessarily keep attr headers with null terminating char,
need to be careful when trying to trim them.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
This commit is contained in:
Yehuda Sadeh 2019-01-23 17:22:25 -08:00
parent 8c5218f0f0
commit 9f8bb33fa7
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/rgw/rgw_sync_module_es.cc
View File

@ -362,6 +362,16 @@ static bool is_sys_attr(const std::string& attr_name){
return std::find(rgw_sys_attrs.begin(), rgw_sys_attrs.end(), attr_name) != rgw_sys_attrs.end();
}
static size_t attr_len(const bufferlist& val)
{
size_t len = val.length();
if (len && val[len - 1] == '\0') {
--len;
}
return len;
}
struct es_obj_metadata {
CephContext *cct;
ElasticConfigRef es_conf;
@ -394,7 +404,7 @@ struct es_obj_metadata {
if (boost::algorithm::starts_with(attr_name, RGW_ATTR_META_PREFIX)) {
custom_meta.emplace(attr_name.substr(sizeof(RGW_ATTR_META_PREFIX) - 1),
string(val.c_str(), (val.length() > 0 ? val.length() - 1 : 0)));
string(val.c_str(), attr_len(val)));
continue;
}
@ -452,7 +462,7 @@ struct es_obj_metadata {
} else {
if (!is_sys_attr(attr_name)) {
out_attrs.emplace(attr_name.substr(sizeof(RGW_ATTR_PREFIX) - 1),
std::string(val.c_str(), (val.length() > 0 ? val.length() - 1 : 0)));
std::string(val.c_str(), attr_len(val)));
}
}
}