From: John Spray <john.spray@redhat.com>
Date: Mon, 2 May 2016 21:23:04 +0000 (+0100)
Subject: osdc: send error to recovery waiters on shutdown
X-Git-Tag: v11.0.0~564^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=62c7a3c59ce479d5240eb5fbef01edf11388c7bb;p=ceph.git

osdc: send error to recovery waiters on shutdown

...instead of sending them '0', which gets things
confused.

Fixes: http://tracker.ceph.com/issues/15689
Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc
index fb38a08cd183..3e20aa93e151 100644
--- a/src/osdc/Journaler.cc
+++ b/src/osdc/Journaler.cc
@@ -1492,7 +1492,7 @@ void Journaler::shutdown()
     f->complete(-EAGAIN);
   }
 
-  finish_contexts(cct, waitfor_recover, 0);
+  finish_contexts(cct, waitfor_recover, -ESHUTDOWN);
 
   std::map<uint64_t, std::list<Context*> >::iterator i;
   for (i = waitfor_safe.begin(); i != waitfor_safe.end(); ++i) {