revert changes

Author: Sunny Jiao

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

@@ -19,7 +19,6 @@
 import io.grpc.netty.NettyServerBuilder;
 import io.grpc.protobuf.services.ProtoReflectionService;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +34,6 @@
 public abstract class RpcService extends AbstractService {
 
   private Server apiServer;
-  private ExecutorService executorService;
   protected String executorName;
 
   @Autowired
@@ -60,24 +58,7 @@ public void innerStart() throws Exception {
   @Override
   public void innerStop() throws Exception {
     if (this.apiServer != null) {
-      this.apiServer.shutdown();
-      try {
-        if (!this.apiServer.awaitTermination(5, TimeUnit.SECONDS)) {
-          logger.warn("gRPC server did not shutdown gracefully, forcing shutdown");
-          this.apiServer.shutdownNow();
-        }
-      } catch (InterruptedException e) {
-        logger.warn("Interrupted while waiting for gRPC server shutdown", e);
-        this.apiServer.shutdownNow();
-        Thread.currentThread().interrupt();
-      }
-    }
-
-    // Close executor
-    if (this.executorService != null) {
-      ExecutorServiceManager.shutdownAndAwaitTermination(
-          this.executorService, this.executorName);
-      this.executorService = null;
+      this.apiServer.shutdown().awaitTermination(5, TimeUnit.SECONDS);
     }
   }
 
@@ -95,9 +76,9 @@ protected NettyServerBuilder initServerBuilder() {
     NettyServerBuilder serverBuilder = NettyServerBuilder.forPort(this.port);
     CommonParameter parameter = Args.getInstance();
     if (parameter.getRpcThreadNum() > 0) {
-      this.executorService = ExecutorServiceManager.newFixedThreadPool(
-          this.executorName, parameter.getRpcThreadNum());
-      serverBuilder = serverBuilder.executor(this.executorService);
+      serverBuilder = serverBuilder
+          .executor(ExecutorServiceManager.newFixedThreadPool(
+              this.executorName, parameter.getRpcThreadNum()));
     }
     // Set configs from config.conf or default value
     serverBuilder

framework/src/test/java/org/tron/core/services/RpcApiServicesTest.java

@@ -11,7 +11,6 @@
 import io.grpc.ManagedChannelBuilder;
 import java.io.IOException;
 import java.util.Objects;
-import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -54,7 +53,6 @@
 import org.tron.common.application.Application;
 import org.tron.common.application.ApplicationFactory;
 import org.tron.common.application.TronApplicationContext;
-import org.tron.common.es.ExecutorServiceManager;
 import org.tron.common.utils.ByteArray;
 import org.tron.common.utils.PublicMethod;
 import org.tron.common.utils.Sha256Hash;
@@ -142,9 +140,6 @@ public class RpcApiServicesTest {
   private static ByteString ivk;
   private static ByteString d;
 
-  private static ExecutorService executorService;
-  private static final String executorName = "rpc-test-executor";
-
   @BeforeClass
   public static void init() throws IOException {
     Args.setParam(new String[] {"-d", temporaryFolder.newFolder().toString()}, Constant.TEST_CONF);
@@ -168,22 +163,16 @@ public static void init() throws IOException {
     String pBFTNode = String.format("%s:%d", Constant.LOCAL_HOST,
         getInstance().getRpcOnPBFTPort());
 
-    executorService = ExecutorServiceManager.newFixedThreadPool(
-        executorName, 3);
-
     channelFull = ManagedChannelBuilder.forTarget(fullNode)
         .usePlaintext()
-        .executor(executorService)
         .intercept(new TimeoutInterceptor(5000))
         .build();
     channelPBFT = ManagedChannelBuilder.forTarget(pBFTNode)
         .usePlaintext()
-        .executor(executorService)
         .intercept(new TimeoutInterceptor(5000))
         .build();
     channelSolidity = ManagedChannelBuilder.forTarget(solidityNode)
         .usePlaintext()
-        .executor(executorService)
         .intercept(new TimeoutInterceptor(5000))
         .build();
     context = new TronApplicationContext(DefaultConfig.class);
@@ -208,45 +197,17 @@ public static void init() throws IOException {
 
   @AfterClass
   public static void destroy() {
-    shutdownChannel(channelFull);
-    shutdownChannel(channelPBFT);
-    shutdownChannel(channelSolidity);
-
-    if (executorService != null) {
-      ExecutorServiceManager.shutdownAndAwaitTermination(
-          executorService, executorName);
-      executorService = null;
+    if (channelFull != null) {
+      channelFull.shutdownNow();
     }
-
-    context.close();
-    Args.clearParam();
-  }
-
-  private static void shutdownChannel(ManagedChannel channel) {
-    if (channel == null) {
-      return;
+    if (channelPBFT != null) {
+      channelPBFT.shutdownNow();
     }
-    try {
-      channel.shutdown();
-      if (!channel.awaitTermination(5, TimeUnit.SECONDS)) {
-        channel.shutdownNow();
-      }
-    } catch (InterruptedException e) {
-      channel.shutdownNow();
-      Thread.currentThread().interrupt();
+    if (channelSolidity != null) {
+      channelSolidity.shutdownNow();
     }
-  }
-
-  @Before
-  public void start() {
-    logger.debug("========== Starting test: {} ==========", name.getMethodName());
-    System.out.println("========== Starting test: " + name.getMethodName() + " ==========");
-  }
-
-  @After
-  public void end() throws InterruptedException {
-    logger.debug("========== Ending test: {} ==========", name.getMethodName());
-    System.out.println("========== Ending test: " + name.getMethodName() + " ==========");
+    context.close();
+    Args.clearParam();
   }
 
   @Test

gradle/verification-metadata.xml

@@ -846,15 +846,15 @@
             <sha256 value="8719f349cd542ae3ce523ac3992513a8c04020621bc86e880a79afa5f1aaf589" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.github.tronprotocol" name="libp2p" version="2.2.7">
-         <artifact name="libp2p-2.2.7.jar">
-            <sha256 value="6cf446b68723299e41189bd17d1605544ec4e8bada3830c7fa54d043b22b2208" origin="Generated by Gradle"/>
+      <component group="io.github.tronprotocol" name="libp2p" version="2.2.6">
+         <artifact name="libp2p-2.2.6.jar">
+            <sha256 value="b56584e6b6906b143fc915382aed5a6d98d8c5a5162fdb3320f58ef6f89e33e1" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="libp2p-2.2.7.module">
-            <sha256 value="8dcf317770be76db50d2f5dd694f5b0edba98e2bf147626d9b49bbd888669689" origin="Generated by Gradle"/>
+         <artifact name="libp2p-2.2.6.module">
+            <sha256 value="5eae986fb325d159eedba81e1173738597048ac8b3ac171d6cd03bd7bfb398d1" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="libp2p-2.2.7.pom">
-            <sha256 value="91ddb2a384207b401efa0d68b84f06ff9151fce8843e1ece3e5cf63875c1cd84" origin="Generated by Gradle"/>
+         <artifact name="libp2p-2.2.6.pom">
+            <sha256 value="6481cca729eee0f9ed796d3db601e890452eb0ed94d2f70bdb33ccd1816ae17d" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.github.tronprotocol" name="zksnark-java-sdk" version="1.0.0">
@@ -1039,22 +1039,6 @@
             <sha256 value="22b49f09ab47f5bc6a6d1a572692b373f0647236877b1030f0eb52e8ee678258" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.netty" name="netty-transport-classes-epoll" version="4.1.124.Final">
-         <artifact name="netty-transport-classes-epoll-4.1.124.Final.jar">
-            <sha256 value="a098c9a095961c8b118f9352bf23c443e0de7c53db2afa0db189d703aed53ef8" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="netty-transport-classes-epoll-4.1.124.Final.pom">
-            <sha256 value="32af1974d8b0f6d28112e056fb75e7365c89f3a19a9abdae5cc1caed99028f42" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="io.netty" name="netty-transport-native-epoll" version="4.1.124.Final">
-         <artifact name="netty-transport-native-epoll-4.1.124.Final-linux-aarch_64.jar">
-            <sha256 value="89e18fd1c2025467229c20bbca28c79e52eefb2ac5d6ce6d32641293c37e5e56" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="netty-transport-native-epoll-4.1.124.Final.pom">
-            <sha256 value="2508cebd61c7c25d2d50c95e8ebffad8f81f52baff6185a0a45d198dd8b2606e" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="io.netty" name="netty-transport-native-unix-common" version="4.1.124.Final">
          <artifact name="netty-transport-native-unix-common-4.1.124.Final.jar">
             <sha256 value="5b824b485345d3eb4f29bd96005fe71d4bdcda3e4453a834fd58f7e113346115" origin="Generated by Gradle"/>

protocol/build.gradle

@@ -3,7 +3,6 @@ apply plugin: 'com.google.protobuf'
 def protobufVersion = '3.25.8'
 def grpcVersion = '1.75.0'
 def protocGenVersion = '1.60.0' // https://github.com/grpc/grpc-java/pull/11371 , 1.64.x is not supported CentOS 7.
-def nettyVersion = '4.1.124.Final' // Match the Netty version used by grpc-netty 1.75.0
 
 dependencies {
     api group: 'com.google.protobuf', name: 'protobuf-java', version: protobufVersion
@@ -20,15 +19,6 @@ dependencies {
 
     // end google grpc
 
-    // Add Epoll support for ARM64 Linux only
-    if (System.getProperty("os.name").toLowerCase().contains("linux")) {
-        def arch = System.getProperty("os.arch").toLowerCase()
-        if (arch.contains("aarch") || arch.contains("arm")) {
-            api group: 'io.netty', name: 'netty-transport-native-epoll', 
-                version: nettyVersion, classifier: 'linux-aarch_64'
-        }
-    }
-
     api group: 'com.google.api.grpc', name: 'proto-google-common-protos', version: '2.15.0'
 }