alex-plekhanov commented on a change in pull request #8483:
URL: https://github.com/apache/ignite/pull/8483#discussion_r533187395
##########
File path:
modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpIgniteClient.java
##########
@@ -116,18 +117,23 @@ private TcpIgniteClient(ClientConfiguration cfg) throws
ClientException {
ch = new ReliableChannel(chFactory, cfg, binary);
- ch.channelsInit();
+ try {
+ ch.channelsInit();
- ch.addChannelFailListener(() -> metadataHandler.onReconnect());
+ ch.addChannelFailListener(() -> metadataHandler.onReconnect());
- transactions = new TcpClientTransactions(ch, marsh,
- new
ClientTransactionConfiguration(cfg.getTransactionConfiguration()));
+ transactions = new TcpClientTransactions(ch, marsh,
+ new
ClientTransactionConfiguration(cfg.getTransactionConfiguration()));
- cluster = new ClientClusterImpl(ch, marsh);
+ cluster = new ClientClusterImpl(ch, marsh);
- compute = new ClientComputeImpl(ch, marsh,
cluster.defaultClusterGroup());
+ compute = new ClientComputeImpl(ch, marsh,
cluster.defaultClusterGroup());
- services = new ClientServicesImpl(ch, marsh,
cluster.defaultClusterGroup());
+ services = new ClientServicesImpl(ch, marsh,
cluster.defaultClusterGroup());
+ } catch (Exception e) {
Review comment:
NL between `}` and `catch` according to code style
##########
File path:
modules/core/src/main/java/org/apache/ignite/internal/client/thin/io/gridnioserver/GridNioClientConnectionMultiplexer.java
##########
@@ -0,0 +1,143 @@
+/*
+ * 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.ignite.internal.client.thin.io.gridnioserver;
+
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.HashMap;
+import java.util.Map;
+import javax.net.ssl.SSLContext;
+
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.client.ClientConnectionException;
+import org.apache.ignite.configuration.ClientConfiguration;
+import org.apache.ignite.internal.client.thin.ClientSslUtils;
+import org.apache.ignite.internal.client.thin.io.ClientConnection;
+import org.apache.ignite.internal.client.thin.io.ClientConnectionMultiplexer;
+import org.apache.ignite.internal.client.thin.io.ClientConnectionStateHandler;
+import org.apache.ignite.internal.client.thin.io.ClientMessageHandler;
+import org.apache.ignite.internal.util.nio.GridNioCodecFilter;
+import org.apache.ignite.internal.util.nio.GridNioFilter;
+import org.apache.ignite.internal.util.nio.GridNioFuture;
+import org.apache.ignite.internal.util.nio.GridNioFutureImpl;
+import org.apache.ignite.internal.util.nio.GridNioServer;
+import org.apache.ignite.internal.util.nio.GridNioSession;
+import org.apache.ignite.internal.util.nio.ssl.GridNioSslFilter;
+import org.apache.ignite.logger.NullLogger;
+
+/**
+ * Client connection multiplexer based on {@link
org.apache.ignite.internal.util.nio.GridNioServer}.
+ */
+public class GridNioClientConnectionMultiplexer implements
ClientConnectionMultiplexer {
+ /** Worker thread prefix. */
+ private static final String THREAD_PREFIX = "thin-client-channel";
+
+ /** */
+ private static final int CLIENT_MODE_PORT = -1;
+
+ /** */
+ private final GridNioServer<ByteBuffer> srv;
+
+ /** */
+ private final SSLContext sslCtx;
+
+ /**
+ * Constructor.
+ *
+ * @param cfg Client config.
+ */
+ public GridNioClientConnectionMultiplexer(ClientConfiguration cfg) {
+ IgniteLogger gridLog = new NullLogger();
+
+ GridNioFilter[] filters;
+
+ GridNioFilter codecFilter = new GridNioCodecFilter(new
GridNioClientParser(), gridLog, false);
+
+ sslCtx = ClientSslUtils.getSslContext(cfg);
+
+ if (sslCtx != null) {
+ GridNioSslFilter sslFilter = new GridNioSslFilter(sslCtx, true,
ByteOrder.nativeOrder(), gridLog);
+ sslFilter.directMode(false);
+ filters = new GridNioFilter[]{codecFilter, sslFilter};
+ } else
+ filters = new GridNioFilter[]{codecFilter};
+
+ try {
+ srv = GridNioServer.<ByteBuffer>builder()
+ .port(CLIENT_MODE_PORT)
+ .listener(new GridNioClientListener())
+ .filters(filters)
+ .logger(gridLog)
+ .selectorCount(1) // Using more selectors does not seem to
improve performance.
+ .byteOrder(ByteOrder.nativeOrder())
+ .directBuffer(true)
+ .directMode(false)
+ .igniteInstanceName("thinClient")
+ .serverName(THREAD_PREFIX)
+ .idleTimeout(Long.MAX_VALUE)
+ .socketReceiveBufferSize(cfg.getReceiveBufferSize())
+ .socketSendBufferSize(cfg.getSendBufferSize())
+ .tcpNoDelay(true)
+ .build();
+ } catch (IgniteCheckedException e) {
+ throw new IgniteException(e);
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public void start() {
+ srv.start();
+ }
+
+ /** {@inheritDoc} */
+ @Override public void stop() {
+ srv.stop();
+ }
+
+ /** {@inheritDoc} */
+ @Override public ClientConnection open(InetSocketAddress addr,
+ ClientMessageHandler msgHnd,
+ ClientConnectionStateHandler
stateHnd)
+ throws ClientConnectionException {
+ try {
+ java.nio.channels.SocketChannel ch =
java.nio.channels.SocketChannel.open();
+ ch.socket().connect(new InetSocketAddress(addr.getHostName(),
addr.getPort()), Integer.MAX_VALUE);
+
+ Map<Integer, Object> meta = new HashMap<>();
+ GridNioFuture<?> sslHandshakeFut = null;
+
+ if (sslCtx != null) {
+ sslHandshakeFut = new GridNioFutureImpl<>(null);
+
+ meta.put(GridNioSslFilter.HANDSHAKE_FUT_META_KEY,
sslHandshakeFut);
+ }
+
+ GridNioSession ses = srv.createSession(ch, meta, false,
null).get();
+
+ if (sslHandshakeFut != null)
+ sslHandshakeFut.get();
+
+ return new GridNioClientConnection(ses, msgHnd, stateHnd);
+ } catch (Exception e) {
Review comment:
NL between `}` and `catch` according to code style
##########
File path:
modules/core/src/main/java/org/apache/ignite/internal/client/thin/io/gridnioserver/GridNioClientConnectionMultiplexer.java
##########
@@ -0,0 +1,143 @@
+/*
+ * 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.ignite.internal.client.thin.io.gridnioserver;
+
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.HashMap;
+import java.util.Map;
+import javax.net.ssl.SSLContext;
+
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.client.ClientConnectionException;
+import org.apache.ignite.configuration.ClientConfiguration;
+import org.apache.ignite.internal.client.thin.ClientSslUtils;
+import org.apache.ignite.internal.client.thin.io.ClientConnection;
+import org.apache.ignite.internal.client.thin.io.ClientConnectionMultiplexer;
+import org.apache.ignite.internal.client.thin.io.ClientConnectionStateHandler;
+import org.apache.ignite.internal.client.thin.io.ClientMessageHandler;
+import org.apache.ignite.internal.util.nio.GridNioCodecFilter;
+import org.apache.ignite.internal.util.nio.GridNioFilter;
+import org.apache.ignite.internal.util.nio.GridNioFuture;
+import org.apache.ignite.internal.util.nio.GridNioFutureImpl;
+import org.apache.ignite.internal.util.nio.GridNioServer;
+import org.apache.ignite.internal.util.nio.GridNioSession;
+import org.apache.ignite.internal.util.nio.ssl.GridNioSslFilter;
+import org.apache.ignite.logger.NullLogger;
+
+/**
+ * Client connection multiplexer based on {@link
org.apache.ignite.internal.util.nio.GridNioServer}.
+ */
+public class GridNioClientConnectionMultiplexer implements
ClientConnectionMultiplexer {
+ /** Worker thread prefix. */
+ private static final String THREAD_PREFIX = "thin-client-channel";
+
+ /** */
+ private static final int CLIENT_MODE_PORT = -1;
+
+ /** */
+ private final GridNioServer<ByteBuffer> srv;
+
+ /** */
+ private final SSLContext sslCtx;
+
+ /**
+ * Constructor.
+ *
+ * @param cfg Client config.
+ */
+ public GridNioClientConnectionMultiplexer(ClientConfiguration cfg) {
+ IgniteLogger gridLog = new NullLogger();
+
+ GridNioFilter[] filters;
+
+ GridNioFilter codecFilter = new GridNioCodecFilter(new
GridNioClientParser(), gridLog, false);
+
+ sslCtx = ClientSslUtils.getSslContext(cfg);
+
+ if (sslCtx != null) {
+ GridNioSslFilter sslFilter = new GridNioSslFilter(sslCtx, true,
ByteOrder.nativeOrder(), gridLog);
+ sslFilter.directMode(false);
+ filters = new GridNioFilter[]{codecFilter, sslFilter};
Review comment:
Space before ` {`
##########
File path:
modules/core/src/main/java/org/apache/ignite/internal/client/thin/io/gridnioserver/GridNioClientConnectionMultiplexer.java
##########
@@ -0,0 +1,143 @@
+/*
+ * 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.ignite.internal.client.thin.io.gridnioserver;
+
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.HashMap;
+import java.util.Map;
+import javax.net.ssl.SSLContext;
+
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.client.ClientConnectionException;
+import org.apache.ignite.configuration.ClientConfiguration;
+import org.apache.ignite.internal.client.thin.ClientSslUtils;
+import org.apache.ignite.internal.client.thin.io.ClientConnection;
+import org.apache.ignite.internal.client.thin.io.ClientConnectionMultiplexer;
+import org.apache.ignite.internal.client.thin.io.ClientConnectionStateHandler;
+import org.apache.ignite.internal.client.thin.io.ClientMessageHandler;
+import org.apache.ignite.internal.util.nio.GridNioCodecFilter;
+import org.apache.ignite.internal.util.nio.GridNioFilter;
+import org.apache.ignite.internal.util.nio.GridNioFuture;
+import org.apache.ignite.internal.util.nio.GridNioFutureImpl;
+import org.apache.ignite.internal.util.nio.GridNioServer;
+import org.apache.ignite.internal.util.nio.GridNioSession;
+import org.apache.ignite.internal.util.nio.ssl.GridNioSslFilter;
+import org.apache.ignite.logger.NullLogger;
+
+/**
+ * Client connection multiplexer based on {@link
org.apache.ignite.internal.util.nio.GridNioServer}.
+ */
+public class GridNioClientConnectionMultiplexer implements
ClientConnectionMultiplexer {
+ /** Worker thread prefix. */
+ private static final String THREAD_PREFIX = "thin-client-channel";
+
+ /** */
+ private static final int CLIENT_MODE_PORT = -1;
+
+ /** */
+ private final GridNioServer<ByteBuffer> srv;
+
+ /** */
+ private final SSLContext sslCtx;
+
+ /**
+ * Constructor.
+ *
+ * @param cfg Client config.
+ */
+ public GridNioClientConnectionMultiplexer(ClientConfiguration cfg) {
+ IgniteLogger gridLog = new NullLogger();
+
+ GridNioFilter[] filters;
+
+ GridNioFilter codecFilter = new GridNioCodecFilter(new
GridNioClientParser(), gridLog, false);
+
+ sslCtx = ClientSslUtils.getSslContext(cfg);
+
+ if (sslCtx != null) {
+ GridNioSslFilter sslFilter = new GridNioSslFilter(sslCtx, true,
ByteOrder.nativeOrder(), gridLog);
+ sslFilter.directMode(false);
+ filters = new GridNioFilter[]{codecFilter, sslFilter};
+ } else
+ filters = new GridNioFilter[]{codecFilter};
Review comment:
Space before ` {`
##########
File path:
modules/core/src/test/java/org/apache/ignite/client/ConnectToStartingNodeTest.java
##########
@@ -71,14 +71,20 @@ public void testClientConnectBeforeDiscoveryStart() throws
Exception {
IgniteInternalFuture<IgniteClient> futStartClient =
GridTestUtils.runAsync(
() -> startClient(grid()));
- // Server doesn't accept connection before discovery SPI started.
- assertFalse(GridTestUtils.waitForCondition(futStartClient::isDone,
500L));
+ try {
+ // Server doesn't accept connection before discovery SPI started.
+ assertFalse(GridTestUtils.waitForCondition(futStartClient::isDone,
500L));
- barrier.await();
+ barrier.await();
+
+ futStartGrid.get();
- futStartGrid.get();
+ // Server accept connection after discovery SPI started.
+ assertTrue(GridTestUtils.waitForCondition(futStartClient::isDone,
500L));
+ } finally {
+ if (futStartClient.isDone())
+ futStartClient.get().close();
+ }
Review comment:
Redundant NL
##########
File path:
modules/core/src/main/java/org/apache/ignite/internal/client/thin/io/ClientMessageDecoder.java
##########
@@ -0,0 +1,92 @@
+/*
+ * 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.ignite.internal.client.thin.io;
+
+import java.nio.ByteBuffer;
+
+/**
+ * Decodes thin client messages from partial buffers.
+ */
Review comment:
Wrong indent
##########
File path:
modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java
##########
@@ -543,31 +450,20 @@ else if (addr.getPort() < 1024 || addr.getPort() > 49151)
throw new IllegalArgumentException(error);
}
- /** Create socket. */
- private static Socket createSocket(ClientChannelConfiguration cfg) throws
IOException {
- Socket sock = cfg.getSslMode() == SslMode.REQUIRED ?
- new ClientSslSocketFactory(cfg).create() :
- new Socket(cfg.getAddress().getHostName(),
cfg.getAddress().getPort());
-
- sock.setTcpNoDelay(cfg.isTcpNoDelay());
-
- if (cfg.getTimeout() > 0)
- sock.setSoTimeout(cfg.getTimeout());
-
- if (cfg.getSendBufferSize() > 0)
- sock.setSendBufferSize(cfg.getSendBufferSize());
-
- if (cfg.getReceiveBufferSize() > 0)
- sock.setReceiveBufferSize(cfg.getReceiveBufferSize());
-
- return sock;
- }
-
/** Client handshake. */
private void handshake(ProtocolVersion ver, String user, String pwd,
Map<String, String> userAttrs)
throws ClientConnectionException, ClientAuthenticationException,
ClientProtocolError {
+ ClientRequestFuture fut = new ClientRequestFuture();
+ pendingReqs.put(-1L, fut);
+
handshakeReq(ver, user, pwd, userAttrs);
- handshakeRes(ver, user, pwd, userAttrs);
+
+ try {
+ ByteBuffer res = timeout > 0 ? fut.get(timeout) : fut.get();
+ handshakeRes(res, ver, user, pwd, userAttrs);
+ } catch (IgniteCheckedException e) {
Review comment:
NL between `}` and `catch` according to code style
##########
File path:
modules/core/src/main/java/org/apache/ignite/internal/client/thin/io/gridnioserver/GridNioClientConnectionMultiplexer.java
##########
@@ -0,0 +1,143 @@
+/*
+ * 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.ignite.internal.client.thin.io.gridnioserver;
+
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.HashMap;
+import java.util.Map;
+import javax.net.ssl.SSLContext;
+
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.client.ClientConnectionException;
+import org.apache.ignite.configuration.ClientConfiguration;
+import org.apache.ignite.internal.client.thin.ClientSslUtils;
+import org.apache.ignite.internal.client.thin.io.ClientConnection;
+import org.apache.ignite.internal.client.thin.io.ClientConnectionMultiplexer;
+import org.apache.ignite.internal.client.thin.io.ClientConnectionStateHandler;
+import org.apache.ignite.internal.client.thin.io.ClientMessageHandler;
+import org.apache.ignite.internal.util.nio.GridNioCodecFilter;
+import org.apache.ignite.internal.util.nio.GridNioFilter;
+import org.apache.ignite.internal.util.nio.GridNioFuture;
+import org.apache.ignite.internal.util.nio.GridNioFutureImpl;
+import org.apache.ignite.internal.util.nio.GridNioServer;
+import org.apache.ignite.internal.util.nio.GridNioSession;
+import org.apache.ignite.internal.util.nio.ssl.GridNioSslFilter;
+import org.apache.ignite.logger.NullLogger;
+
+/**
+ * Client connection multiplexer based on {@link
org.apache.ignite.internal.util.nio.GridNioServer}.
+ */
+public class GridNioClientConnectionMultiplexer implements
ClientConnectionMultiplexer {
+ /** Worker thread prefix. */
+ private static final String THREAD_PREFIX = "thin-client-channel";
+
+ /** */
+ private static final int CLIENT_MODE_PORT = -1;
+
+ /** */
+ private final GridNioServer<ByteBuffer> srv;
+
+ /** */
+ private final SSLContext sslCtx;
+
+ /**
+ * Constructor.
+ *
+ * @param cfg Client config.
+ */
+ public GridNioClientConnectionMultiplexer(ClientConfiguration cfg) {
+ IgniteLogger gridLog = new NullLogger();
+
+ GridNioFilter[] filters;
+
+ GridNioFilter codecFilter = new GridNioCodecFilter(new
GridNioClientParser(), gridLog, false);
+
+ sslCtx = ClientSslUtils.getSslContext(cfg);
+
+ if (sslCtx != null) {
+ GridNioSslFilter sslFilter = new GridNioSslFilter(sslCtx, true,
ByteOrder.nativeOrder(), gridLog);
+ sslFilter.directMode(false);
+ filters = new GridNioFilter[]{codecFilter, sslFilter};
+ } else
+ filters = new GridNioFilter[]{codecFilter};
+
+ try {
+ srv = GridNioServer.<ByteBuffer>builder()
+ .port(CLIENT_MODE_PORT)
+ .listener(new GridNioClientListener())
+ .filters(filters)
+ .logger(gridLog)
+ .selectorCount(1) // Using more selectors does not seem to
improve performance.
+ .byteOrder(ByteOrder.nativeOrder())
+ .directBuffer(true)
+ .directMode(false)
+ .igniteInstanceName("thinClient")
+ .serverName(THREAD_PREFIX)
+ .idleTimeout(Long.MAX_VALUE)
+ .socketReceiveBufferSize(cfg.getReceiveBufferSize())
+ .socketSendBufferSize(cfg.getSendBufferSize())
+ .tcpNoDelay(true)
+ .build();
+ } catch (IgniteCheckedException e) {
Review comment:
NL between `}` and `catch` according to code style
##########
File path:
modules/core/src/test/java/org/apache/ignite/client/ConnectToStartingNodeTest.java
##########
@@ -71,14 +71,20 @@ public void testClientConnectBeforeDiscoveryStart() throws
Exception {
IgniteInternalFuture<IgniteClient> futStartClient =
GridTestUtils.runAsync(
() -> startClient(grid()));
- // Server doesn't accept connection before discovery SPI started.
- assertFalse(GridTestUtils.waitForCondition(futStartClient::isDone,
500L));
+ try {
+ // Server doesn't accept connection before discovery SPI started.
+ assertFalse(GridTestUtils.waitForCondition(futStartClient::isDone,
500L));
- barrier.await();
+ barrier.await();
+
+ futStartGrid.get();
- futStartGrid.get();
+ // Server accept connection after discovery SPI started.
+ assertTrue(GridTestUtils.waitForCondition(futStartClient::isDone,
500L));
+ } finally {
Review comment:
NL after `}`
##########
File path:
modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java
##########
@@ -292,7 +233,8 @@ private ClientRequestFuture send(ClientOperation op,
Consumer<PayloadOutputChann
req.writeInt(0, req.position() - 4); // Actual size.
- write(req.array(), req.position());
+ // arrayCopy is required, because buffer is pooled, and write is
async.
+ write(req.arrayCopy(), req.position());
Review comment:
I don't quite understand. In `PayloadOutputChannel` constructor we have
created a new `BinaryHeapOutputStream`, which doesn't leaks to anywhere. Why do
we need another array copy here?
##########
File path:
modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java
##########
@@ -680,12 +571,12 @@ else if (!supportedVers.contains(srvVer) ||
/** Write bytes to the output stream. */
private void write(byte[] bytes, int len) throws ClientConnectionException
{
+ ByteBuffer buf = ByteBuffer.wrap(bytes, 0, len);
+
try {
- out.write(bytes, 0, len);
- out.flush();
- }
- catch (IOException e) {
- throw handleIOError(e);
+ sock.send(buf);
+ } catch (IgniteCheckedException e) {
Review comment:
NL between `}` and `catch` according to code style
##########
File path:
modules/core/src/main/java/org/apache/ignite/internal/client/thin/io/gridnioserver/GridNioClientParser.java
##########
@@ -0,0 +1,58 @@
+/*
+ * 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.ignite.internal.client.thin.io.gridnioserver;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+import org.apache.ignite.internal.client.thin.io.ClientMessageDecoder;
+import org.apache.ignite.internal.util.nio.GridNioParser;
+import org.apache.ignite.internal.util.nio.GridNioSession;
+import org.apache.ignite.internal.util.nio.GridNioSessionMetaKey;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Client message parser.
+ */
+class GridNioClientParser implements GridNioParser {
+ /** */
+ private static final int SES_META_DECODER =
GridNioSessionMetaKey.nextUniqueKey();
+
+ /** {@inheritDoc} */
+ @Override public @Nullable Object decode(GridNioSession ses, ByteBuffer
buf) {
+ ClientMessageDecoder decoder = ses.meta(SES_META_DECODER);
+
+ if (decoder == null) {
+ decoder = new ClientMessageDecoder();
+
+ ses.addMeta(SES_META_DECODER, decoder);
+ }
+
+ byte[] bytes = decoder.apply(buf);
+
+ if (bytes == null)
+ return null; // Message is not yet completely received.
+
+ return ByteBuffer.wrap(bytes).order(ByteOrder.nativeOrder());
Review comment:
I think here `ByteOrder.LITTLE_ENDIAN` should be used since this
`ByteBuffer` is passed to payload readers
##########
File path:
modules/core/src/main/java/org/apache/ignite/internal/client/thin/io/ClientConnectionStateHandler.java
##########
@@ -0,0 +1,31 @@
+/*
+ * 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.ignite.internal.client.thin.io;
+
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Handles thin client connection state.
+ */
+public interface ClientConnectionStateHandler {
+ /**
+ * Handles connection loss
Review comment:
Point at the end
##########
File path:
modules/core/src/main/java/org/apache/ignite/internal/client/thin/io/gridnioserver/GridNioClientConnectionMultiplexer.java
##########
@@ -0,0 +1,143 @@
+/*
+ * 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.ignite.internal.client.thin.io.gridnioserver;
+
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.HashMap;
+import java.util.Map;
+import javax.net.ssl.SSLContext;
+
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.client.ClientConnectionException;
+import org.apache.ignite.configuration.ClientConfiguration;
+import org.apache.ignite.internal.client.thin.ClientSslUtils;
+import org.apache.ignite.internal.client.thin.io.ClientConnection;
+import org.apache.ignite.internal.client.thin.io.ClientConnectionMultiplexer;
+import org.apache.ignite.internal.client.thin.io.ClientConnectionStateHandler;
+import org.apache.ignite.internal.client.thin.io.ClientMessageHandler;
+import org.apache.ignite.internal.util.nio.GridNioCodecFilter;
+import org.apache.ignite.internal.util.nio.GridNioFilter;
+import org.apache.ignite.internal.util.nio.GridNioFuture;
+import org.apache.ignite.internal.util.nio.GridNioFutureImpl;
+import org.apache.ignite.internal.util.nio.GridNioServer;
+import org.apache.ignite.internal.util.nio.GridNioSession;
+import org.apache.ignite.internal.util.nio.ssl.GridNioSslFilter;
+import org.apache.ignite.logger.NullLogger;
+
+/**
+ * Client connection multiplexer based on {@link
org.apache.ignite.internal.util.nio.GridNioServer}.
+ */
+public class GridNioClientConnectionMultiplexer implements
ClientConnectionMultiplexer {
+ /** Worker thread prefix. */
+ private static final String THREAD_PREFIX = "thin-client-channel";
+
+ /** */
+ private static final int CLIENT_MODE_PORT = -1;
+
+ /** */
+ private final GridNioServer<ByteBuffer> srv;
+
+ /** */
+ private final SSLContext sslCtx;
+
+ /**
+ * Constructor.
+ *
+ * @param cfg Client config.
+ */
+ public GridNioClientConnectionMultiplexer(ClientConfiguration cfg) {
+ IgniteLogger gridLog = new NullLogger();
+
+ GridNioFilter[] filters;
+
+ GridNioFilter codecFilter = new GridNioCodecFilter(new
GridNioClientParser(), gridLog, false);
+
+ sslCtx = ClientSslUtils.getSslContext(cfg);
+
+ if (sslCtx != null) {
+ GridNioSslFilter sslFilter = new GridNioSslFilter(sslCtx, true,
ByteOrder.nativeOrder(), gridLog);
+ sslFilter.directMode(false);
+ filters = new GridNioFilter[]{codecFilter, sslFilter};
+ } else
Review comment:
NL after `}`
##########
File path:
modules/core/src/main/java/org/apache/ignite/internal/client/thin/io/gridnioserver/GridNioClientConnectionMultiplexer.java
##########
@@ -0,0 +1,143 @@
+/*
+ * 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.ignite.internal.client.thin.io.gridnioserver;
+
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.HashMap;
+import java.util.Map;
+import javax.net.ssl.SSLContext;
+
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.client.ClientConnectionException;
+import org.apache.ignite.configuration.ClientConfiguration;
+import org.apache.ignite.internal.client.thin.ClientSslUtils;
+import org.apache.ignite.internal.client.thin.io.ClientConnection;
+import org.apache.ignite.internal.client.thin.io.ClientConnectionMultiplexer;
+import org.apache.ignite.internal.client.thin.io.ClientConnectionStateHandler;
+import org.apache.ignite.internal.client.thin.io.ClientMessageHandler;
+import org.apache.ignite.internal.util.nio.GridNioCodecFilter;
+import org.apache.ignite.internal.util.nio.GridNioFilter;
+import org.apache.ignite.internal.util.nio.GridNioFuture;
+import org.apache.ignite.internal.util.nio.GridNioFutureImpl;
+import org.apache.ignite.internal.util.nio.GridNioServer;
+import org.apache.ignite.internal.util.nio.GridNioSession;
+import org.apache.ignite.internal.util.nio.ssl.GridNioSslFilter;
+import org.apache.ignite.logger.NullLogger;
+
+/**
+ * Client connection multiplexer based on {@link
org.apache.ignite.internal.util.nio.GridNioServer}.
+ */
+public class GridNioClientConnectionMultiplexer implements
ClientConnectionMultiplexer {
+ /** Worker thread prefix. */
+ private static final String THREAD_PREFIX = "thin-client-channel";
+
+ /** */
+ private static final int CLIENT_MODE_PORT = -1;
+
+ /** */
+ private final GridNioServer<ByteBuffer> srv;
+
+ /** */
+ private final SSLContext sslCtx;
+
+ /**
+ * Constructor.
+ *
+ * @param cfg Client config.
+ */
+ public GridNioClientConnectionMultiplexer(ClientConfiguration cfg) {
+ IgniteLogger gridLog = new NullLogger();
+
+ GridNioFilter[] filters;
+
+ GridNioFilter codecFilter = new GridNioCodecFilter(new
GridNioClientParser(), gridLog, false);
+
+ sslCtx = ClientSslUtils.getSslContext(cfg);
+
+ if (sslCtx != null) {
+ GridNioSslFilter sslFilter = new GridNioSslFilter(sslCtx, true,
ByteOrder.nativeOrder(), gridLog);
+ sslFilter.directMode(false);
+ filters = new GridNioFilter[]{codecFilter, sslFilter};
+ } else
+ filters = new GridNioFilter[]{codecFilter};
+
+ try {
+ srv = GridNioServer.<ByteBuffer>builder()
+ .port(CLIENT_MODE_PORT)
+ .listener(new GridNioClientListener())
+ .filters(filters)
+ .logger(gridLog)
+ .selectorCount(1) // Using more selectors does not seem to
improve performance.
+ .byteOrder(ByteOrder.nativeOrder())
+ .directBuffer(true)
+ .directMode(false)
+ .igniteInstanceName("thinClient")
+ .serverName(THREAD_PREFIX)
+ .idleTimeout(Long.MAX_VALUE)
+ .socketReceiveBufferSize(cfg.getReceiveBufferSize())
+ .socketSendBufferSize(cfg.getSendBufferSize())
+ .tcpNoDelay(true)
+ .build();
+ } catch (IgniteCheckedException e) {
+ throw new IgniteException(e);
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public void start() {
+ srv.start();
+ }
+
+ /** {@inheritDoc} */
+ @Override public void stop() {
+ srv.stop();
+ }
+
+ /** {@inheritDoc} */
+ @Override public ClientConnection open(InetSocketAddress addr,
+ ClientMessageHandler msgHnd,
+ ClientConnectionStateHandler
stateHnd)
+ throws ClientConnectionException {
+ try {
+ java.nio.channels.SocketChannel ch =
java.nio.channels.SocketChannel.open();
Review comment:
Add `java.nio.channels.SocketChannel` to imports?
##########
File path:
modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/thin/JmhThinClientAbstractBenchmark.java
##########
@@ -0,0 +1,135 @@
+/*
+ * 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.ignite.internal.benchmarks.jmh.thin;
+
+import java.util.stream.IntStream;
+
+import org.apache.ignite.Ignite;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.client.ClientCache;
+import org.apache.ignite.client.IgniteClient;
+import org.apache.ignite.configuration.ClientConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.benchmarks.jmh.JmhAbstractBenchmark;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.TearDown;
+
+/**
+ * Base class for thin client benchmarks.
+ */
+@State(Scope.Benchmark)
+public class JmhThinClientAbstractBenchmark extends JmhAbstractBenchmark {
Review comment:
`public abstract class`?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
