From 28ea49a1acc75a8911274e9dc6b15651b7f7a952 Mon Sep 17 00:00:00 2001 From: Jianpeng Ma Date: Sun, 28 Nov 2021 13:00:14 +0800 Subject: [PATCH] librbd/cache/pwl: revert patch 76f4d29d92be3f9f45767cb1ac6cc50. In fact, After BlockGuard to fix flush reorder issue, patch 76f4d29d9 don't need. So revert. Signed-off-by: Jianpeng Ma (cherry picked from commit cc8dae1d89a6cc44f6133a10424d767fc3291dd2) --- src/librbd/cache/pwl/AbstractWriteLog.cc | 5 ----- src/librbd/cache/pwl/AbstractWriteLog.h | 1 - src/librbd/cache/pwl/rwl/WriteLog.cc | 1 - src/librbd/cache/pwl/ssd/WriteLog.cc | 3 --- 4 files changed, 10 deletions(-) diff --git a/src/librbd/cache/pwl/AbstractWriteLog.cc b/src/librbd/cache/pwl/AbstractWriteLog.cc index a7ac93153b313..ee82d382125e1 100644 --- a/src/librbd/cache/pwl/AbstractWriteLog.cc +++ b/src/librbd/cache/pwl/AbstractWriteLog.cc @@ -1744,10 +1744,6 @@ void AbstractWriteLog::process_writeback_dirty_entries() { break; } - if (m_flush_ops_will_send) { - ldout(cct, 20) << "Previous flush-ops is still not sent" << dendl; - break; - } auto candidate = m_dirty_log_entries.front(); bool flushable = can_flush_entry(candidate); if (flushable) { @@ -1764,7 +1760,6 @@ void AbstractWriteLog::process_writeback_dirty_entries() { m_lowest_flushing_sync_gen = candidate->ram_entry.sync_gen_number; } m_flush_ops_in_flight += 1; - m_flush_ops_will_send += 1; /* For write same this is the bytes affected by the flush op, not the bytes transferred */ m_flush_bytes_in_flight += candidate->ram_entry.write_bytes; } diff --git a/src/librbd/cache/pwl/AbstractWriteLog.h b/src/librbd/cache/pwl/AbstractWriteLog.h index e66562234026e..e53c632069479 100644 --- a/src/librbd/cache/pwl/AbstractWriteLog.h +++ b/src/librbd/cache/pwl/AbstractWriteLog.h @@ -296,7 +296,6 @@ protected: std::atomic m_async_flush_ops = {0}; std::atomic m_async_append_ops = {0}; - std::atomic m_flush_ops_will_send = {0}; /* Acquire locks in order declared here */ mutable ceph::mutex m_log_retire_lock; diff --git a/src/librbd/cache/pwl/rwl/WriteLog.cc b/src/librbd/cache/pwl/rwl/WriteLog.cc index 128add41beb4e..78647a98660a3 100644 --- a/src/librbd/cache/pwl/rwl/WriteLog.cc +++ b/src/librbd/cache/pwl/rwl/WriteLog.cc @@ -595,7 +595,6 @@ void WriteLog::construct_flush_entries(pwl::GenericLogEntries entries_to_flus ldout(m_image_ctx.cct, 15) << "flushing:" << log_entry << " " << *log_entry << dendl; log_entry->writeback(this->m_image_writeback, ctx); - this->m_flush_ops_will_send -= 1; }), 0); }); } diff --git a/src/librbd/cache/pwl/ssd/WriteLog.cc b/src/librbd/cache/pwl/ssd/WriteLog.cc index 62445d8f8bc65..fdec734d39e1f 100644 --- a/src/librbd/cache/pwl/ssd/WriteLog.cc +++ b/src/librbd/cache/pwl/ssd/WriteLog.cc @@ -563,7 +563,6 @@ void WriteLog::construct_flush_entries(pwl::GenericLogEntries entries_to_flus ldout(m_image_ctx.cct, 15) << "flushing:" << log_entry << " " << *log_entry << dendl; log_entry->writeback(this->m_image_writeback, ctx); - this->m_flush_ops_will_send -= 1; }), 0); }); } @@ -612,7 +611,6 @@ void WriteLog::construct_flush_entries(pwl::GenericLogEntries entries_to_flus << " " << *log_entry << dendl; log_entry->writeback_bl(this->m_image_writeback, ctx, std::move(captured_entry_bl)); - this->m_flush_ops_will_send -= 1; }), 0); }); } else { @@ -625,7 +623,6 @@ void WriteLog::construct_flush_entries(pwl::GenericLogEntries entries_to_flus ldout(m_image_ctx.cct, 15) << "flushing:" << log_entry << " " << *log_entry << dendl; log_entry->writeback(this->m_image_writeback, ctx); - this->m_flush_ops_will_send -= 1; }), 0); }); } -- 2.39.5