From c71eae513b80b4a5ef933bd0bd2cd11d6dde84c6 Mon Sep 17 00:00:00 2001
From: candy <35629966+candyaaa@users.noreply.github.com>
Date: Mon, 13 Sep 2021 00:04:27 +0800
Subject: [PATCH 1/2] [master] DefaultFuture turn off logging optimization for
Channel(issue #8695) (#8778)
(cherry picked from commit 2f93930c83ff576ef65d008d03325482a695a319)
---
.../dubbo/remoting/exchange/Request.java | 19 +++++++++++++++++++
.../exchange/support/DefaultFuture.java | 9 ++-------
2 files changed, 21 insertions(+), 7 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 2e08e8ffb55..07dd67286c2 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
@@ -127,6 +127,25 @@ public void setHeartbeat(boolean isHeartbeat) {
}
}
+ public Request copy() {
+ Request copy = new Request(mId);
+ copy.mVersion = this.mVersion;
+ copy.mTwoWay = this.mTwoWay;
+ copy.mEvent = this.mEvent;
+ copy.mBroken = this.mBroken;
+ copy.mData = this.mData;
+ return copy;
+ }
+
+ public Request copyWithoutData() {
+ Request copy = new Request(mId);
+ copy.mVersion = this.mVersion;
+ copy.mTwoWay = this.mTwoWay;
+ copy.mEvent = this.mEvent;
+ copy.mBroken = this.mBroken;
+ return copy;
+ }
+
@Override
public String toString() {
return "Request [id=" + mId + ", version=" + mVersion + ", twoway=" + mTwoWay + ", event=" + mEvent
diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/DefaultFuture.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/DefaultFuture.java
index e5acf6d54ea..7d4ad69f521 100644
--- a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/DefaultFuture.java
+++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/DefaultFuture.java
@@ -152,7 +152,7 @@ public static void closeChannel(Channel channel) {
disconnectResponse.setErrorMessage("Channel " +
channel +
" is inactive. Directly return the unFinished request : " +
- future.getRequest());
+ (logger.isDebugEnabled() ? future.getRequest() : future.getRequest().copyWithoutData()));
DefaultFuture.received(channel, disconnectResponse);
}
}
@@ -256,15 +256,10 @@ private String getTimeoutMessage(boolean scan) {
+ (sent > 0 ? " client elapsed: " + (sent - start)
+ " ms, server elapsed: " + (nowTimestamp - sent)
: " elapsed: " + (nowTimestamp - start)) + " ms, timeout: "
- + timeout + " ms, request: " + (logger.isDebugEnabled() ? request : getRequestWithoutData()) + ", channel: " + channel.getLocalAddress()
+ + timeout + " ms, request: " + (logger.isDebugEnabled() ? request : request.copyWithoutData()) + ", channel: " + channel.getLocalAddress()
+ " -> " + channel.getRemoteAddress();
}
- private Request getRequestWithoutData() {
- Request newRequest = request;
- newRequest.setData(null);
- return newRequest;
- }
private static class TimeoutCheckTask implements TimerTask {
From 846c20036129a65152702430ef334a39c91e689d Mon Sep 17 00:00:00 2001
From: "guo.lin" <846271633@qq.com>
Date: Thu, 16 Sep 2021 13:07:23 +0800
Subject: [PATCH 2/2] update version to 2.7.7-ctrip.11.
---
dubbo-dependencies-bom/pom.xml | 2 +-
dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml | 2 +-
pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index b88be6c8149..91d03a83af7 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -163,7 +163,7 @@
6.1.26
2.0
1.1.0
- 2.7.7-ctrip.10
+ 2.7.7-ctrip.11
diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
index 86bb5f04821..2ff69a3bb2f 100644
--- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
+++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
@@ -32,7 +32,7 @@
pom
- 2.7.7-ctrip.10
+ 2.7.7-ctrip.11
1.1.0
diff --git a/pom.xml b/pom.xml
index d6aa2ada277..6ff0a6f7371 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
true
true
- 2.7.7-ctrip.10
+ 2.7.7-ctrip.11