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

optimze TimeTask in DefaultFuture #4132

Merged
merged 4 commits into from
May 23, 2019
Merged

optimze TimeTask in DefaultFuture #4132

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
764b727
optimze TimeTask in DefaultFuture
chickenlj May 23, 2019
95b8c8e
check future is not null
chickenlj May 23, 2019
6f8d442
check future is null
chickenlj May 23, 2019
75898ca
change if condition from && to ||
chickenlj May 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions ...-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/DefaultFuture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ public class DefaultFuture extends CompletableFuture<Object> {

private static final Map<Long, DefaultFuture> FUTURES = new ConcurrentHashMap<>();

// private static final Map<Long, Timeout> PENDING_TASKS = new ConcurrentHashMap<>();

public static final Timer TIME_OUT_TIMER = new HashedWheelTimer(
new NamedThreadFactory("dubbo-future-timeout", true),
30,
Expand All @@ -64,6 +62,7 @@ public class DefaultFuture extends CompletableFuture<Object> {
private final int timeout;
private final long start = System.currentTimeMillis();
private volatile long sent;
private Timeout timeoutCheckTask;

private ExecutorService executor;

Expand All @@ -85,6 +84,14 @@ private DefaultFuture(Channel channel, Request request, int timeout) {
CHANNELS.put(id, channel);
}

/**
* check time out of the future
*/
private static void timeoutCheck(DefaultFuture future) {
TimeoutCheckTask task = new TimeoutCheckTask(future.getId());
future.timeoutCheckTask = TIME_OUT_TIMER.newTimeout(task, future.getTimeout(), TimeUnit.MILLISECONDS);
}

/**
* init a DefaultFuture
* 1.init a DefaultFuture
Expand Down Expand Up @@ -142,15 +149,19 @@ public static void closeChannel(Channel channel) {
}

public static void received(Channel channel, Response response) {
received(channel, response, false);
}

public static void received(Channel channel, Response response, boolean timeout) {
try {
DefaultFuture future = FUTURES.remove(response.getId());
if (future != null) {
Timeout t = future.timeoutCheckTask;
if (!timeout) {
// decrease Time
t.cancel();
}
future.doReceived(response);
// Timeout t = PENDING_TASKS.remove(future.getId());
// if (t != null) {
// // decrease Time
// t.cancel();
// }
} else {
logger.warn("The timeout response finally returned at "
+ (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS").format(new Date()))
Expand Down Expand Up @@ -178,6 +189,7 @@ public void cancel() {
this.cancel(true);
}


private void doReceived(Response res) {
if (res == null) {
throw new IllegalStateException("response cannot be null");
Expand Down Expand Up @@ -224,15 +236,6 @@ private void doSent() {
sent = System.currentTimeMillis();
}

/**
* check time out of the future
*/
private static void timeoutCheck(DefaultFuture future) {
TimeoutCheckTask task = new TimeoutCheckTask(future.getId());
TIME_OUT_TIMER.newTimeout(task, future.getTimeout(), TimeUnit.MILLISECONDS);
// PENDING_TASKS.put(future.getId(), t);
}

private String getTimeoutMessage(boolean scan) {
long nowTimestamp = System.currentTimeMillis();
return (sent > 0 ? "Waiting server-side response timeout" : "Sending request timeout in client-side")
Expand All @@ -256,10 +259,7 @@ private static class TimeoutCheckTask implements TimerTask {

@Override
public void run(Timeout timeout) {
// remove from pending task
// PENDING_TASKS.remove(future.getId());

DefaultFuture future = FUTURES.remove(requestID);
DefaultFuture future = DefaultFuture.getFuture(requestID);
if (future == null || future.isDone()) {
return;
}
Expand All @@ -271,7 +271,7 @@ public void run(Timeout timeout) {
timeoutResponse.setStatus(future.isSent() ? Response.SERVER_TIMEOUT : Response.CLIENT_TIMEOUT);
timeoutResponse.setErrorMessage(future.getTimeoutMessage(true));
// handle response.
DefaultFuture.received(future.getChannel(), timeoutResponse);
DefaultFuture.received(future.getChannel(), timeoutResponse, true);
});
}
}
Expand Down