From 9ae97ea053dad758a0346a9acda4fbc8ea01429a Mon Sep 17 00:00:00 2001 From: Albumen Kevin Date: Thu, 6 Jul 2023 15:18:10 +0800 Subject: [PATCH 1/2] Enhance logs (#12682) --- .../java/org/apache/dubbo/common/serialize/ObjectInput.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/ObjectInput.java b/dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/ObjectInput.java index b63438f714..853334f925 100644 --- a/dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/ObjectInput.java +++ b/dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/ObjectInput.java @@ -73,7 +73,7 @@ public interface ObjectInput extends DataInput { default Throwable readThrowable() throws IOException, ClassNotFoundException { Object obj = readObject(); if (!(obj instanceof Throwable)) { - throw new IOException("Response data error, expect Throwable, but get " + obj); + throw new IOException("Response data error, expect Throwable, but get " + obj.getClass()); } return (Throwable) obj; } From f882cbdd80df0d92bdbe74ff70035b224e13172c Mon Sep 17 00:00:00 2001 From: Albumen Kevin Date: Thu, 6 Jul 2023 17:54:47 +0800 Subject: [PATCH 2/2] Use random id (#12663) * Use random id * Fix uts --- .../main/java/org/apache/dubbo/remoting/exchange/Request.java | 3 ++- .../java/org/apache/dubbo/remoting/exchange/RequestTest.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/Request.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/Request.java index d75a21a323..c243258a24 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/Request.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/Request.java @@ -18,6 +18,7 @@ package org.apache.dubbo.remoting.exchange; import org.apache.dubbo.common.utils.StringUtils; +import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.atomic.AtomicLong; import static org.apache.dubbo.common.constants.CommonConstants.HEARTBEAT_EVENT; @@ -27,7 +28,7 @@ import static org.apache.dubbo.common.constants.CommonConstants.HEARTBEAT_EVENT; */ public class Request { - private static final AtomicLong INVOKE_ID = new AtomicLong(0); + private static final AtomicLong INVOKE_ID = new AtomicLong(ThreadLocalRandom.current().nextLong()); private final long mId; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/exchange/RequestTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/exchange/RequestTest.java index f0a8988ee7..d358ffaa4c 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/exchange/RequestTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/exchange/RequestTest.java @@ -23,6 +23,8 @@ class RequestTest { @Test void test() { + Request requestStart = new Request(); + Request request = new Request(); request.setTwoWay(true); request.setBroken(true); @@ -35,7 +37,7 @@ class RequestTest { Assertions.assertTrue(request.isEvent()); Assertions.assertEquals(request.getVersion(), "1.0.0"); Assertions.assertEquals(request.getData(), "data"); - Assertions.assertTrue(request.getId() >= 0); + Assertions.assertEquals(requestStart.getId() + 1, request.getId()); request.setHeartbeat(true); Assertions.assertTrue(request.isHeartbeat());