Skip to content

Commit ed08ffa

Browse files
taigetaige
committedAug 8, 2017
FIX_graceful_shutdown
·
dubbo-2.5.4.1-pp
1 parent 529f26b commit ed08ffa

File tree

5 files changed

+111
-89
lines changed

5 files changed

+111
-89
lines changed
 

‎dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchangeChannel.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
* ExchangeReceiver
3636
*
3737
* @author william.liangf
38+
* modify by wuhongqiang for graceful close work well
3839
*/
3940
final class HeaderExchangeChannel implements ExchangeChannel {
4041

@@ -137,7 +138,10 @@ public void close(int timeout) {
137138
closed = true;
138139
if (timeout > 0) {
139140
long start = System.currentTimeMillis();
140-
while (DefaultFuture.hasFuture(HeaderExchangeChannel.this)
141+
//while (DefaultFuture.hasFuture(HeaderExchangeChannel.this)
142+
//modify by wuhongqiang 2014.4.16
143+
//DefaultFuture 实例化时传入的是channel，而非HeaderExchangeChannel.this (参见111行)
144+
while (DefaultFuture.hasFuture(channel)
141145
&& System.currentTimeMillis() - start < timeout) {
142146
try {
143147
Thread.sleep(10);

‎dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractServer.java

+55-53
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,47 @@
1-
/*
2-
* Copyright 1999-2011 Alibaba Group.
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*/
1+
/*
2+
* Copyright 1999-2011 Alibaba Group.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
1616
package com.alibaba.dubbo.remoting.transport;
1717

18-
import java.net.InetSocketAddress;
19-
import java.util.Collection;
20-
import java.util.concurrent.ExecutorService;
21-
import java.util.concurrent.ThreadPoolExecutor;
22-
23-
import com.alibaba.dubbo.common.Constants;
24-
import com.alibaba.dubbo.common.URL;
25-
import com.alibaba.dubbo.common.logger.Logger;
26-
import com.alibaba.dubbo.common.logger.LoggerFactory;
27-
import com.alibaba.dubbo.common.utils.ExecutorUtil;
28-
import com.alibaba.dubbo.common.utils.NetUtils;
29-
import com.alibaba.dubbo.remoting.Channel;
30-
import com.alibaba.dubbo.remoting.ChannelHandler;
31-
import com.alibaba.dubbo.remoting.RemotingException;
32-
import com.alibaba.dubbo.remoting.Server;
33-
import com.alibaba.dubbo.remoting.transport.dispatcher.WrappedChannelHandler;
18+
import java.net.InetSocketAddress;
19+
import java.util.Collection;
20+
import java.util.concurrent.ExecutorService;
21+
import java.util.concurrent.ThreadPoolExecutor;
22+
23+
import com.alibaba.dubbo.common.Constants;
24+
import com.alibaba.dubbo.common.URL;
25+
import com.alibaba.dubbo.common.extension.ExtensionLoader;
26+
import com.alibaba.dubbo.common.logger.Logger;
27+
import com.alibaba.dubbo.common.logger.LoggerFactory;
28+
import com.alibaba.dubbo.common.store.DataStore;
29+
import com.alibaba.dubbo.common.utils.ExecutorUtil;
30+
import com.alibaba.dubbo.common.utils.NetUtils;
31+
import com.alibaba.dubbo.remoting.Channel;
32+
import com.alibaba.dubbo.remoting.ChannelHandler;
33+
import com.alibaba.dubbo.remoting.RemotingException;
34+
import com.alibaba.dubbo.remoting.Server;
3435

3536
/**
3637
* AbstractServer
3738
*
3839
* @author qian.lei
3940
* @author ding.lid
4041
*/
41-
public abstract class AbstractServer extends AbstractEndpoint implements Server {
42-
43-
private static final Logger logger = LoggerFactory.getLogger(AbstractServer.class);
42+
public abstract class AbstractServer extends AbstractEndpoint implements Server {
43+
44+
private static final Logger logger = LoggerFactory.getLogger(AbstractServer.class);
4445

4546
private InetSocketAddress localAddress;
4647

@@ -56,25 +57,26 @@ public abstract class AbstractServer extends AbstractEndpoint implements Server
5657

5758
public AbstractServer(URL url, ChannelHandler handler) throws RemotingException {
5859
super(url, handler);
59-
localAddress = getUrl().toInetSocketAddress();
60-
String host = url.getParameter(Constants.ANYHOST_KEY, false)
60+
localAddress = getUrl().toInetSocketAddress();
61+
String host = url.getParameter(Constants.ANYHOST_KEY, false)
6162
|| NetUtils.isInvalidLocalHost(getUrl().getHost())
6263
? NetUtils.ANYHOST : getUrl().getHost();
6364
bindAddress = new InetSocketAddress(host, getUrl().getPort());
64-
this.accepts = url.getParameter(Constants.ACCEPTS_KEY, Constants.DEFAULT_ACCEPTS);
65-
this.idleTimeout = url.getParameter(Constants.IDLE_TIMEOUT_KEY, Constants.DEFAULT_IDLE_TIMEOUT);
65+
this.accepts = url.getParameter(Constants.ACCEPTS_KEY, Constants.DEFAULT_ACCEPTS);
66+
this.idleTimeout = url.getParameter(Constants.IDLE_TIMEOUT_KEY, Constants.DEFAULT_IDLE_TIMEOUT);
6667
try {
6768
doOpen();
6869
if (logger.isInfoEnabled()) {
6970
logger.info("Start " + getClass().getSimpleName() + " bind " + getBindAddress() + ", export " + getLocalAddress());
7071
}
7172
} catch (Throwable t) {
72-
throw new RemotingException(url.toInetSocketAddress(), null, "Failed to bind " + getClass().getSimpleName()
73+
throw new RemotingException(url.toInetSocketAddress(), null, "Failed to bind " + getClass().getSimpleName()
7374
+ " on " + getLocalAddress() + ", cause: " + t.getMessage(), t);
7475
}
75-
if (handler instanceof WrappedChannelHandler ){
76-
executor = ((WrappedChannelHandler)handler).getExecutor();
77-
}
76+
// fix 服务销毁时，线程池资源没有释放 且 graceful shutdown NOT work by (wuhongqiang copy from) wuwen5 <wuwen.55@gmail.com>
77+
executor = (ExecutorService) ExtensionLoader.getExtensionLoader(DataStore.class)
78+
.getDefaultExtension().get(Constants.EXECUTOR_SERVICE_COMPONENT_KEY, Integer.toString(url.getPort()));
79+
7880
}
7981

8082
protected abstract void doOpen() throws Throwable;
@@ -87,7 +89,7 @@ public void reset(URL url) {
8789
}
8890
try {
8991
if (url.hasParameter(Constants.ACCEPTS_KEY)) {
90-
int a = url.getParameter(Constants.ACCEPTS_KEY, 0);
92+
int a = url.getParameter(Constants.ACCEPTS_KEY, 0);
9193
if (a > 0) {
9294
this.accepts = a;
9395
}
@@ -97,7 +99,7 @@ public void reset(URL url) {
9799
}
98100
try {
99101
if (url.hasParameter(Constants.IDLE_TIMEOUT_KEY)) {
100-
int t = url.getParameter(Constants.IDLE_TIMEOUT_KEY, 0);
102+
int t = url.getParameter(Constants.IDLE_TIMEOUT_KEY, 0);
101103
if (t > 0) {
102104
this.idleTimeout = t;
103105
}
@@ -109,7 +111,7 @@ public void reset(URL url) {
109111
if (url.hasParameter(Constants.THREADS_KEY)
110112
&& executor instanceof ThreadPoolExecutor && !executor.isShutdown()) {
111113
ThreadPoolExecutor threadPoolExecutor = (ThreadPoolExecutor) executor;
112-
int threads = url.getParameter(Constants.THREADS_KEY, 0);
114+
int threads = url.getParameter(Constants.THREADS_KEY, 0);
113115
int max = threadPoolExecutor.getMaximumPoolSize();
114116
int core = threadPoolExecutor.getCorePoolSize();
115117
if (threads > 0 && (threads != max || threads != core)) {
@@ -135,16 +137,16 @@ public void reset(URL url) {
135137
public void send(Object message, boolean sent) throws RemotingException {
136138
Collection<Channel> channels = getChannels();
137139
for (Channel channel : channels) {
138-
if (channel.isConnected()) {
139-
channel.send(message, sent);
140+
if (channel.isConnected()) {
141+
channel.send(message, sent);
140142
}
141143
}
142-
}
143-
144-
public void close() {
145-
if (logger.isInfoEnabled()) {
146-
logger.info("Close " + getClass().getSimpleName() + " bind " + getBindAddress() + ", export " + getLocalAddress());
147-
}
144+
}
145+
146+
public void close() {
147+
if (logger.isInfoEnabled()) {
148+
logger.info("Close " + getClass().getSimpleName() + " bind " + getBindAddress() + ", export " + getLocalAddress());
149+
}
148150
ExecutorUtil.shutdownNow(executor ,100);
149151
try {
150152
super.close();

‎dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyChannel.java

+33-21
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
/*
2-
* Copyright 1999-2011 Alibaba Group.
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*/
1+
/*
2+
* Copyright 1999-2011 Alibaba Group.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
1616
package com.alibaba.dubbo.remoting.transport.netty;
1717

1818
import java.net.InetSocketAddress;
@@ -35,6 +35,7 @@
3535
*
3636
* @author qian.lei
3737
* @author william.liangf
38+
* modify by wuhongqiang
3839
*/
3940
final class NettyChannel extends AbstractChannel {
4041

@@ -46,6 +47,9 @@ final class NettyChannel extends AbstractChannel {
4647

4748
private final Map<String, Object> attributes = new ConcurrentHashMap<String, Object>();
4849

50+
//add by wuhongqiang 2014.4.16
51+
private volatile ChannelFuture lastChannelFuture;
52+
4953
private NettyChannel(org.jboss.netty.channel.Channel channel, URL url, ChannelHandler handler){
5054
super(url, handler);
5155
if (channel == null) {
@@ -96,19 +100,22 @@ public void send(Object message, boolean sent) throws RemotingException {
96100
int timeout = 0;
97101
try {
98102
ChannelFuture future = channel.write(message);
103+
//add by wuhongqiang 2014.4.16
104+
//记录最后一个write的future，在close时判断write是否done，否则有可能丢失该message
105+
lastChannelFuture = future;
99106
if (sent) {
100107
timeout = getUrl().getPositiveParameter(Constants.TIMEOUT_KEY, Constants.DEFAULT_TIMEOUT);
101-
success = future.await(timeout);
102-
}
103-
Throwable cause = future.getCause();
104-
if (cause != null) {
105-
throw cause;
108+
success = future.await(timeout);
109+
}
110+
Throwable cause = future.getCause();
111+
if (cause != null) {
112+
throw cause;
106113
}
107114
} catch (Throwable e) {
108115
throw new RemotingException(this, "Failed to send message " + message + " to " + getRemoteAddress() + ", cause: " + e.getMessage(), e);
109116
}
110117

111-
if(! success) {
118+
if(! success) {
112119
throw new RemotingException(this, "Failed to send message " + message + " to " + getRemoteAddress()
113120
+ "in timeout(" + timeout + "ms) limit");
114121
}
@@ -134,6 +141,11 @@ public void close() {
134141
if (logger.isInfoEnabled()) {
135142
logger.info("Close netty channel " + channel);
136143
}
144+
//add by wuhongqiang 2014.4.16
145+
//等待最后一个write事件完成才close channel，否则有可能丢失该write的message
146+
if (lastChannelFuture != null) {
147+
lastChannelFuture.await(getUrl().getPositiveParameter(Constants.TIMEOUT_KEY, Constants.DEFAULT_TIMEOUT));
148+
}
137149
channel.close();
138150
} catch (Exception e) {
139151
logger.warn(e.getMessage(), e);

‎dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractProtocol.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void destroy() {
8383
}
8484
}
8585
@SuppressWarnings("deprecation")
86-
protected static int getServerShutdownTimeout() {
86+
public static int getServerShutdownTimeout() { // protected to public, by wuhonqiang
8787
int timeout = Constants.DEFAULT_SERVER_SHUTDOWN_TIMEOUT;
8888
String value = ConfigUtils.getProperty(Constants.SHUTDOWN_WAIT_KEY);
8989
if (value != null && value.length() > 0) {

‎dubbo-rpc/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClient.java

+17-13
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.alibaba.dubbo.rpc.protocol.dubbo;
17-
16+
package com.alibaba.dubbo.rpc.protocol.dubbo;
17+
1818
import java.net.InetSocketAddress;
1919
import java.util.concurrent.ConcurrentMap;
2020
import java.util.concurrent.atomic.AtomicInteger;
@@ -27,15 +27,17 @@
2727
import com.alibaba.dubbo.remoting.exchange.ExchangeClient;
2828
import com.alibaba.dubbo.remoting.exchange.ExchangeHandler;
2929
import com.alibaba.dubbo.remoting.exchange.ResponseFuture;
30-
31-
/**
32-
* dubbo protocol support class.
33-
*
34-
* @author chao.liuc
35-
*/
30+
import com.alibaba.dubbo.rpc.protocol.AbstractProtocol;
31+
32+
/**
33+
* dubbo protocol support class.
34+
*
35+
* @author chao.liuc
36+
* modify by wuhongqiang for graceful shutdown work well
37+
*/
3638
@SuppressWarnings("deprecation")
37-
final class ReferenceCountExchangeClient implements ExchangeClient {
38-
39+
final class ReferenceCountExchangeClient implements ExchangeClient {
40+
3941
private ExchangeClient client;
4042

4143
private final URL url;
@@ -55,8 +57,8 @@ public ReferenceCountExchangeClient(ExchangeClient client, ConcurrentMap<String,
5557
throw new IllegalStateException("ghostClientMap can not be null, url: " + url);
5658
}
5759
this.ghostClientMap = ghostClientMap;
58-
}
59-
60+
}
61+
6062
public void reset(URL url) {
6163
client.reset(url);
6264
}
@@ -128,7 +130,9 @@ public void removeAttribute(String key) {
128130
* close方法将不再幂等,调用需要注意.
129131
*/
130132
public void close() {
131-
close(0);
133+
//modify by wuhongqiang 2014.4.16
134+
//默认设置close超时时间，否则没法真正实现graceful shutdown
135+
close(AbstractProtocol.getServerShutdownTimeout());
132136
}
133137

134138
public void close(int timeout) {

0 commit comments

Comments
 (0)
Please sign in to comment.