From: Changcheng Liu <changcheng.liu@aliyun.com>
Date: Mon, 25 May 2020 08:54:27 +0000 (+0800)
Subject: rbd/rwl: correct m_perfcounter access scope
X-Git-Tag: v16.1.0~2241^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f51a5dfa1345a672043f4bc66b57dd12d680313d;p=ceph.git

rbd/rwl: correct m_perfcounter access scope

There's no m_perfcounter in SyncPoint. Its scope is in
ReplicatedWriteLog.

Signed-off-by: Changcheng Liu <changcheng.liu@intel.com>
---

diff --git a/src/librbd/cache/ReplicatedWriteLog.cc b/src/librbd/cache/ReplicatedWriteLog.cc
index 8e27c8d9ca0..bc12af60dfa 100644
--- a/src/librbd/cache/ReplicatedWriteLog.cc
+++ b/src/librbd/cache/ReplicatedWriteLog.cc
@@ -2385,6 +2385,9 @@ void ReplicatedWriteLog<I>::new_sync_point(DeferredContexts &later) {
    * nullptr, but m_current_sync_gen may not be zero. */
   if (old_sync_point) {
     new_sync_point->setup_earlier_sync_point(old_sync_point, m_last_op_sequence_num);
+    m_perfcounter->hinc(l_librbd_rwl_syncpoint_hist,
+                        old_sync_point->log_entry->writes,
+                        old_sync_point->log_entry->bytes);
     /* This sync point will acquire no more sub-ops. Activation needs
      * to acquire m_lock, so defer to later*/
     later.add(new LambdaContext(
diff --git a/src/librbd/cache/rwl/SyncPoint.cc b/src/librbd/cache/rwl/SyncPoint.cc
index 19126acd664..cb3f3cfeebd 100644
--- a/src/librbd/cache/rwl/SyncPoint.cc
+++ b/src/librbd/cache/rwl/SyncPoint.cc
@@ -93,8 +93,6 @@ void SyncPoint::add_in_on_appending_ctxs(Context* ctx) {
 
 void SyncPoint::setup_earlier_sync_point(std::shared_ptr<SyncPoint> sync_point,
                                          uint64_t last_op_sequence_num) {
-    m_perfcounter->inc(l_librbd_rwl_syncpoint_hist,
-                       sync_point->log_entry->writes, sync_point->log_entry->bytes);
     earlier_sync_point = sync_point;
     log_entry->prior_sync_point_flushed = false;
     earlier_sync_point->log_entry->next_sync_point_entry = log_entry;