RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-02 00:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw: don't try to parse some forwarded requests

Browse Source 
Not every forwarded requests are expected to get a json response,
don't pass the parser when not needed.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
This commit is contained in:
Yehuda Sadeh 2016-02-15 14:51:32 -08:00
parent 842140b3e8
commit 3c28f19897
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/rgw/rgw_op.cc
View File

@ -1718,7 +1718,7 @@ static int forward_request_to_master(struct req_state *s, obj_version *objv, RGW
return ret;
ldout(s->cct, 20) << "response: " << response.c_str() << dendl;
if (!jp->parse(response.c_str(), response.length())) {
if (jp && !jp->parse(response.c_str(), response.length())) {
ldout(s->cct, 0) << "failed parsing response from master zonegroup" << dendl;
return -EINVAL;
}
@ -1934,9 +1934,8 @@ void RGWDeleteBucket::execute()
if (!store->is_meta_master()) {
bufferlist in_data;
JSONParser jp;
op_ret = forward_request_to_master(s, &ot.read_version, store, in_data,
&jp);
NULL);
if (op_ret < 0) {
if (op_ret == -ENOENT) {
/* adjust error, we want to return with NoSuchBucket and not
@ -4350,9 +4349,8 @@ bool RGWBulkDelete::Deleter::delete_single(const acct_path_t& path)
if (!store->get_zonegroup().is_master) {
bufferlist in_data;
JSONParser jp;
ret = forward_request_to_master(s, &ot.read_version, store, in_data,
&jp);
NULL);
if (ret < 0) {
if (ret == -ENOENT) {
/* adjust error, we want to return with NoSuchBucket and not