RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 17:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

ReplicatedPG: return no data if read size is trimmed to zero

Browse Source 
OSD should return no data if the read size is trimmed to zero by the
truncate_seq/truncate_size check. We can't rely on ObjectStore::read()
to do that because it reads the entire object when the 'len' parameter
is zero.

Fixes: #7371
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
This commit is contained in:
Yan, Zheng 2014-02-16 22:14:50 +08:00
parent dcb6d02c52
commit 1dae27c505
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/osd/ReplicatedPG.cc
View File

@ -2829,22 +2829,25 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
case CEPH_OSD_OP_READ:
++ctx->num_read;
{
uint64_t trim = (uint64_t)-1;
__u32 seq = oi.truncate_seq;
// are we beyond truncate_size?
if ( (seq < op.extent.truncate_seq) &&
(op.extent.offset + op.extent.length > op.extent.truncate_size) ) {
// truncated portion of the read
unsigned from = MAX(op.extent.offset, op.extent.truncate_size); // also end of data
unsigned to = op.extent.offset + op.extent.length;
unsigned trim = to-from;
uint64_t from = MAX(op.extent.offset, op.extent.truncate_size); // also end of data
uint64_t to = op.extent.offset + op.extent.length;
trim = to - from;
op.extent.length = op.extent.length - trim;
}
// read into a buffer
bufferlist bl;
if (pool.info.ec_pool()) {
if (trim != (uint64_t)-1 && op.extent.length == 0) {
// read size was trimmed to zero
} else if (pool.info.ec_pool()) {
ctx->pending_async_reads.push_back(
make_pair(
make_pair(op.extent.offset, op.extent.length),