From bc4095ee44f8c060a43470c29c08767517b4d749 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Wed, 20 Sep 2017 01:18:35 -0400 Subject: [PATCH] osd/PrimaryLogPG: request osdmap update in the right block Fixes: http://tracker.ceph.com/issues/21428 Signed-off-by: Josh Durgin (cherry picked from commit afc6624f768ea3c6e2d155122797db5cce8836f7) --- src/osd/PrimaryLogPG.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index 7a6c24a0c28..2877c28d67a 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -1648,7 +1648,6 @@ void PrimaryLogPG::do_request( << p->first << " not empty, queueing" << dendl; p->second.push_back(op); op->mark_delayed("waiting_for_map not empty"); - osd->request_osdmap_update(op->min_epoch); return; } if (!have_same_or_newer_map(op->min_epoch)) { @@ -1656,6 +1655,7 @@ void PrimaryLogPG::do_request( << ", queue on waiting_for_map " << op->get_source() << dendl; waiting_for_map[op->get_source()].push_back(op); op->mark_delayed("op must wait for map"); + osd->request_osdmap_update(op->min_epoch); return; } -- 2.47.3