format code

Author: hangc0276

bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java

@@ -69,7 +69,6 @@
 import org.apache.bookkeeper.net.BookieId;
 import org.apache.bookkeeper.net.BookieSocketAddress;
 import org.apache.bookkeeper.net.DNS;
-import org.apache.bookkeeper.proto.BookieRequestHandler;
 import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.WriteCallback;
 import org.apache.bookkeeper.stats.NullStatsLogger;
 import org.apache.bookkeeper.stats.StatsLogger;
@@ -949,7 +948,6 @@ private void addEntryInternal(LedgerDescriptor handle, ByteBuf entry,
 
         if (!writeDataToJournal) {
             cb.writeComplete(0, ledgerId, entryId, null, ctx);
-            ((BookieRequestHandler) ctx).flushPendingResponse();
             return;
         }
 

bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieWriteLedgerTest.java

@@ -114,7 +114,7 @@ public void setUp() throws Exception {
     }
 
     public BookieWriteLedgerTest() {
-        super(5, 1800);
+        super(5, 180);
         this.digestType = DigestType.CRC32;
         String ledgerManagerFactory = "org.apache.bookkeeper.meta.HierarchicalLedgerManagerFactory";
         // set ledger manager
@@ -125,7 +125,6 @@ public BookieWriteLedgerTest() {
          */
         baseConf.setSkipListSizeLimit(4 * 1024 * 1024);
         baseClientConf.setLedgerManagerFactoryClassName(ledgerManagerFactory);
-        baseClientConf.setUseV2WireProtocol(true);
     }
 
     /**

bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java

@@ -252,10 +252,6 @@ protected void stopZKCluster() throws Exception {
      */
     protected void startBKCluster(String metadataServiceUri) throws Exception {
         baseConf.setMetadataServiceUri(metadataServiceUri);
-        baseConf.setJournalAdaptiveGroupWrites(true);
-        baseConf.setJournalMaxGroupWaitMSec(100);
-        baseConf.setJournalFlushWhenQueueEmpty(false);
-        //baseConf.setJournalWriteData(false);
         baseClientConf.setMetadataServiceUri(metadataServiceUri);
         baseClientConf.setAllocatorPoolingPolicy(PoolingPolicy.UnpooledHeap);
         if (numBookies > 0) {