[bookkeeper] branch branch-4.10 updated: Move the result of the BKCTL to the console by default

[eolivelli]

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

eolivelli pushed a commit to branch branch-4.10
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/branch-4.10 by this push:
     new 57c2bfe  Move the result of the BKCTL to the console by default
57c2bfe is described below

commit 57c2bfe4ddd4d1fbd617fe2419cc73501f171d70
Author: Dapeng <1807643...@qq.com>
AuthorDate: Fri Mar 6 15:31:24 2020 +0800

    Move the result of the BKCTL to the console by default
    
    ### Motivation
    
    ### Changes
    
      Move the result of the BKCTL to the console
    
    Master Issue: #2236
    
    Reviewers: Enrico Olivelli <eolive...@gmail.com>, Sijie Guo 
<si...@apache.org>
    
    This closes #2268 from SunDapeng1/branch-2267
    
    (cherry picked from commit 407a0299af034423aca009fe353c10a9de15f490)
    Signed-off-by: Enrico Olivelli <enrico.olive...@diennea.com>
---
 bin/bkctl                                                          | 2 +-
 .../test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java   | 3 ++-
 .../src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java   | 1 +
 conf/log4j.cli.properties                                          | 7 ++++++-
 conf/log4j.shell.properties                                        | 3 ++-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/bin/bkctl b/bin/bkctl
index 1cb7357..ab18d1e 100755
--- a/bin/bkctl
+++ b/bin/bkctl
@@ -47,7 +47,7 @@ if [ -z "${CLI_LOG_CONF}" ]; then
 fi
 CLI_LOG_DIR=${CLI_LOG_DIR:-"$BK_HOME/logs"}
 CLI_LOG_FILE=${CLI_LOG_FILE:-"bkctl.log"}
-CLI_ROOT_LOGGER=${CLI_ROOT_LOGGER:-"INFO,ROLLINGFILE"}
+CLI_ROOT_LOGGER=${CLI_ROOT_LOGGER:-"INFO,CONSOLE"}
 
 # Configure the classpath
 CLI_CLASSPATH="$CLI_JAR:$CLI_CLASSPATH:$CLI_EXTRA_CLASSPATH"
diff --git 
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java
 
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java
index 0b24db2..d205245 100644
--- 
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java
+++ 
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java
@@ -562,6 +562,7 @@ public class CreateNewLogTest {
                         startLatch.await();
                         entrylogManager.createNewLog(ledgerId);
                         createdEntryLogs.incrementAndGet();
+                        Thread.sleep(2000);
                     } catch (InterruptedException | IOException e) {
                         LOG.error("Got exception while trying to createNewLog 
for Ledger: " + ledgerId, e);
                     } finally {
@@ -572,7 +573,7 @@ public class CreateNewLogTest {
         }
 
         startLatch.countDown();
-        createdLatch.await(5, TimeUnit.SECONDS);
+        createdLatch.await(20, TimeUnit.SECONDS);
         Assert.assertEquals("Created EntryLogs", numOfLedgers * 
numOfThreadsForSameLedger, createdEntryLogs.get());
         Assert.assertEquals("Active currentlogs size", numOfLedgers, 
entrylogManager.getCopyOfCurrentLogs().size());
         Assert.assertEquals("Rotated entrylogs size", 
(numOfThreadsForSameLedger - 1) * numOfLedgers,
diff --git 
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
 
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
index ed52982..6cf0ba0 100644
--- 
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
+++ 
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
@@ -439,6 +439,7 @@ public class EntryLogTest {
         entryLogManagerBase.createNewLog(EntryLogger.UNASSIGNED_LEDGERID);
         entryLogManagerBase.flushRotatedLogs();
 
+        Thread.sleep(2000);
         assertEquals(Sets.newHashSet(0L, 1L), entryLogger.getEntryLogsSet());
 
         entryLogManagerBase.createNewLog(EntryLogger.UNASSIGNED_LEDGERID);
diff --git a/conf/log4j.cli.properties b/conf/log4j.cli.properties
index f90d955..a575033 100644
--- a/conf/log4j.cli.properties
+++ b/conf/log4j.cli.properties
@@ -54,4 +54,9 @@ 
log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} - %-5p - [%t:%C{
 
 log4j.logger.verbose=INFO,VERBOSECONSOLE
 log4j.logger.org.apache.zookeeper=ERROR
-log4j.logger.org.apache.bookkeeper=INFO
+log4j.logger.org.apache.bookkeeper=ERROR
+log4j.logger.org.apache.bookkeeper.bookie.BookieShell=INFO
+log4j.logger.org.apache.bookkeeper.client.BookKeeperAdmin=INFO
+log4j.logger.org.apache.bookkeeper.bookie.InterleavedStorageRegenerateIndexOp=INFO
+log4j.logger.org.apache.bookkeeper.tools.cli.commands.bookies.InstanceIdCommand=INFO
+
diff --git a/conf/log4j.shell.properties b/conf/log4j.shell.properties
index 7f8c00f..e27f7f5 100644
--- a/conf/log4j.shell.properties
+++ b/conf/log4j.shell.properties
@@ -48,4 +48,5 @@ log4j.logger.org.apache.zookeeper=ERROR
 log4j.logger.org.apache.bookkeeper=ERROR
 log4j.logger.org.apache.bookkeeper.bookie.BookieShell=INFO
 log4j.logger.org.apache.bookkeeper.client.BookKeeperAdmin=INFO
-log4j.logger.org.apache.bookkeeper.bookie.InterleavedStorageRegenerateIndexOp=INFO
\ No newline at end of file
+log4j.logger.org.apache.bookkeeper.bookie.InterleavedStorageRegenerateIndexOp=INFO
+log4j.logger.org.apache.bookkeeper.tools.cli.commands.bookies.InstanceIdCommand=INFO