This is an automated email from the ASF dual-hosted git repository.

sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new 4578e6d  Fixed Journal stats names
4578e6d is described below

commit 4578e6d65a304c870fcba013099badd6018c95de
Author: Matteo Merli <mme...@apache.org>
AuthorDate: Tue Mar 13 16:49:50 2018 -0700

    Fixed Journal stats names
    
    In `BOOKKEEPER-1009: Use multiple journals in bookie` 
123eccd435a4a96a9147ed4a24efbe9025fe79ba there was a change in the metrics name 
that would be affecting also user not running with multiple journal.
    
    It is a bit inconvenient to aggregate the stats in the metrics collector 
(how to aggregate 99pct latency for example).
    
    I think the best option is to have a single metric even when using multiple 
journal threads.
    
    Author: Matteo Merli <mme...@apache.org>
    
    Reviewers: Ivan Kelly <iv...@apache.org>, Enrico Olivelli 
<eolive...@gmail.com>, Sijie Guo <si...@apache.org>
    
    This closes #1250 from merlimat/journal-metric-names
---
 .../src/main/java/org/apache/bookkeeper/bookie/Bookie.java          | 2 +-
 .../src/test/java/org/apache/bookkeeper/test/OpStatTest.java        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java 
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
index 223c977..58e1d1c 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
@@ -687,7 +687,7 @@ public class Bookie extends BookieCriticalThread {
         journals = Lists.newArrayList();
         for (int i = 0; i < journalDirectories.size(); i++) {
             journals.add(new Journal(journalDirectories.get(i),
-                         conf, ledgerDirsManager, 
statsLogger.scope(JOURNAL_SCOPE + "_" + i)));
+                         conf, ledgerDirsManager, 
statsLogger.scope(JOURNAL_SCOPE)));
         }
 
         this.entryLogPerLedgerEnabled = conf.isEntryLogPerLedgerEnabled();
diff --git 
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/OpStatTest.java 
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/OpStatTest.java
index 1d85dfe..a950709 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/OpStatTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/OpStatTest.java
@@ -114,9 +114,9 @@ public class OpStatTest extends BookKeeperClusterTestCase {
             assertTrue(average <= elapsed);
         });
         validateNonMonotonicCounterGauges(stats, new String[]{
-                BOOKIE_SCOPE + "." + JOURNAL_SCOPE + "_0." + 
JOURNAL_CB_QUEUE_SIZE,
-                BOOKIE_SCOPE + "." + JOURNAL_SCOPE + "_0." + 
JOURNAL_FORCE_WRITE_QUEUE_SIZE,
-                BOOKIE_SCOPE + "." + JOURNAL_SCOPE + "_0." + JOURNAL_QUEUE_SIZE
+                BOOKIE_SCOPE + "." + JOURNAL_SCOPE + "." + 
JOURNAL_CB_QUEUE_SIZE,
+                BOOKIE_SCOPE + "." + JOURNAL_SCOPE + "." + 
JOURNAL_FORCE_WRITE_QUEUE_SIZE,
+                BOOKIE_SCOPE + "." + JOURNAL_SCOPE + "." + JOURNAL_QUEUE_SIZE
         }, (value, max) -> {
             assertTrue(max > 0);
         });

-- 
To stop receiving notification emails like this one, please contact
si...@apache.org.

Reply via email to