[bookkeeper] branch master updated: Bring back statslogger to BookKeeper client in ReplicationWorker process.

[si...@apache.org]

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 be3bdd0  Bring back statslogger to BookKeeper client in ReplicationWorker process.
be3bdd0 is described below

commit be3bdd0fa20f818158c25f6b59fcfc89d82c4734
Author: Charan Reddy Guttapalem <cg...@salesforce.com>
AuthorDate: Fri Jun 7 08:27:04 2019 -0700

    Bring back statslogger to BookKeeper client in ReplicationWorker process.
    
    
    Descriptions of the changes in this PR:
    
    bd2b16e880d172d4761461fdbf85c1bd19b24e36 is supposed to fix this issue,
    but it missed passing statsLogger to createBookKeeperClient method.
    
    For more info. check desc. of bd2b16e880d172d4761461fdbf85c1bd19b24e36.
    
    
    Reviewers: Enrico Olivelli <eo...@gmail.com>, Sijie Guo <si...@apache.org>
    
    This closes #2108 from reddycharan/enablebookieclientlogger
---
 .../main/java/org/apache/bookkeeper/replication/AutoRecoveryMain.java  | 3 ++-
 .../java/org/apache/bookkeeper/bookie/BookieInitializationTest.java    | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AutoRecoveryMain.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AutoRecoveryMain.java
index c495443..39b41aa 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AutoRecoveryMain.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AutoRecoveryMain.java
@@ -36,6 +36,7 @@ import org.apache.bookkeeper.bookie.BookieCriticalThread;
 import org.apache.bookkeeper.bookie.ExitCode;
 import org.apache.bookkeeper.client.BKException;
 import org.apache.bookkeeper.client.BookKeeper;
+import org.apache.bookkeeper.client.BookKeeperClientStats;
 import org.apache.bookkeeper.common.component.ComponentStarter;
 import org.apache.bookkeeper.common.component.LifecycleComponent;
 import org.apache.bookkeeper.common.component.LifecycleComponentStack;
@@ -91,7 +92,7 @@ public class AutoRecoveryMain {
             throws IOException, InterruptedException, KeeperException, UnavailableException,
             CompatibilityException {
         this.conf = conf;
-        this.bkc = Auditor.createBookKeeperClient(conf);
+        this.bkc = Auditor.createBookKeeperClient(conf, statsLogger.scope(BookKeeperClientStats.CLIENT_SCOPE));
         MetadataClientDriver metadataClientDriver = bkc.getMetadataClientDriver();
         metadataClientDriver.setSessionStateListener(() -> {
             LOG.error("Client connection to the Metadata server has expired, so shutting down AutoRecoveryMain!");
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java
index 8e0561b..8ea63e1 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java
@@ -65,6 +65,7 @@ import org.apache.bookkeeper.bookie.LedgerDirsManager.NoWritableLedgerDirExcepti
 import org.apache.bookkeeper.client.BookKeeper;
 import org.apache.bookkeeper.client.BookKeeper.DigestType;
 import org.apache.bookkeeper.client.BookKeeperAdmin;
+import org.apache.bookkeeper.client.BookKeeperClientStats;
 import org.apache.bookkeeper.client.LedgerHandle;
 import org.apache.bookkeeper.common.component.ComponentStarter;
 import org.apache.bookkeeper.common.component.Lifecycle;
@@ -1319,6 +1320,8 @@ public class BookieInitializationTest extends BookKeeperClusterTestCase {
         // do primitive checks if metrics string contains some stats
         assertTrue("Metrics should contain basic counters",
                 metrics.contains(ReplicationStats.NUM_FULL_OR_PARTIAL_LEDGERS_REPLICATED));
+        assertTrue("Metrics should contain basic counters from BookKeeper client",
+                metrics.contains(BookKeeperClientStats.CREATE_OP));
 
         // Now, hit the rest endpoint for configs
         url = new URL("http://localhost:" + nextFreePort + HttpRouter.SERVER_CONFIG);