From: Sage Weil <sage@inktank.com>
Date: Tue, 17 Jun 2014 20:33:14 +0000 (-0700)
Subject: osd: fix filestore perf stats update
X-Git-Tag: v0.80.2~26
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a9f97f8cae5b9d0245e0b0842c5c581cdacbb2da;p=ceph.git

osd: fix filestore perf stats update

Update the struct we are about to send, not the (unlocked!) one we will
send the next time around.

Backport: firefly, dumpling
Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 4afffb4a10a0bbf7f2018ef3ed6b167c7921e46b)
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 018a4d987e7d..608b188a7e0d 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3977,7 +3977,7 @@ void OSD::send_pg_stats(const utime_t &now)
   osd_stat_t cur_stat = osd_stat;
   stat_lock.Unlock();
 
-  osd_stat.fs_perf_stat = store->get_cur_stats();
+  cur_stat.fs_perf_stat = store->get_cur_stats();
    
   pg_stat_queue_lock.Lock();