]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osdc: send error to recovery waiters on shutdown 8887/head
authorJohn Spray <john.spray@redhat.com>
Mon, 2 May 2016 21:23:04 +0000 (22:23 +0100)
committerJohn Spray <john.spray@redhat.com>
Mon, 2 May 2016 21:23:04 +0000 (22:23 +0100)
...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>
src/osdc/Journaler.cc

index fb38a08cd1836a322b68e9559ae1376e9a4e3414..3e20aa93e151684618e13780e654452d44be99d5 100644 (file)
@@ -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) {