From: Kefu Chai <kchai@redhat.com>
Date: Wed, 23 Aug 2017 08:34:12 +0000 (+0800)
Subject: osd/PGBackend: delete reply if fails to complete delete request
X-Git-Tag: v13.0.0~5^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1c18b5cb0c27d7976e6d3d5e4ea6c3935685019b;p=ceph.git

osd/PGBackend: delete reply if fails to complete delete request

if any of the objects fails to be deleted due to pg reset after latest
osdmap, the pg recovery delete reply won't be sent to the primary OSD.
in that case, we should delete the reply.

Fixes: http://tracker.ceph.com/issues/20913
Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc
index a1adce752be9..ef500e3351d3 100644
--- a/src/osd/PGBackend.cc
+++ b/src/osd/PGBackend.cc
@@ -140,6 +140,8 @@ void PGBackend::handle_recovery_delete(OpRequestRef op)
     [=](int r) {
       if (r != -EAGAIN) {
 	get_parent()->send_message_osd_cluster(reply, conn.get());
+      } else {
+	delete reply;
       }
     }));
   gather.activate();