From 412e412aa6a85071946b4f0b83751c0421c52365 Mon Sep 17 00:00:00 2001 From: John Spray Date: Tue, 15 Sep 2015 22:11:20 +0100 Subject: [PATCH] osd: permit MDS to send writes on full pools Same behaviour as the global full flag, for the per-pool full flag. The FS was broken by 67de12bf, which added the pool flag handling. Fixes: #12971 Signed-off-by: John Spray --- src/osd/OSD.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 46514f354c03c..f0ace3f9698db 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -8092,8 +8092,8 @@ void OSD::handle_op(OpRequestRef& op, OSDMapRef& osdmap) } // pool is full ? map &pool_last_map_marked_full = superblock.pool_last_map_marked_full; - if (pi->has_flag(pg_pool_t::FLAG_FULL) || - (pool_last_map_marked_full.count(pool) && (m->get_map_epoch() < pool_last_map_marked_full[pool]))) { + if ((pi->has_flag(pg_pool_t::FLAG_FULL) || + (pool_last_map_marked_full.count(pool) && (m->get_map_epoch() < pool_last_map_marked_full[pool]))) && !m->get_source().is_mds()) { return; } -- 2.39.5