summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYehuda Sadeh <yehuda@inktank.com>2013-09-03 13:27:21 -0700
committerYehuda Sadeh <yehuda@inktank.com>2013-09-10 20:10:03 -0700
commit0499948aad64c6c66668b43963403fb0cb1a2737 (patch)
tree4ef2085cf0479a751e5bf6e9d3ff37167a8502c9
parent63901a4f9feb8b33a1580d07e72400339352d9bf (diff)
downloadceph-0499948aad64c6c66668b43963403fb0cb1a2737.tar.gz
rgw: when failing read from client, return correct error
Fixes: #6214 When getting a failed read from client when putting an object we returned the wrong value (always 0), which in the chunked- upload case ended up in assuming that the write was done successfully. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
-rw-r--r--src/rgw/rgw_rest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
index 196bd29e99b..4aa1d401211 100644
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@ -709,7 +709,7 @@ int RGWPutObj_ObjStore::get_data(bufferlist& bl)
int r = s->cio->read(bp.c_str(), cl, &read_len);
len = read_len;
if (r < 0)
- return ret;
+ return r;
bl.append(bp, 0, len);
}