fix the bug of not stop solidity now

Author: 317787106

common/src/main/java/org/tron/common/es/ExecutorServiceManager.java

@@ -84,15 +84,6 @@ public static void shutdownAndAwaitTermination(ExecutorService pool, String name
     logger.info("Pool {} shutdown done", name);
   }
 
-  public static void shutdownNow(ExecutorService pool, String name) {
-    if (pool == null) {
-      return;
-    }
-    logger.info("Pool {} shutdown...", name);
-    pool.shutdownNow();
-    logger.info("Pool {} shutdown done", name);
-  }
-
   public static Future<?> submit(ExecutorService es, Runnable task) {
     return es.submit(() -> {
       try {

framework/src/main/java/org/tron/common/client/DatabaseGrpcClient.java

@@ -45,7 +45,7 @@ public Block getBlock(long blockNum) {
   }
 
   public void shutdown() {
-    channel.shutdown();
+    channel.shutdownNow();
   }
 
   public DynamicProperties getDynamicProperties() {

framework/src/main/java/org/tron/program/SolidityNode.java

@@ -72,11 +72,11 @@ public void onApplicationEvent(ContextClosedEvent event) {
   @PreDestroy
   private void shutdown() {
     flag = false;
-    ExecutorServiceManager.shutdownNow(getBlockExecutor, getBlockName);
-    ExecutorServiceManager.shutdownNow(processBlockExecutor, processBlockName);
     if (databaseGrpcClient != null) {
       databaseGrpcClient.shutdown();
     }
+    ExecutorServiceManager.shutdownAndAwaitTermination(getBlockExecutor, getBlockName);
+    ExecutorServiceManager.shutdownAndAwaitTermination(processBlockExecutor, processBlockName);
   }
 
   public void run() {