Speed up shutdown in test cases (apache#3809)

* speed up shutdown in test cases

* fix failed test

Author: hangc0276

bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AutoRecoveryMainTest.java

@@ -26,6 +26,7 @@
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
+import java.util.concurrent.TimeUnit;
 import org.apache.bookkeeper.bookie.BookieImpl;
 import org.apache.bookkeeper.meta.zk.ZKMetadataClientDriver;
 import org.apache.bookkeeper.net.BookieId;
@@ -118,7 +119,7 @@ public void testAutoRecoverySessionLoss() throws Exception {
         assertNotNull(currentAuditor);
         Auditor auditor1 = main1.auditorElector.getAuditor();
         assertEquals("Current Auditor should be AR1", currentAuditor, BookieImpl.getBookieId(confByIndex(0)));
-        Awaitility.await().untilAsserted(() -> {
+        Awaitility.waitAtMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
             assertNotNull(auditor1);
             assertTrue("Auditor of AR1 should be running", auditor1.isRunning());
         });

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

@@ -275,6 +275,7 @@ protected void stopBKCluster() throws Exception {
             bkc.close();
         }
 
+        stopReplicationService();
         for (ServerTester t : servers) {
             t.shutdown();
         }
@@ -316,6 +317,7 @@ protected void stopAllBookies() throws Exception {
     }
 
     protected void stopAllBookies(boolean shutdownClient) throws Exception {
+        stopReplicationService();
         for (ServerTester t : servers) {
             t.shutdown();
         }
@@ -607,6 +609,7 @@ public void restartBookies(Function<ServerConfiguration, ServerConfiguration> re
             throws Exception {
         // shut down bookie server
         List<ServerConfiguration> confs = new ArrayList<>();
+        stopReplicationService();
         for (ServerTester server : servers) {
             server.shutdown();
             confs.add(server.getConfiguration());
@@ -964,7 +967,7 @@ public void shutdown() throws Exception {
 
             if (autoRecovery != null) {
                 if (LOG.isDebugEnabled()) {
-                    LOG.debug("Shutdown auto recovery for bookieserver: {}", address);
+                    LOG.debug("Shutdown auto recovery for bookie server: {}", address);
                 }
                 autoRecovery.shutdown();
             }