ReplicatedPG::process_copy_chunk: fix invalid list traversal for proxy_read

Fixes: 14423
Backport: infernalis, hammer
Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 855bff85d34377684c42c4122f9ae8d248a3df32..5bc5fe07cf15a39144812caf327f2eb8fb1a2b5b 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -7163,9 +7163,11 @@ void ReplicatedPG::process_copy_chunk(hobject_t oid, ceph_tid_t tid, int r)
       }
     }
     for (map<ceph_tid_t, ProxyWriteOpRef>::iterator it = proxywrite_ops.begin();
-        it != proxywrite_ops.end(); ++it) {
+        it != proxywrite_ops.end();) {
       if (it->second->soid == cobc->obs.oi.soid) {
-       cancel_proxy_write(it->second);
+       cancel_proxy_write((it++)->second);
+      } else {
+       ++it;
       }
     }
     kick_proxy_ops_blocked(cobc->obs.oi.soid);