Skip to content

Commit 9258c7c

Browse files
committed
Revert "9ee129ae6a08935645734ad520bec72bf5f22217"
This reverts "9ee129ae6a08935645734ad520bec72bf5f22217" from #3525, as the solution is not optimal and would cause a single Link to be added in the Map if management server is behind a LB. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
1 parent 9ee129a commit 9258c7c

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

utils/src/main/java/com/cloud/utils/nio/NioServer.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.nio.channels.SelectionKey;
2626
import java.nio.channels.ServerSocketChannel;
2727
import java.nio.channels.spi.SelectorProvider;
28-
import java.util.Map;
2928
import java.util.WeakHashMap;
3029

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

40-
protected Map<String, Link> _links;
39+
protected WeakHashMap<InetSocketAddress, Link> _links;
4140

4241
public NioServer(final String name, final int port, final int workers, final HandlerFactory factory, final CAService caService) {
4342
super(name, port, workers, factory);
4443
setCAService(caService);
4544
_localAddr = null;
46-
_links = new WeakHashMap<String, Link>(10240);
45+
_links = new WeakHashMap<InetSocketAddress, Link>(1024);
4746
}
4847

4948
public int getPort() {
@@ -76,12 +75,12 @@ public void cleanUp() throws IOException {
7675

7776
@Override
7877
protected void registerLink(final InetSocketAddress addr, final Link link) {
79-
_links.put(addr.getAddress().toString(), link);
78+
_links.put(addr, link);
8079
}
8180

8281
@Override
8382
protected void unregisterLink(final InetSocketAddress saddr) {
84-
_links.remove(saddr.getAddress().toString());
83+
_links.remove(saddr);
8584
}
8685

8786
/**
@@ -94,7 +93,7 @@ protected void unregisterLink(final InetSocketAddress saddr) {
9493
* @return null if not sent. attach object in link if sent.
9594
*/
9695
public Object send(final InetSocketAddress saddr, final byte[] data) throws ClosedChannelException {
97-
final Link link = _links.get(saddr.getAddress().toString());
96+
final Link link = _links.get(saddr);
9897
if (link == null) {
9998
return null;
10099
}

0 commit comments

Comments
 (0)