From: Sage Weil <sage@inktank.com>
Date: Thu, 12 Dec 2013 23:05:06 +0000 (-0800)
Subject: osd/ReplicatedPG: handle ECANCELED in C_CopyFrom, C_Flush
X-Git-Tag: v0.75~45^2~20
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bc05104149cb17a698d44d01149099b13918dc32;p=ceph.git

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 823181374435..dbc172f298fd 100644
--- 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);