osd/ReplicatedPG: handle ECANCELED in C_CopyFrom, C_Flush

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 823181374435bc3229b273d5e88de48bb4dedd0e..dbc172f298fd1c0aa0bf90a5e500b50233d6ff5b 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -4548,6 +4548,8 @@ struct C_Copyfrom : public Context {
       tid(0)
   {}
   void finish(int r) {
+    if (r == -ECANCELED)
+      return;
     pg->lock();
     if (last_peering_reset == pg->get_last_peering_reset()) {
       pg->process_copy_chunk(oid, tid, r);
@@ -4964,6 +4966,8 @@ struct C_Flush : public Context {
       tid(0)
   {}
   void finish(int r) {
+    if (r == -ECANCELED)
+      return;
     pg->lock();
     if (last_peering_reset == pg->get_last_peering_reset()) {
       pg->finish_flush(oid, tid, r);