diff options
| author | Yehuda Sadeh <yehuda@redhat.com> | 2015-09-21 17:22:29 +0200 |
|---|---|---|
| committer | Yehuda Sadeh <yehuda@redhat.com> | 2015-09-21 17:22:29 +0200 |
| commit | 63be27977e5e30e8a0ef2380c4c0962d9ae053d3 (patch) | |
| tree | 841e2ecf358c2c8bfdc6f8be8930764ccb0b678c /src/rgw | |
| parent | Merge pull request #5974 from Sandy4999/wip-rgw-errmsg (diff) | |
| parent | rgw: don't read actual data on user manifest HEAD (diff) | |
| download | ceph-63be27977e5e30e8a0ef2380c4c0962d9ae053d3.tar.xz ceph-63be27977e5e30e8a0ef2380c4c0962d9ae053d3.zip | |
Merge pull request #5996 from rzarzynski/wip-12780
rgw: don't read actual data on user manifest HEAD
Diffstat (limited to 'src/rgw')
| -rw-r--r-- | src/rgw/rgw_op.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index 722f39d2b7e..ff84aba0b06 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -850,6 +850,12 @@ int RGWGetObj::handle_user_manifest(const char *prefix) s->obj_size = total_len; + if (!get_data) { + bufferlist bl; + send_response_data(bl, 0, 0); + return 0; + } + r = iterate_user_manifest_parts(s->cct, store, ofs, end, bucket, obj_prefix, bucket_policy, NULL, get_obj_user_manifest_iterate_cb, (void *)this); if (r < 0) return r; |