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

Merge pull request #2184 from majianpeng/fix2

Browse Source 
ECBackend: Don't directyly use get_recovery_chunk_size() in RecoveryOp::WRITING state

Reviewed-by: Samuel Just <sam.just@inktank.com>
This commit is contained in:
Samuel Just 2014-08-04 10:32:07 -07:00
commit 6878e8cdbf
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/osd/ECBackend.cc
View File

@ -470,6 +470,7 @@ void ECBackend::continue_recovery_op(
assert(!op.recovery_progress.data_complete);
set<int> want(op.missing_on_shards.begin(), op.missing_on_shards.end());
set<pg_shard_t> to_read;
uint64_t recovery_max_chunk = get_recovery_chunk_size();
int r = get_min_avail_to_read_shards(
op.hoid, want, true, &to_read);
if (r != 0) {
@ -485,11 +486,11 @@ void ECBackend::continue_recovery_op(
this,
op.hoid,
op.recovery_progress.data_recovered_to,
get_recovery_chunk_size(),
recovery_max_chunk,
to_read,
op.recovery_progress.first);
op.extent_requested = make_pair(op.recovery_progress.data_recovered_to,
get_recovery_chunk_size());
recovery_max_chunk);
dout(10) << __func__ << ": IDLE return " << op << dendl;
return;
}
@ -499,7 +500,7 @@ void ECBackend::continue_recovery_op(
assert(op.returned_data.size());
op.state = RecoveryOp::WRITING;
ObjectRecoveryProgress after_progress = op.recovery_progress;
after_progress.data_recovered_to += get_recovery_chunk_size();
after_progress.data_recovered_to += op.extent_requested.second;
after_progress.first = false;
if (after_progress.data_recovered_to >= op.obc->obs.oi.size) {
after_progress.data_recovered_to =