You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ir...@apache.org on 2019/01/18 14:02:40 UTC
[ignite] branch master updated: IGNITE-10648 Ignite hang to stop if
node wasn't started completely. GridTcpRestNioListener hangs on latch. -
Fixes #5710.
This is an automated email from the ASF dual-hosted git repository.
irakov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 317bc8e IGNITE-10648 Ignite hang to stop if node wasn't started completely. GridTcpRestNioListener hangs on latch. - Fixes #5710.
317bc8e is described below
commit 317bc8e20b0f3603776adeca92fd39548780a74d
Author: vd_pyatkov <vl...@gmail.com>
AuthorDate: Fri Jan 18 16:53:41 2019 +0300
IGNITE-10648 Ignite hang to stop if node wasn't started completely. GridTcpRestNioListener hangs on latch. - Fixes #5710.
Signed-off-by: Ivan Rakov <ir...@apache.org>
---
.../rest/protocols/tcp/GridTcpRestNioListener.java | 146 +++++++++++----------
.../processors/rest/RestProtocolStartTest.java | 134 +++++++++++++++++++
.../testsuites/IgniteRestHandlerTestSuite.java | 4 +-
3 files changed, 214 insertions(+), 70 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java
index f025a54..b6c1e19 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java
@@ -28,6 +28,7 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
import org.apache.ignite.internal.client.marshaller.GridClientMarshaller;
import org.apache.ignite.internal.processors.rest.GridRestCommand;
import org.apache.ignite.internal.processors.rest.GridRestProtocolHandler;
@@ -188,95 +189,102 @@ public class GridTcpRestNioListener extends GridNioServerListenerAdapter<GridCli
memcachedLsnr.onMessage(ses, (GridMemcachedMessage)msg);
else if (msg instanceof GridRedisMessage)
redisLsnr.onMessage(ses, (GridRedisMessage)msg);
- else {
- if (msg instanceof GridClientPingPacket)
- ses.send(msg);
- else if (msg instanceof GridClientHandshakeRequest) {
- GridClientHandshakeRequest hs = (GridClientHandshakeRequest)msg;
-
- short ver = hs.version();
+ else if (msg instanceof GridClientPingPacket)
+ ses.send(msg);
+ else if (msg instanceof GridClientHandshakeRequest) {
+ GridClientHandshakeRequest hs = (GridClientHandshakeRequest)msg;
- if (!SUPP_VERS.contains(ver)) {
- U.error(log, "Client protocol version is not supported [ses=" + ses +
- ", ver=" + ver +
- ", supported=" + SUPP_VERS + ']');
-
- ses.close();
- }
- else {
- byte marshId = hs.marshallerId();
+ short ver = hs.version();
- if (marshMapLatch.getCount() > 0)
- U.awaitQuiet(marshMapLatch);
+ if (!SUPP_VERS.contains(ver)) {
+ U.error(log, "Client protocol version is not supported [ses=" + ses +
+ ", ver=" + ver +
+ ", supported=" + SUPP_VERS + ']');
- GridClientMarshaller marsh = marshMap.get(marshId);
+ ses.close();
+ }
+ else {
+ byte marshId = hs.marshallerId();
- if (marsh == null) {
- U.error(log, "Client marshaller ID is invalid. Note that .NET and C++ clients " +
- "are supported only in enterprise edition [ses=" + ses + ", marshId=" + marshId + ']');
+ if (marshMapLatch.getCount() > 0) {
+ try {
+ U.await(marshMapLatch);
+ } catch (IgniteInterruptedCheckedException e) {
+ U.error(log, "Marshaller is not initialized.", e);
ses.close();
- }
- else {
- ses.addMeta(MARSHALLER.ordinal(), marsh);
- ses.send(GridClientHandshakeResponse.OK);
+ return;
}
}
+
+ GridClientMarshaller marsh = marshMap.get(marshId);
+
+ if (marsh == null) {
+ U.error(log, "Client marshaller ID is invalid. Note that .NET and C++ clients " +
+ "are supported only in enterprise edition [ses=" + ses + ", marshId=" + marshId + ']');
+
+ ses.close();
+ }
+ else {
+ ses.addMeta(MARSHALLER.ordinal(), marsh);
+
+ ses.send(GridClientHandshakeResponse.OK);
+ }
}
- else {
- final GridRestRequest req = createRestRequest(ses, msg);
+ }
+ else {
+ final GridRestRequest req = createRestRequest(ses, msg);
- if (req != null)
- hnd.handleAsync(req).listen(new CI1<IgniteInternalFuture<GridRestResponse>>() {
- @Override public void apply(IgniteInternalFuture<GridRestResponse> fut) {
- GridClientResponse res = new GridClientResponse();
+ if (req != null)
+ hnd.handleAsync(req).listen(new CI1<IgniteInternalFuture<GridRestResponse>>() {
+ @Override public void apply(IgniteInternalFuture<GridRestResponse> fut) {
+ GridClientResponse res = new GridClientResponse();
- res.requestId(msg.requestId());
- res.clientId(msg.clientId());
+ res.requestId(msg.requestId());
+ res.clientId(msg.clientId());
- try {
- GridRestResponse restRes = fut.get();
+ try {
+ GridRestResponse restRes = fut.get();
- res.sessionToken(restRes.sessionTokenBytes());
- res.successStatus(restRes.getSuccessStatus());
- res.errorMessage(restRes.getError());
+ res.sessionToken(restRes.sessionTokenBytes());
+ res.successStatus(restRes.getSuccessStatus());
+ res.errorMessage(restRes.getError());
- Object o = restRes.getResponse();
+ Object o = restRes.getResponse();
- // In case of metrics a little adjustment is needed.
- if (o instanceof GridCacheRestMetrics)
- o = ((GridCacheRestMetrics)o).map();
+ // In case of metrics a little adjustment is needed.
+ if (o instanceof GridCacheRestMetrics)
+ o = ((GridCacheRestMetrics)o).map();
- res.result(o);
- }
- catch (IgniteCheckedException e) {
- U.error(log, "Failed to process client request: " + msg, e);
+ res.result(o);
+ }
+ catch (IgniteCheckedException e) {
+ U.error(log, "Failed to process client request: " + msg, e);
- res.successStatus(GridClientResponse.STATUS_FAILED);
- res.errorMessage("Failed to process client request: " + e.getMessage());
- }
+ res.successStatus(GridClientResponse.STATUS_FAILED);
+ res.errorMessage("Failed to process client request: " + e.getMessage());
+ }
- GridNioFuture<?> sf = ses.send(res);
-
- // Check if send failed.
- sf.listen(new CI1<IgniteInternalFuture<?>>() {
- @Override public void apply(IgniteInternalFuture<?> fut) {
- try {
- fut.get();
- }
- catch (IgniteCheckedException e) {
- U.error(log, "Failed to process client request [ses=" + ses +
- ", msg=" + msg + ']', e);
- }
+ GridNioFuture<?> sf = ses.send(res);
+
+ // Check if send failed.
+ sf.listen(new CI1<IgniteInternalFuture<?>>() {
+ @Override public void apply(IgniteInternalFuture<?> fut) {
+ try {
+ fut.get();
}
- });
- }
- });
- else
- U.error(log, "Failed to process client request (unknown packet type) [ses=" + ses +
- ", msg=" + msg + ']');
- }
+ catch (IgniteCheckedException e) {
+ U.error(log, "Failed to process client request [ses=" + ses +
+ ", msg=" + msg + ']', e);
+ }
+ }
+ });
+ }
+ });
+ else
+ U.error(log, "Failed to process client request (unknown packet type) [ses=" + ses +
+ ", msg=" + msg + ']');
}
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/RestProtocolStartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/RestProtocolStartTest.java
new file mode 100644
index 0000000..0ab2e1a
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/RestProtocolStartTest.java
@@ -0,0 +1,134 @@
+/*
+ * 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.processors.rest;
+
+import java.util.Collections;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.TestRecordingCommunicationSpi;
+import org.apache.ignite.internal.client.GridClient;
+import org.apache.ignite.internal.client.GridClientConfiguration;
+import org.apache.ignite.internal.client.GridClientException;
+import org.apache.ignite.internal.client.GridClientFactory;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplyMessage;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+
+/**
+ * Test of start rest protocol and stop node.
+ */
+public class RestProtocolStartTest extends GridCommonAbstractTest {
+ /** Failure detection timeout. */
+ private static final int FAILURE_DETECTION_TIMEOUT = 2_000;
+
+ /** Node local host. */
+ private static final String HOST = "127.0.0.1";
+
+ /** Binary rest port. */
+ private static final int BINARY_PORT = 11212;
+
+ /** Recording communication spi. */
+ private TestRecordingCommunicationSpi recordingCommunicationSpi = new TestRecordingCommunicationSpi();
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ return super.getConfiguration(igniteInstanceName)
+ .setConsistentId(igniteInstanceName)
+ .setSystemWorkerBlockedTimeout(10_000)
+ .setFailureDetectionTimeout(FAILURE_DETECTION_TIMEOUT)
+ .setCacheConfiguration(new CacheConfiguration(DEFAULT_CACHE_NAME)
+ .setAffinity(new RendezvousAffinityFunction(false, 8)))
+ .setCommunicationSpi(igniteInstanceName.equals(getTestIgniteInstanceName(0))
+ ? recordingCommunicationSpi :
+ new TestRecordingCommunicationSpi())
+ .setLocalHost(HOST)
+ .setConnectorConfiguration(
+ getTestIgniteInstanceName(1).equals(igniteInstanceName)
+ ? new ConnectorConfiguration()
+ .setPort(BINARY_PORT) : null);
+ }
+
+ /**
+ *
+ */
+ @Test
+ public void test() throws Exception {
+ Ignite ignite = startGrids(2);
+
+ recordingCommunicationSpi.blockMessages(GridDhtPartitionSupplyMessage.class, getTestIgniteInstanceName(1));
+
+ info("Bock supply messages.");
+
+ ignite(1).close();
+
+ try (IgniteDataStreamer streamer = ignite.dataStreamer(DEFAULT_CACHE_NAME)) {
+ for (int i = 0; i < 100; i++)
+ streamer.addData(i, i);
+ }
+
+ IgniteInternalFuture startFut = GridTestUtils.runAsync(() -> {
+ try {
+ startGrid(1);
+
+ fail("Node should not started before rebalance completed.");
+ }
+ catch (Exception e) {
+ assertEquals("Err = " + e.getMessage(), e.getClass(), IgniteInterruptedCheckedException.class);
+ }
+ });
+
+ assertTrue("Is active " + ignite.cluster().active(), ignite.cluster().active());
+
+ GridClient gridClient = client();
+
+ ((TcpDiscoverySpi)ignite.configuration().getDiscoverySpi()).brakeConnection();
+
+ doSleep(FAILURE_DETECTION_TIMEOUT);
+
+ recordingCommunicationSpi.stopBlock();
+
+ try {
+ startFut.get(10_000);
+ }
+ catch (IgniteFutureTimeoutCheckedException e) {
+ fail("Failed to wait rebalance completed. Node has hang.");
+ }
+
+ assertTrue("Is active " + ignite.cluster().active(), ignite.cluster().active());
+ }
+
+ /**
+ * @return Client.
+ * @throws GridClientException In case of error.
+ */
+ protected GridClient client() throws GridClientException {
+ return GridClientFactory.start(new GridClientConfiguration()
+ .setConnectTimeout(300)
+ .setServers(Collections
+ .singleton(HOST + ":" + BINARY_PORT)));
+ }
+}
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteRestHandlerTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteRestHandlerTestSuite.java
index 277f0cc..4aa84a6 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteRestHandlerTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteRestHandlerTestSuite.java
@@ -17,6 +17,7 @@
package org.apache.ignite.testsuites;
+import org.apache.ignite.internal.processors.rest.RestProtocolStartTest;
import org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheAtomicCommandHandlerSelfTest;
import org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheCommandHandlerSelfTest;
import org.apache.ignite.internal.processors.rest.handlers.log.GridLogCommandHandlerTest;
@@ -34,7 +35,8 @@ import org.junit.runners.Suite;
GridCacheAtomicCommandHandlerSelfTest.class,
GridLogCommandHandlerTest.class,
GridQueryCommandHandlerTest.class,
- CacheTopologyCommandHandlerTest.class
+ CacheTopologyCommandHandlerTest.class,
+ RestProtocolStartTest.class
})
public class IgniteRestHandlerTestSuite {
}