Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[master] DefaultFuture turn off logging optimization for Channel(issue #8695) #8778

Merged
merged 1 commit into from Sep 12, 2021
Merged

[master] DefaultFuture turn off logging optimization for Channel(issue #8695) #8778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions ...remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/Request.java
View file
Open in desktop
Expand Up @@ -137,6 +137,15 @@ public Request copy() {
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
Expand Down
9 changes: 2 additions & 7 deletions ...-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/DefaultFuture.java
View file
Open in desktop
Expand Up @@ -147,7 +147,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);
}
}
Expand Down Expand Up @@ -251,15 +251,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.copy();
newRequest.setData(null);
return newRequest;
}

private static class TimeoutCheckTask implements TimerTask {

Expand Down