Merge pull request #5868 from halibobo1205/feat/backup_thead_pool_close_opt

fix(backup): make SR node with backup exit normally by kill -15

Author: lvs007

framework/src/main/java/org/tron/common/backup/socket/BackupServer.java

@@ -95,7 +95,6 @@ public void initChannel(NioDatagramChannel ch)
   public void close() {
     logger.info("Closing backup server...");
     shutdown = true;
-    ExecutorServiceManager.shutdownAndAwaitTermination(executor, name);
     backupManager.stop();
     if (channel != null) {
       try {
@@ -104,6 +103,7 @@ public void close() {
         logger.warn("Closing backup server failed.", e);
       }
     }
+    ExecutorServiceManager.shutdownAndAwaitTermination(executor, name);
     logger.info("Backup server closed.");
   }
 }

framework/src/test/java/org/tron/common/backup/BackupServerTest.java

@@ -37,8 +37,10 @@ public void tearDown() {
     Args.clearParam();
   }
 
-  @Test
+  @Test(timeout = 60_000)
   public void test() throws InterruptedException {
     backupServer.initServer();
+    // wait for the server to start
+    Thread.sleep(1000);
   }
 }