]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
os/filestore: fix filestore journal logger 12099/head
authorWei Jin <wjin.cn@gmail.com>
Mon, 21 Nov 2016 13:35:35 +0000 (21:35 +0800)
committerWei Jin <wjin.cn@gmail.com>
Tue, 22 Nov 2016 03:13:52 +0000 (11:13 +0800)
Using u64 intsead of u64_counter for journal_ops/bytes.

These two items are used to metric active journal entry/size,
active means data in journal queue and journal disk, which will be
applied soon and then become inactive or useless.

Signed-off-by: Wei Jin <wjin.cn@gmail.com>
src/os/filestore/FileStore.cc

index d3f632192b5b0bf8de19cf5affac1f71fd863e73..76ae0b5861e4f31207555b58181fdb8b887cac12 100644 (file)
@@ -603,9 +603,9 @@ FileStore::FileStore(const std::string &base, const std::string &jdev, osflagbit
   PerfCountersBuilder plb(g_ceph_context, internal_name, l_filestore_first, l_filestore_last);
 
   plb.add_u64(l_filestore_journal_queue_ops, "journal_queue_ops", "Operations in journal queue");
-  plb.add_u64_counter(l_filestore_journal_ops, "journal_ops", "Total journal entries written");
+  plb.add_u64(l_filestore_journal_ops, "journal_ops", "Active journal entries to be applied");
   plb.add_u64(l_filestore_journal_queue_bytes, "journal_queue_bytes", "Size of journal queue");
-  plb.add_u64_counter(l_filestore_journal_bytes, "journal_bytes", "Total operations size in journal");
+  plb.add_u64(l_filestore_journal_bytes, "journal_bytes", "Active journal operation size to be applied");
   plb.add_time_avg(l_filestore_journal_latency, "journal_latency", "Average journal queue completing latency");
   plb.add_u64_counter(l_filestore_journal_wr, "journal_wr", "Journal write IOs");
   plb.add_u64_avg(l_filestore_journal_wr_bytes, "journal_wr_bytes", "Journal data written");