Skip to content

NioServer: retain links by address string to minimize resource leak #3525

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

Merged
yadvr merged 1 commit into from
Oct 22, 2019
Merged

NioServer: retain links by address string to minimize resource leak #3525

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion utils/src/main/java/com/cloud/utils/nio/Link.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ private static HandshakeHolder doHandshakeUnwrap(final SocketChannel socketChann
try {
sslEngine.closeInbound();
} catch (SSLException e) {
s_logger.warn("This SSL engine was forced to close inbound due to end of stream.");
s_logger.warn("This SSL engine was forced to close inbound due to end of stream.", e);
}
sslEngine.closeOutbound();
// After closeOutbound the engine will be set to WRAP state,
Expand Down
13 changes: 7 additions & 6 deletions utils/src/main/java/com/cloud/utils/nio/NioServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.nio.channels.SelectionKey;
import java.nio.channels.ServerSocketChannel;
import java.nio.channels.spi.SelectorProvider;
import java.util.Map;
import java.util.WeakHashMap;

import org.apache.cloudstack.framework.ca.CAService;
Expand All @@ -36,13 +37,13 @@ public class NioServer extends NioConnection {
protected InetSocketAddress _localAddr;
private ServerSocketChannel _serverSocket;

protected WeakHashMap<InetSocketAddress, Link> _links;
protected Map<String, Link> _links;

public NioServer(final String name, final int port, final int workers, final HandlerFactory factory, final CAService caService) {
super(name, port, workers, factory);
setCAService(caService);
_localAddr = null;
_links = new WeakHashMap<InetSocketAddress, Link>(1024);
_links = new WeakHashMap<String, Link>(10240);
}

public int getPort() {
Expand All @@ -61,7 +62,7 @@ protected void init() throws IOException {

_serverSocket.register(_selector, SelectionKey.OP_ACCEPT, null);

s_logger.info("NioConnection started and listening on " + _serverSocket.socket().getLocalSocketAddress());
s_logger.info("NioServer started and listening on " + _serverSocket.socket().getLocalSocketAddress());
}

@Override
Expand All @@ -75,12 +76,12 @@ public void cleanUp() throws IOException {

@Override
protected void registerLink(final InetSocketAddress addr, final Link link) {
_links.put(addr, link);
_links.put(addr.getAddress().toString(), link);
}

@Override
protected void unregisterLink(final InetSocketAddress saddr) {
_links.remove(saddr);
_links.remove(saddr.getAddress().toString());
}

/**
Expand All @@ -93,7 +94,7 @@ protected void unregisterLink(final InetSocketAddress saddr) {
* @return null if not sent. attach object in link if sent.
*/
public Object send(final InetSocketAddress saddr, final byte[] data) throws ClosedChannelException {
final Link link = _links.get(saddr);
final Link link = _links.get(saddr.getAddress().toString());
if (link == null) {
return null;
}
Expand Down