From dbe23c94c0074358380a40d47a417f7999920696 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 7 Sep 2016 15:29:30 -0400 Subject: [PATCH] os/bluestore/BlueFS: do not start racing async compaction Compaction is triggred from sync_metadata. If one compaction is in progress and another thread also calls sync_metadata, do not trigger a second async compaction! Signed-off-by: Sage Weil --- src/os/bluestore/BlueFS.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc index 0e665ee507146..6e3aeb4767604 100644 --- a/src/os/bluestore/BlueFS.cc +++ b/src/os/bluestore/BlueFS.cc @@ -998,10 +998,14 @@ bool BlueFS::_should_compact_log() float ratio = (float)current / (float)expected; dout(10) << __func__ << " current 0x" << std::hex << current << " expected " << expected << std::dec - << " ratio " << ratio << dendl; - if (current < g_conf->bluefs_log_compact_min_size || - ratio < g_conf->bluefs_log_compact_min_ratio) + << " ratio " << ratio + << (log_flushing ? " (async compaction in progress)" : "") + << dendl; + if (log_flushing || + current < g_conf->bluefs_log_compact_min_size || + ratio < g_conf->bluefs_log_compact_min_ratio) { return false; + } return true; }