fix the bug of not stop solidity node gracefully

Author: 317787106

framework/src/main/java/org/tron/common/application/ApplicationImpl.java

@@ -10,6 +10,7 @@
 import org.tron.core.db.Manager;
 import org.tron.core.net.TronNetService;
 import org.tron.core.services.event.EventService;
+import org.tron.program.SolidityNode;
 
 @Slf4j(topic = "app")
 @Component
@@ -33,6 +34,9 @@ public class ApplicationImpl implements Application {
   @Autowired
   private ConsensusService consensusService;
 
+  @Autowired(required = false)
+  private SolidityNode solidityNode;
+
   private final CountDownLatch shutdown = new CountDownLatch(1);
 
   /**
@@ -55,6 +59,9 @@ public void shutdown() {
     }
     consensusService.stop();
     eventService.close();
+    if (solidityNode != null) {
+      solidityNode.close();
+    }
     dbManager.close();
     shutdown.countDown();
   }

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

@@ -69,16 +69,26 @@ public void onApplicationEvent(ContextClosedEvent event) {
     flag = false; // invoke earlier than @PreDestroy
   }
 
-  @PreDestroy
-  private void shutdown() {
+  public void close() {
     flag = false;
     if (databaseGrpcClient != null) {
       databaseGrpcClient.shutdown();
     }
+    // Interrupt get-block immediately: it may be stuck in blockQueue.put() (full queue,
+    // process-block stopped) or in a gRPC blocking stub call.
+    // Do NOT interrupt process-block: let it finish its current pushVerifiedBlock naturally
+    // (flag=false causes the while-loop to exit within 1-2 s) so the DB flush can complete
+    // cleanly before ApplicationImpl.shutdown() tears down the underlying executor.
+    getBlockExecutor.shutdownNow();
     ExecutorServiceManager.shutdownAndAwaitTermination(getBlockExecutor, getBlockName);
     ExecutorServiceManager.shutdownAndAwaitTermination(processBlockExecutor, processBlockName);
   }
 
+  @PreDestroy
+  private void shutdown() {
+    close();
+  }
+
   public void run() {
     try {
       databaseGrpcClient = new DatabaseGrpcClient(CommonParameter.getInstance().getTrustNodeAddr());