optimize: fast fail when channel is null (#7075)

apache · Dec 26, 2024 · c0a2e92 · c0a2e92
1 parent 340ea92
commit c0a2e92
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
@@ -14,6 +14,7 @@ Add changes here for all PR submitted to the 2.x branch.
 
 - [[#6828](https://github.com/apache/incubator-seata/pull/6828)] spring boot compatible with file.conf and registry.conf
 - [[#7012](https://github.com/apache/incubator-seata/pull/7012)] When the number of primary keys exceeds 1000, use union to concatenate the SQL
+- [[#7075](https://github.com/apache/incubator-seata/pull/7075)] fast fail when channel is null
 
 ### security:
 

diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
@@ -14,6 +14,7 @@
 
 - [[#6828](https://github.com/apache/incubator-seata/pull/6828)] seata-spring-boot-starter兼容file.conf和registry.conf
 - [[#7012](https://github.com/apache/incubator-seata/pull/7012)] 当主键超过1000个时，使用union拼接sql，可以使用索引
+- [[#7075](https://github.com/apache/incubator-seata/pull/7075)] 当channel为空时，快速失败，以便于减少不必要的等待
 
 ### security:
 

diff --git a/core/src/main/java/org/apache/seata/core/rpc/netty/AbstractNettyRemotingClient.java b/core/src/main/java/org/apache/seata/core/rpc/netty/AbstractNettyRemotingClient.java
@@ -200,7 +200,7 @@ public Object sendSyncRequest(Channel channel, Object msg) throws TimeoutExcepti
     public void sendAsyncRequest(Channel channel, Object msg) {
         if (channel == null) {
             LOGGER.warn("sendAsyncRequest nothing, caused by null channel.");
-            return;
+            throw new FrameworkException(new Throwable("throw"), "frameworkException", FrameworkErrorCode.ChannelIsNotWritable);
         }
         RpcMessage rpcMessage = buildRequestMessage(msg, msg instanceof HeartbeatMessage
             ? ProtocolConstants.MSGTYPE_HEARTBEAT_REQUEST

diff --git a/core/src/test/java/org/apache/seata/core/rpc/netty/RmNettyClientTest.java b/core/src/test/java/org/apache/seata/core/rpc/netty/RmNettyClientTest.java
@@ -26,6 +26,7 @@
 import org.apache.seata.config.ConfigurationCache;
 import org.apache.seata.core.model.Resource;
 import org.apache.seata.core.model.ResourceManager;
+import org.apache.seata.core.protocol.HeartbeatMessage;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
@@ -37,6 +38,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  * Rm RPC client test.
@@ -96,4 +98,13 @@ private AtomicBoolean getInitializeStatus(final RmNettyRemotingClient rmNettyRem
             throw new RuntimeException(ex.getMessage());
         }
     }
+
+    @Test
+    public void testSendAsyncRequestWithNullChannelLogsWarning() {
+        RmNettyRemotingClient remotingClient = RmNettyRemotingClient.getInstance();
+        Object message = HeartbeatMessage.PING;
+        assertThrows(FrameworkException.class, () -> {
+            remotingClient.sendAsyncRequest(null, message);
+        });
+    }
 }