From c4861a61df7d3897ea45f933c627b2172fbf389c Mon Sep 17 00:00:00 2001 From: John Spray Date: Thu, 16 Oct 2014 19:35:34 +0100 Subject: [PATCH] osdc: continuously subscribe to osd map on pause We were doing this on FULL, should also have done it on PAUSERD and PAUSEWR, to avoid paused requests staying that way forever. Signed-off-by: John Spray --- src/osdc/Objecter.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index 8f30157418eab..f5df0bb0749bb 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -1436,7 +1436,9 @@ int Objecter::_maybe_request_map() { assert(rwlock.is_locked()); int flag = 0; - if (osdmap_full_flag()) { + if (osdmap_full_flag() + || osdmap->test_flag(CEPH_OSDMAP_PAUSERD) + || osdmap->test_flag(CEPH_OSDMAP_PAUSEWR)) { ldout(cct, 10) << "_maybe_request_map subscribing (continuous) to next osd map (FULL flag is set)" << dendl; } else { ldout(cct, 10) << "_maybe_request_map subscribing (onetime) to next osd map" << dendl; -- 2.39.5