Merge pull request #6234 from zeusoo001/event-his

feat(event): optimize history event service close logic

Author: CodeNinjaEvan

framework/src/main/java/org/tron/core/services/event/EventService.java

@@ -24,39 +24,44 @@ public class EventService {
   @Autowired
   private Manager manager;
 
+  private EventPluginLoader instance = EventPluginLoader.getInstance();
+
   public void init()  {
     logger.info("Start to load eventPlugin. {}, {}, {} "
         + "block: {}, {} trx: {}, {}, {} event: {}, {} log: {}, {}, {}, {} solid: {}",
         manager.isEventPluginLoaded(),
 
-        EventPluginLoader.getInstance().getVersion(),
-        EventPluginLoader.getInstance().getStartSyncBlockNum(),
+        instance.getVersion(),
+        instance.getStartSyncBlockNum(),
 
-        EventPluginLoader.getInstance().isBlockLogTriggerEnable(),
-        EventPluginLoader.getInstance().isBlockLogTriggerSolidified(),
+        instance.isBlockLogTriggerEnable(),
+        instance.isBlockLogTriggerSolidified(),
 
-        EventPluginLoader.getInstance().isTransactionLogTriggerEnable(),
-        EventPluginLoader.getInstance().isTransactionLogTriggerSolidified(),
-        EventPluginLoader.getInstance().isTransactionLogTriggerEthCompatible(),
+        instance.isTransactionLogTriggerEnable(),
+        instance.isTransactionLogTriggerSolidified(),
+        instance.isTransactionLogTriggerEthCompatible(),
 
-        EventPluginLoader.getInstance().isContractEventTriggerEnable(),
-        EventPluginLoader.getInstance().isSolidityEventTriggerEnable(),
+        instance.isContractEventTriggerEnable(),
+        instance.isSolidityEventTriggerEnable(),
 
-        EventPluginLoader.getInstance().isContractLogTriggerEnable(),
-        EventPluginLoader.getInstance().isContractLogTriggerRedundancy(),
-        EventPluginLoader.getInstance().isSolidityLogTriggerEnable(),
-        EventPluginLoader.getInstance().isSolidityLogTriggerRedundancy(),
+        instance.isContractLogTriggerEnable(),
+        instance.isContractLogTriggerRedundancy(),
+        instance.isSolidityLogTriggerEnable(),
+        instance.isSolidityLogTriggerRedundancy(),
 
-        EventPluginLoader.getInstance().isSolidityTriggerEnable());
+        instance.isSolidityTriggerEnable());
 
-    if (!manager.isEventPluginLoaded() || EventPluginLoader.getInstance().getVersion() != 1) {
+    if (!manager.isEventPluginLoaded() || instance.getVersion() != 1) {
       return;
     }
 
     historyEventService.init();
   }
 
   public void close() {
+    if (!manager.isEventPluginLoaded() || instance.getVersion() != 1) {
+      return;
+    }
     historyEventService.close();
     blockEventLoad.close();
     realtimeEventService.close();

framework/src/main/java/org/tron/core/services/event/HistoryEventService.java

@@ -29,30 +29,32 @@ public class HistoryEventService {
   @Autowired
   private Manager manager;
 
-  private volatile boolean isRunning;
+  private volatile Thread thread;
 
   public void init() {
     if (instance.getStartSyncBlockNum() <= 0) {
       initEventService(manager.getChainBaseManager().getHeadBlockId());
       return;
     }
 
-    isRunning = true;
-
-    new Thread(() -> syncEvent(), "history-event").start();
+    thread = new Thread(() -> syncEvent(), "history-event");
+    thread.start();
 
     logger.info("History event service start.");
   }
 
   public void close() {
-    isRunning = false;
+    if (thread != null) {
+      thread.interrupt();
+    }
+    logger.info("History event service close.");
   }
 
   private void syncEvent() {
     try {
       long tmp = instance.getStartSyncBlockNum();
       long endNum = manager.getDynamicPropertiesStore().getLatestSolidifiedBlockNum();
-      while (tmp <= endNum && isRunning) {
+      while (tmp <= endNum) {
         BlockEvent blockEvent = blockEventGet.getBlockEvent(tmp);
         realtimeEventService.flush(blockEvent, false);
         solidEventService.flush(blockEvent);

framework/src/test/java/org/tron/core/event/EventServiceTest.java

@@ -4,6 +4,7 @@
 
 import org.junit.Test;
 import org.mockito.Mockito;
+import org.tron.common.logsfilter.EventPluginLoader;
 import org.tron.common.utils.ReflectUtils;
 import org.tron.core.capsule.BlockCapsule;
 import org.tron.core.db.Manager;
@@ -38,5 +39,10 @@ public void test() {
 
     eventService.init();
     eventService.close();
+
+    EventPluginLoader instance = mock(EventPluginLoader.class);
+    Mockito.when(instance.getVersion()).thenReturn(1);
+    ReflectUtils.setFieldValue(eventService, "instance", instance);
+    eventService.close();
   }
 }

framework/src/test/java/org/tron/core/event/HistoryEventServiceTest.java

@@ -44,6 +44,7 @@ public void test() throws Exception {
     ReflectUtils.setFieldValue(historyEventService, "realtimeEventService", realtimeEventService);
     ReflectUtils.setFieldValue(historyEventService, "blockEventLoad", blockEventLoad);
     historyEventService.init();
+    historyEventService.close();
     solidEventService.close();
     realtimeEventService.close();
     blockEventLoad.close();
@@ -71,7 +72,6 @@ public void test() throws Exception {
     Mockito.when(blockEventGet.getBlockEvent(1)).thenReturn(be2);
 
     Mockito.when(instance.getStartSyncBlockNum()).thenReturn(1L);
-    ReflectUtils.setFieldValue(historyEventService, "isRunning", true);
     Mockito.when(dynamicPropertiesStore.getLatestSolidifiedBlockNum()).thenReturn(1L);
 
     Mockito.when(chainBaseManager.getBlockIdByNum(1L))
@@ -81,5 +81,7 @@ public void test() throws Exception {
     method1.setAccessible(true);
     method1.invoke(historyEventService);
 
+    historyEventService.init();
+    historyEventService.close();
   }
 }