This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 48ac1bf Support timeout intercept on provider side (#7851)
48ac1bf is described below
commit 48ac1bf177ba710e70a565e8fcbbc1495d8b1f7f
Author: 张志勇 <[email protected]>
AuthorDate: Mon May 24 23:15:24 2021 +0800
Support timeout intercept on provider side (#7851)
---
.../dispatcher/all2/AllChannelHandler2.java | 74 ++++++++++++++++++++++
.../transport/dispatcher/all2/AllDispatcher2.java | 32 ++++++++++
.../internal/org.apache.dubbo.remoting.Dispatcher | 1 +
3 files changed, 107 insertions(+)
diff --git
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/all2/AllChannelHandler2.java
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/all2/AllChannelHandler2.java
new file mode 100644
index 0000000..17ff9eb
--- /dev/null
+++
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/all2/AllChannelHandler2.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.remoting.transport.dispatcher.all2;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.timer.HashedWheelTimer;
+import org.apache.dubbo.common.timer.Timer;
+import org.apache.dubbo.common.utils.NamedThreadFactory;
+import org.apache.dubbo.remoting.Channel;
+import org.apache.dubbo.remoting.ChannelHandler;
+import org.apache.dubbo.remoting.ExecutionException;
+import org.apache.dubbo.remoting.RemotingException;
+import org.apache.dubbo.remoting.exchange.Request;
+import org.apache.dubbo.remoting.transport.dispatcher.ChannelEventRunnable;
+import
org.apache.dubbo.remoting.transport.dispatcher.ChannelEventRunnable.ChannelState;
+import org.apache.dubbo.remoting.transport.dispatcher.all.AllChannelHandler;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.TimeUnit;
+
+public class AllChannelHandler2 extends AllChannelHandler {
+
+ public static final Timer TIME_OUT_TIMER = new HashedWheelTimer(
+ new NamedThreadFactory("dubbo-server-future-timeout", true),
+ 30,
+ TimeUnit.MILLISECONDS);
+
+ public AllChannelHandler2(ChannelHandler handler, URL url) {
+ super(handler, url);
+ }
+
+
+ @Override
+ public void received(Channel channel, Object message) throws
RemotingException {
+ ExecutorService executor = getPreferredExecutorService(message);
+ try {
+ Future<?> future = executor.submit(new
ChannelEventRunnable(channel, handler, ChannelState.RECEIVED, message));
+ long timeout = this.url.getParameter("timeout", 1000) + 90;
+ TIME_OUT_TIMER.newTimeout(t -> {
+ if (!future.isDone() && (!future.isCancelled())) {
+ try {
+ future.cancel(true);
+ } catch (Throwable ex) {
+ //ignore
+ }
+ }
+ }, timeout, TimeUnit.MILLISECONDS);
+
+ } catch (Throwable t) {
+ if (message instanceof Request && t instanceof
RejectedExecutionException) {
+ sendFeedback(channel, (Request) message, t);
+ return;
+ }
+ throw new ExecutionException(message, channel, getClass() + "
error when process received event .", t);
+ }
+ }
+
+}
diff --git
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/all2/AllDispatcher2.java
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/all2/AllDispatcher2.java
new file mode 100644
index 0000000..3da54f6
--- /dev/null
+++
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/all2/AllDispatcher2.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.remoting.transport.dispatcher.all2;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.remoting.ChannelHandler;
+import org.apache.dubbo.remoting.Dispatcher;
+
+public class AllDispatcher2 implements Dispatcher {
+
+ public static final String NAME = "all2";
+
+ @Override
+ public ChannelHandler dispatch(ChannelHandler handler, URL url) {
+ return new AllChannelHandler2(handler, url);
+ }
+
+}
diff --git
a/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Dispatcher
b/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Dispatcher
index 052fb2b..9f17981 100644
---
a/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Dispatcher
+++
b/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Dispatcher
@@ -1,4 +1,5 @@
all=org.apache.dubbo.remoting.transport.dispatcher.all.AllDispatcher
+all2=org.apache.dubbo.remoting.transport.dispatcher.all2.AllDispatcher2
direct=org.apache.dubbo.remoting.transport.dispatcher.direct.DirectDispatcher
message=org.apache.dubbo.remoting.transport.dispatcher.message.MessageOnlyDispatcher
execution=org.apache.dubbo.remoting.transport.dispatcher.execution.ExecutionDispatcher
