diff options
author | Sage Weil <sage@inktank.com> | 2013-09-30 16:33:22 -0700 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-10-01 08:56:12 -0700 |
commit | 75b94ba2953169cd7cd458df5a0f6b844504d1f9 (patch) | |
tree | 9171088737b2cf4205cfe53cb63536fedef2bdcd | |
parent | 56711370c3a7dfce683f73f1f4b7b5ccd66cbeb5 (diff) | |
download | ceph-75b94ba2953169cd7cd458df5a0f6b844504d1f9.tar.gz |
osd/ReplicatedPG: fix iterator corruption in cancel_copy_ops()
The cancel_copy() method removes the entry from copy_ops. Move the
iterator forward before calling.
Fixes segfault when thrashing osds with a copy-from workload.
Signed-off-by: Sage Weil <sage@inktank.com>
-rw-r--r-- | src/osd/ReplicatedPG.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 5e099c0853d..fcaca434ba8 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -4583,10 +4583,9 @@ void ReplicatedPG::cancel_copy(CopyOpRef cop) void ReplicatedPG::cancel_copy_ops() { dout(10) << __func__ << dendl; - for (map<hobject_t,CopyOpRef>::iterator p = copy_ops.begin(); - p != copy_ops.end(); - copy_ops.erase(p++)) { - cancel_copy(p->second); + map<hobject_t,CopyOpRef>::iterator p = copy_ops.begin(); + while (p != copy_ops.end()) { + cancel_copy((p++)->second); } } |