You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/06/27 09:37:43 UTC
[01/10] ignite git commit: IGNITE-3230 External addresses are not
registered in IP finder
Repository: ignite
Updated Branches:
refs/heads/ignite-3361 [created] 2ac91a8f3
IGNITE-3230 External addresses are not registered in IP finder
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/82761bd7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/82761bd7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/82761bd7
Branch: refs/heads/ignite-3361
Commit: 82761bd7b5c71832f0e5d21abbe32e5deedb0584
Parents: 9881863
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed Jun 22 12:13:30 2016 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed Jun 22 12:13:30 2016 +0300
----------------------------------------------------------------------
.../ignite/internal/util/IgniteUtils.java | 45 +++++++--
.../ignite/spi/discovery/tcp/ServerImpl.java | 5 +-
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 3 +-
.../cluster/GridAddressResolverSelfTest.java | 97 ++++++++++++++++++++
.../testsuites/IgniteKernalSelfTestSuite.java | 2 +
5 files changed, 140 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/82761bd7/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index faf026b..fa18923 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -8655,16 +8655,10 @@ public abstract class IgniteUtils {
InetSocketAddress sockAddr = new InetSocketAddress(addr, port);
if (!sockAddr.isUnresolved()) {
- try {
- Collection<InetSocketAddress> extAddrs0 = addrRslvr.getExternalAddresses(sockAddr);
+ Collection<InetSocketAddress> extAddrs0 = resolveAddress(addrRslvr, sockAddr);
- if (extAddrs0 != null)
- extAddrs.addAll(extAddrs0);
- }
- catch (IgniteCheckedException e) {
- throw new IgniteSpiException("Failed to get mapped external addresses " +
- "[addrRslvr=" + addrRslvr + ", addr=" + addr + ']', e);
- }
+ if (extAddrs0 != null)
+ extAddrs.addAll(extAddrs0);
}
}
@@ -8672,6 +8666,39 @@ public abstract class IgniteUtils {
}
/**
+ * @param addrRslvr Address resolver.
+ * @param sockAddr Addresses.
+ * @return Resolved addresses.
+ */
+ public static Collection<InetSocketAddress> resolveAddresses(AddressResolver addrRslvr,
+ Collection<InetSocketAddress> sockAddr) {
+ if (addrRslvr == null)
+ return sockAddr;
+
+ Collection<InetSocketAddress> resolved = new HashSet<>();
+
+ for (InetSocketAddress address :sockAddr)
+ resolved.addAll(resolveAddress(addrRslvr, address));
+
+ return resolved;
+ }
+
+ /**
+ * @param addrRslvr Address resolver.
+ * @param sockAddr Addresses.
+ * @return Resolved addresses.
+ */
+ private static Collection<InetSocketAddress> resolveAddress(AddressResolver addrRslvr, InetSocketAddress sockAddr) {
+ try {
+ return addrRslvr.getExternalAddresses(sockAddr);
+ }
+ catch (IgniteCheckedException e) {
+ throw new IgniteSpiException("Failed to get mapped external addresses " +
+ "[addrRslvr=" + addrRslvr + ", addr=" + sockAddr + ']', e);
+ }
+ }
+
+ /**
* Returns string representation of node addresses.
*
* @param node Grid node.
http://git-wip-us.apache.org/repos/asf/ignite/blob/82761bd7/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 2ce2e7b..7d4bac5 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -130,10 +130,10 @@ import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryStatusCheckMessa
import org.jetbrains.annotations.Nullable;
import org.jsr166.ConcurrentHashMap8;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_BINARY_MARSHALLER_USE_STRING_SERIALIZATION_VER_2;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_DISCOVERY_HISTORY_SIZE;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_SERVICES_COMPATIBILITY_MODE;
-import static org.apache.ignite.IgniteSystemProperties.IGNITE_BINARY_MARSHALLER_USE_STRING_SERIALIZATION_VER_2;
import static org.apache.ignite.IgniteSystemProperties.getInteger;
import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
@@ -4081,7 +4081,8 @@ class ServerImpl extends TcpDiscoveryImpl {
if (msg.verified() || !ring.hasRemoteNodes() || msg.senderNodeId() != null) {
if (spi.ipFinder.isShared() && !ring.hasRemoteNodes()) {
try {
- spi.ipFinder.unregisterAddresses(locNode.socketAddresses());
+ spi.ipFinder.unregisterAddresses(
+ U.resolveAddresses(spi.getAddressResolver(), locNode.socketAddresses()));
}
catch (IgniteSpiException e) {
U.error(log, "Failed to unregister local node address from IP finder.", e);
http://git-wip-us.apache.org/repos/asf/ignite/blob/82761bd7/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
index 41086d1..30b83e5 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
@@ -265,7 +265,8 @@ abstract class TcpDiscoveryImpl {
while (true) {
try {
- spi.ipFinder.initializeLocalAddresses(locNode.socketAddresses());
+ spi.ipFinder.initializeLocalAddresses(
+ U.resolveAddresses(spi.getAddressResolver(), locNode.socketAddresses()));
// Success.
break;
http://git-wip-us.apache.org/repos/asf/ignite/blob/82761bd7/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/GridAddressResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/GridAddressResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/GridAddressResolverSelfTest.java
new file mode 100644
index 0000000..d8fd767
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/GridAddressResolverSelfTest.java
@@ -0,0 +1,97 @@
+/*
+ * 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.cluster;
+
+import java.net.InetSocketAddress;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.AddressResolver;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.lang.GridAbsPredicate;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.testframework.junits.common.GridCommonTest;
+
+/**
+ * Address Resolver test.
+ */
+@GridCommonTest(group = "Kernal Self")
+public class GridAddressResolverSelfTest extends GridCommonAbstractTest {
+ /** */
+ private final InetSocketAddress addr0 = new InetSocketAddress("test0.com", 5000);
+
+ /** */
+ private final InetSocketAddress addr1 = new InetSocketAddress("test1.com", 5000);
+
+ /** Ip finder. */
+ private static final TcpDiscoveryVmIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(final String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
+ discoSpi.setIpFinder(IP_FINDER);
+ cfg.setDiscoverySpi(discoSpi);
+
+ cfg.setAddressResolver(new AddressResolver() {
+ @Override public Collection<InetSocketAddress> getExternalAddresses(
+ InetSocketAddress addr) throws IgniteCheckedException {
+ Set<InetSocketAddress> set = new HashSet<>();
+
+ set.add(addr);
+ set.add(gridName.contains("0") ? addr0 : addr1);
+
+ return set;
+ }
+ });
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ super.afterTest();
+
+ stopAllGrids();
+ }
+
+ /** */
+ public void test() throws Exception {
+ startGrid(0);
+
+ assertFalse(IP_FINDER.getRegisteredAddresses().contains(addr1));
+
+ startGrid(1);
+
+ assertTrue(IP_FINDER.getRegisteredAddresses().contains(addr0));
+ assertTrue(IP_FINDER.getRegisteredAddresses().contains(addr1));
+
+ stopGrid(0, true);
+
+ assertTrue(GridTestUtils.waitForCondition(new GridAbsPredicate() {
+ @Override public boolean apply() {
+ return !IP_FINDER.getRegisteredAddresses().contains(addr0);
+ }
+ }, 70000));
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/82761bd7/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
index cfb9f1c..d990b32 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
@@ -46,6 +46,7 @@ import org.apache.ignite.internal.managers.discovery.GridDiscoveryManagerSelfTes
import org.apache.ignite.internal.managers.discovery.IgniteTopologyPrintFormatSelfTest;
import org.apache.ignite.internal.managers.events.GridEventStorageManagerSelfTest;
import org.apache.ignite.internal.managers.swapspace.GridSwapSpaceManagerSelfTest;
+import org.apache.ignite.internal.processors.cluster.GridAddressResolverSelfTest;
import org.apache.ignite.internal.processors.cluster.GridUpdateNotifierSelfTest;
import org.apache.ignite.internal.processors.port.GridPortProcessorSelfTest;
import org.apache.ignite.internal.processors.service.GridServiceClientNodeTest;
@@ -120,6 +121,7 @@ public class IgniteKernalSelfTestSuite extends TestSuite {
suite.addTestSuite(GridKernalConcurrentAccessStopSelfTest.class);
suite.addTestSuite(IgniteConcurrentEntryProcessorAccessStopTest.class);
suite.addTestSuite(GridUpdateNotifierSelfTest.class);
+ suite.addTestSuite(GridAddressResolverSelfTest.class);
suite.addTestSuite(IgniteUpdateNotifierPerClusterSettingSelfTest.class);
suite.addTestSuite(GridLocalEventListenerSelfTest.class);
suite.addTestSuite(IgniteTopologyPrintFormatSelfTest.class);
[10/10] ignite git commit: ignite-3361 Fixed condition in
GridServiceProcessor.reassign.
Posted by sb...@apache.org.
ignite-3361 Fixed condition in GridServiceProcessor.reassign.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2ac91a8f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2ac91a8f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2ac91a8f
Branch: refs/heads/ignite-3361
Commit: 2ac91a8f353677b38ccd505d7c253a451f5c9d54
Parents: 46ba701
Author: sboikov <sb...@gridgain.com>
Authored: Mon Jun 27 12:29:22 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Jun 27 12:29:22 2016 +0300
----------------------------------------------------------------------
.../service/GridServiceProcessor.java | 2 +-
.../service/IgniteServiceReassignmentTest.java | 250 +++++++++++++++++++
.../testsuites/IgniteKernalSelfTestSuite.java | 2 +
3 files changed, 253 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2ac91a8f/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
index add90e2..53eaeb5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
@@ -942,7 +942,7 @@ public class GridServiceProcessor extends GridProcessorAdapter {
for (Map.Entry<UUID, Integer> e : entries) {
// Assign only the ones that have not been reused from previous assignments.
if (!used.contains(e.getKey())) {
- if (e.getValue() < maxPerNodeCnt) {
+ if (e.getValue() < maxPerNodeCnt || maxPerNodeCnt == 0) {
e.setValue(e.getValue() + 1);
if (--remainder == 0)
http://git-wip-us.apache.org/repos/asf/ignite/blob/2ac91a8f/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceReassignmentTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceReassignmentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceReassignmentTest.java
new file mode 100644
index 0000000..d7937ec
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceReassignmentTest.java
@@ -0,0 +1,250 @@
+/*
+ * 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.service;
+
+import java.util.concurrent.ThreadLocalRandom;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.PA;
+import org.apache.ignite.resources.IgniteInstanceResource;
+import org.apache.ignite.services.Service;
+import org.apache.ignite.services.ServiceConfiguration;
+import org.apache.ignite.services.ServiceContext;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+/**
+ *
+ */
+public class IgniteServiceReassignmentTest extends GridCommonAbstractTest {
+ /** */
+ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+
+ /** */
+ private ServiceConfiguration srvcCfg;
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER);
+
+ if (srvcCfg != null)
+ cfg.setServiceConfiguration(srvcCfg);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ stopAllGrids();
+
+ super.afterTest();
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testNodeRestart1() throws Exception {
+ srvcCfg = serviceConfiguration();
+
+ Ignite node1 = startGrid(1);
+
+ assertEquals(42, serviceProxy(node1).foo());
+
+ srvcCfg = serviceConfiguration();
+
+ Ignite node2 = startGrid(2);
+
+ node1.close();
+
+ waitForService(node2);
+
+ assertEquals(42, serviceProxy(node2).foo());
+
+ srvcCfg = serviceConfiguration();
+
+ Ignite node3 = startGrid(3);
+
+ assertEquals(42, serviceProxy(node3).foo());
+
+ srvcCfg = serviceConfiguration();
+
+ node1 = startGrid(1);
+
+ assertEquals(42, serviceProxy(node1).foo());
+ assertEquals(42, serviceProxy(node2).foo());
+ assertEquals(42, serviceProxy(node3).foo());
+
+ node2.close();
+
+ waitForService(node1);
+
+ assertEquals(42, serviceProxy(node1).foo());
+ assertEquals(42, serviceProxy(node3).foo());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testNodeRestart2() throws Exception {
+ startGrids(3);
+
+ ServiceConfiguration svcCfg = new ServiceConfiguration();
+
+ svcCfg.setName("DummyService");
+ svcCfg.setTotalCount(10);
+ svcCfg.setMaxPerNodeCount(1);
+ svcCfg.setService(new DummyService());
+
+ ignite(0).services().deploy(svcCfg);
+
+ for (int i = 0; i < 3; i++)
+ assertEquals(42, serviceProxy(ignite(i)).foo());
+
+ for (int i = 0; i < 3; i++)
+ startGrid(i + 3);
+
+ for (int i = 0; i < 3; i++)
+ stopGrid(i);
+
+ for (int i = 0; i < 3; i++)
+ assertEquals(42, serviceProxy(ignite(i + 3)).foo());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testNodeRestartRandom() throws Exception {
+ final int NODES = 5;
+
+ Ignite ignite = startGridsMultiThreaded(NODES);
+
+ ignite.services().deploy(serviceConfiguration());
+
+ for (int i = 0; i < 30; i++) {
+ log.info("Iteration: " + i);
+
+ int stopIdx = ThreadLocalRandom.current().nextInt(NODES);
+
+ stopGrid(stopIdx);
+
+ for (int nodeIdx = 0; nodeIdx < NODES; nodeIdx++) {
+ if (nodeIdx == stopIdx)
+ continue;
+
+ waitForService(ignite(nodeIdx));
+
+ assertEquals(42, serviceProxy(ignite(nodeIdx)).foo());
+ }
+
+ startGrid(stopIdx);
+
+ for (int nodeIdx = 0; nodeIdx < NODES; nodeIdx++)
+ assertEquals(42, serviceProxy(ignite(nodeIdx)).foo());
+ }
+ }
+
+ /**
+ * @param node Node.
+ * @throws Exception If failed.
+ */
+ private void waitForService(final Ignite node) throws Exception {
+ assertTrue(GridTestUtils.waitForCondition(new PA() {
+ @Override public boolean apply() {
+ try {
+ serviceProxy(node).foo();
+
+ return true;
+ }
+ catch (IgniteException e) {
+ return false;
+ }
+ }
+ }, 5000));
+ }
+
+ /**
+ * @param node Node.
+ * @return Service proxy.
+ */
+ private static MyService serviceProxy(Ignite node) {
+ return node.services().serviceProxy("DummyService", MyService.class, true);
+ }
+
+ /**
+ * @return Service configuration.
+ */
+ private ServiceConfiguration serviceConfiguration() {
+ ServiceConfiguration svc = new ServiceConfiguration();
+
+ svc.setName("DummyService");
+ svc.setTotalCount(1);
+ svc.setService(new DummyService());
+
+ return svc;
+ }
+
+ /**
+ *
+ */
+ public interface MyService {
+ /**
+ * @return Dummy result.
+ */
+ int foo();
+ }
+
+ /**
+ *
+ */
+ static class DummyService implements MyService, Service {
+ /** */
+ @IgniteInstanceResource
+ private Ignite locNode;
+
+ /** {@inheritDoc} */
+ @Override public void cancel(ServiceContext ctx) {
+ locNode.log().info("Service cancelled [execId=" + ctx.executionId() +
+ ", node=" + locNode.cluster().localNode() + ']');
+ }
+
+ /** {@inheritDoc} */
+ @Override public void init(ServiceContext ctx) {
+ locNode.log().info("Service initialized [execId=" + ctx.executionId() +
+ ", node=" + locNode.cluster().localNode() + ']');
+ }
+
+ /** {@inheritDoc} */
+ @Override public void execute(ServiceContext ctx) {
+ locNode.log().info("Service started [execId=" + ctx.executionId() +
+ ", node=" + locNode.cluster().localNode() + ']');
+ }
+
+ /** {@inheritDoc} */
+ @Override public int foo() {
+ locNode.log().info("Service called.");
+
+ return 42;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/2ac91a8f/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
index d990b32..471bea7 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
@@ -65,6 +65,7 @@ import org.apache.ignite.internal.processors.service.IgniteServiceDeployment2Cla
import org.apache.ignite.internal.processors.service.IgniteServiceDeploymentClassLoadingDefaultMarshallerTest;
import org.apache.ignite.internal.processors.service.IgniteServiceDeploymentClassLoadingJdkMarshallerTest;
import org.apache.ignite.internal.processors.service.IgniteServiceDeploymentClassLoadingOptimizedMarshallerTest;
+import org.apache.ignite.internal.processors.service.IgniteServiceReassignmentTest;
import org.apache.ignite.internal.processors.service.ServicePredicateAccessCacheTest;
import org.apache.ignite.internal.util.GridStartupWithSpecifiedWorkDirectorySelfTest;
import org.apache.ignite.internal.util.GridStartupWithUndefinedIgniteHomeSelfTest;
@@ -139,6 +140,7 @@ public class IgniteKernalSelfTestSuite extends TestSuite {
suite.addTestSuite(GridServicePackagePrivateSelfTest.class);
suite.addTestSuite(GridServiceSerializationSelfTest.class);
suite.addTestSuite(GridServiceProxyNodeStopSelfTest.class);
+ suite.addTestSuite(IgniteServiceReassignmentTest.class);
suite.addTestSuite(IgniteServiceDeploymentClassLoadingDefaultMarshallerTest.class);
suite.addTestSuite(IgniteServiceDeploymentClassLoadingOptimizedMarshallerTest.class);
[07/10] ignite git commit: IGNITE-3354: IGFS: Fixed (removed) max
space validation logic.
Posted by sb...@apache.org.
IGNITE-3354: IGFS: Fixed (removed) max space validation logic.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/60a2e28a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/60a2e28a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/60a2e28a
Branch: refs/heads/ignite-3361
Commit: 60a2e28ac475fbd92b898c025955ef3ef8f6b2ba
Parents: c0120b9
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Jun 22 17:27:13 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Jun 22 17:27:13 2016 +0300
----------------------------------------------------------------------
.../internal/processors/igfs/IgfsProcessor.java | 24 ------------------
.../igfs/IgfsProcessorValidationSelfTest.java | 26 --------------------
2 files changed, 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/60a2e28a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
index 92b43cb..c9ab2ae 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
@@ -39,7 +39,6 @@ import org.apache.ignite.internal.util.typedef.C1;
import org.apache.ignite.internal.util.typedef.CI1;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.X;
-import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteClosure;
import org.jetbrains.annotations.Nullable;
import org.jsr166.ConcurrentHashMap8;
@@ -58,7 +57,6 @@ import java.util.concurrent.ConcurrentMap;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK;
import static org.apache.ignite.IgniteSystemProperties.getBoolean;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_VALUES;
import static org.apache.ignite.igfs.IgfsMode.PROXY;
import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_IGFS;
@@ -348,28 +346,6 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
ipcCfg.getThreadCount());
}
- long maxSpaceSize = cfg.getMaxSpaceSize();
-
- if (maxSpaceSize > 0) {
- // Max space validation.
- long maxHeapSize = Runtime.getRuntime().maxMemory();
- long offHeapSize = dataCacheCfg.getOffHeapMaxMemory();
-
- if (offHeapSize < 0 && maxSpaceSize > maxHeapSize)
- // Offheap is disabled.
- throw new IgniteCheckedException("Maximum IGFS space size cannot be greater that size of available heap " +
- "memory [maxHeapSize=" + maxHeapSize + ", maxIgfsSpaceSize=" + maxSpaceSize + ']');
- else if (offHeapSize > 0 && maxSpaceSize > maxHeapSize + offHeapSize)
- // Offheap is enabled, but limited.
- throw new IgniteCheckedException("Maximum IGFS space size cannot be greater than size of available heap " +
- "memory and offheap storage [maxHeapSize=" + maxHeapSize + ", offHeapSize=" + offHeapSize +
- ", maxIgfsSpaceSize=" + maxSpaceSize + ']');
- }
-
- if (cfg.getMaxSpaceSize() == 0 && dataCacheCfg.getMemoryMode() == OFFHEAP_VALUES)
- U.warn(log, "IGFS max space size is not specified but data cache values are stored off-heap (max " +
- "space will be limited to 80% of max JVM heap size): " + cfg.getName());
-
boolean secondary = cfg.getDefaultMode() == PROXY;
if (cfg.getPathModes() != null) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/60a2e28a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
index 29bb2cd..97334da 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
@@ -228,32 +228,6 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testLocalIfOffheapIsDisabledAndMaxSpaceSizeIsGreater() throws Exception {
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
-
- g1IgfsCfg2.setMaxSpaceSize(999999999999999999L);
-
- checkGridStartFails(g1Cfg, "Maximum IGFS space size cannot be greater that size of available heap", true);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testLocalIfOffheapIsEnabledAndMaxSpaceSizeIsGreater() throws Exception {
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
-
- for (CacheConfiguration cc : g1Cfg.getCacheConfiguration())
- cc.setOffHeapMaxMemory(1000000);
-
- g1IgfsCfg2.setMaxSpaceSize(999999999999999999L);
-
- checkGridStartFails(g1Cfg,
- "Maximum IGFS space size cannot be greater than size of available heap memory and offheap storage", true);
- }
-
- /**
- * @throws Exception If failed.
- */
public void testLocalIfNonPrimaryModeAndHadoopFileSystemUriIsNull() throws Exception {
g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
[05/10] ignite git commit: IGNITE-3353: IGFS: Fixed "out-of-space"
handling.
Posted by sb...@apache.org.
IGNITE-3353: IGFS: Fixed "out-of-space" handling.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c1000b17
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c1000b17
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c1000b17
Branch: refs/heads/ignite-3361
Commit: c1000b1763a072d823176ab81f08f7aeb4a17251
Parents: 05b3a0a
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Jun 22 16:40:49 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Jun 22 16:40:49 2016 +0300
----------------------------------------------------------------------
.../internal/processors/cache/GridCacheAdapter.java | 16 +++-------------
.../internal/processors/igfs/IgfsDataManager.java | 14 ++------------
.../processors/igfs/IgfsOutputStreamImpl.java | 10 ++++++++--
.../processors/igfs/IgfsDataManagerSelfTest.java | 6 +++---
4 files changed, 16 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c1000b17/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index b4daec2..1a55fe3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -344,19 +344,9 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
igfsDataSpaceMax = igfsCfg.getMaxSpaceSize();
- if (igfsDataSpaceMax == 0) {
- long maxMem = Runtime.getRuntime().maxMemory();
-
- // We leave JVM at least 500M of memory for correct operation.
- long jvmFreeSize = (maxMem - 512 * 1024 * 1024);
-
- if (jvmFreeSize <= 0)
- jvmFreeSize = maxMem / 2;
-
- long dfltMaxSize = (long)(0.8f * maxMem);
-
- igfsDataSpaceMax = Math.min(dfltMaxSize, jvmFreeSize);
- }
+ // Do we have limits?
+ if (igfsDataSpaceMax <= 0)
+ igfsDataSpaceMax = Long.MAX_VALUE;
}
break;
http://git-wip-us.apache.org/repos/asf/ignite/blob/c1000b17/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
index cb2b630..bdf3b08 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
@@ -465,23 +465,13 @@ public class IgfsDataManager extends IgfsManager {
* Notifies data manager that no further writes will be performed on stream.
*
* @param fileId File ID.
- * @param await Await completion.
* @throws IgniteCheckedException If failed.
*/
- public void writeClose(IgniteUuid fileId, boolean await) throws IgniteCheckedException {
+ public void writeClose(IgniteUuid fileId) throws IgniteCheckedException {
WriteCompletionFuture fut = pendingWrites.get(fileId);
- if (fut != null) {
+ if (fut != null)
fut.markWaitingLastAck();
-
- if (await)
- fut.get();
- }
- else {
- if (log.isDebugEnabled())
- log.debug("Failed to find write completion future for file in pending write map (most likely it was " +
- "failed): " + fileId);
- }
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/c1000b17/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
index 7741a25..f6b1104 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
@@ -23,6 +23,7 @@ import org.apache.ignite.igfs.IgfsException;
import org.apache.ignite.igfs.IgfsMode;
import org.apache.ignite.igfs.IgfsOutputStream;
import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
import org.apache.ignite.internal.util.typedef.internal.A;
import org.apache.ignite.internal.util.typedef.internal.S;
@@ -64,6 +65,9 @@ class IgfsOutputStreamImpl extends IgfsOutputStream {
/** Mutex for synchronization. */
private final Object mux = new Object();
+ /** Write completion future. */
+ private final IgniteInternalFuture<Boolean> writeFut;
+
/** Flag for this stream open/closed state. */
private boolean closed;
@@ -120,7 +124,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStream {
streamRange = initialStreamRange(fileInfo);
- igfsCtx.data().writeStart(fileInfo.id());
+ writeFut = igfsCtx.data().writeStart(fileInfo.id());
}
igfsCtx.igfs().localMetrics().incrementFilesOpenedForWrite();
@@ -300,7 +304,9 @@ class IgfsOutputStreamImpl extends IgfsOutputStream {
flushRemainder();
- igfsCtx.data().writeClose(fileInfo.id(), true);
+ igfsCtx.data().writeClose(fileInfo.id());
+
+ writeFut.get();
flushSuccess = true;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c1000b17/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
index 0d1a66f..70d6b99 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
@@ -195,7 +195,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
assert remainder == null;
- mgr.writeClose(info.id(), false);
+ mgr.writeClose(info.id());
fut.get(3000);
@@ -287,7 +287,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
assert left2 == null;
- mgr.writeClose(info.id(), false);
+ mgr.writeClose(info.id());
fut.get(3000);
@@ -369,7 +369,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
assert left == null : "No remainder should be returned if flush is true: " + Arrays.toString(left);
}
- mgr.writeClose(info.id(), false);
+ mgr.writeClose(info.id());
assertTrue(range.regionEqual(new IgfsFileAffinityRange(0, writesCnt * chunkSize - 1, null)));
[04/10] ignite git commit: IGNITE-3339 - Fixed entries eviction.
Posted by sb...@apache.org.
IGNITE-3339 - Fixed entries eviction.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b634a680
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b634a680
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b634a680
Branch: refs/heads/ignite-3361
Commit: b634a680735a83cfe4132aadfbda49dc8cb3bb0d
Parents: 8218a2a
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Wed Jun 22 06:34:57 2016 -0700
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Wed Jun 22 06:34:57 2016 -0700
----------------------------------------------------------------------
.../distributed/near/GridNearGetFuture.java | 8 +-
.../transactions/IgniteTxLocalAdapter.java | 12 +-
.../cache/transactions/IgniteTxManager.java | 16 +-
.../IgniteCacheTxIteratorSelfTest.java | 241 +++++++++++++++++++
.../testsuites/IgniteCacheTestSuite5.java | 2 +
5 files changed, 266 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b634a680/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
index 73b9d38..d94839c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
@@ -62,8 +62,6 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteUuid;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED;
-
/**
*
*/
@@ -630,7 +628,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap
catch (GridCacheEntryRemovedException ignored) {
// Retry.
}
- catch (GridDhtInvalidPartitionException e) {
+ catch (GridDhtInvalidPartitionException ignored) {
return false;
}
catch (IgniteCheckedException e) {
@@ -639,7 +637,9 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap
return false;
}
finally {
- if (dhtEntry != null && (tx == null || (!tx.implicit() && tx.isolation() == READ_COMMITTED)))
+ if (dhtEntry != null)
+ // Near cache is enabled, so near entry will be enlisted in the transaction.
+ // Always touch DHT entry in this case.
dht.context().evicts().touch(dhtEntry, topVer);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b634a680/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
index 28ecda5..105a582 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
@@ -1401,11 +1401,15 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
log.debug("Got removed entry in transaction getAllAsync(..) (will retry): " + key);
}
finally {
- if (cacheCtx.isNear() && entry != null && readCommitted()) {
- if (cacheCtx.affinity().belongs(cacheCtx.localNode(), entry.partition(), topVer)) {
- if (entry.markObsolete(xidVer))
- cacheCtx.cache().removeEntry(entry);
+ if (entry != null && readCommitted()) {
+ if (cacheCtx.isNear()) {
+ if (cacheCtx.affinity().belongs(cacheCtx.localNode(), entry.partition(), topVer)) {
+ if (entry.markObsolete(xidVer))
+ cacheCtx.cache().removeEntry(entry);
+ }
}
+ else
+ entry.context().evicts().touch(entry, topVer);
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b634a680/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
index 6e8f9fa..2aa174a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
@@ -1252,7 +1252,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter {
* @param tx Transaction to finish.
* @param commit {@code True} if transaction is committed, {@code false} if rolled back.
*/
- public void fastFinishTx(IgniteInternalTx tx, boolean commit) {
+ public void fastFinishTx(GridNearTxLocal tx, boolean commit) {
assert tx != null;
assert tx.writeMap().isEmpty();
assert tx.optimistic() || tx.readMap().isEmpty();
@@ -1263,16 +1263,22 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter {
// 1. Notify evictions.
notifyEvitions(tx);
- // 2. Remove obsolete entries.
+ // 2. Evict near entries.
+ if (!tx.readMap().isEmpty()) {
+ for (IgniteTxEntry entry : tx.readMap().values())
+ tx.evictNearEntry(entry, false);
+ }
+
+ // 3. Remove obsolete entries.
removeObsolete(tx);
- // 3. Remove from per-thread storage.
+ // 4. Remove from per-thread storage.
clearThreadMap(tx);
- // 4. Clear context.
+ // 5. Clear context.
resetContext();
- // 5. Update metrics.
+ // 6. Update metrics.
if (!tx.dht() && tx.local()) {
if (!tx.system()) {
if (commit)
http://git-wip-us.apache.org/repos/asf/ignite/blob/b634a680/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxIteratorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxIteratorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxIteratorSelfTest.java
new file mode 100644
index 0000000..769a5f6
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxIteratorSelfTest.java
@@ -0,0 +1,241 @@
+/*
+ * 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.cache.distributed;
+
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMemoryMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.configuration.TransactionConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.transactions.Transaction;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+
+import javax.cache.Cache;
+
+/**
+ *
+ */
+public class IgniteCacheTxIteratorSelfTest extends GridCommonAbstractTest {
+ /** */
+ public static final String CACHE_NAME = "testCache";
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ final IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ final TransactionConfiguration txCfg = new TransactionConfiguration();
+
+ txCfg.setDefaultTxIsolation(TransactionIsolation.READ_COMMITTED);
+
+ cfg.setTransactionConfiguration(txCfg);
+
+ return cfg;
+ }
+
+ /**
+ * @return Cache configuration.
+ */
+ private CacheConfiguration<String, TestClass> cacheConfiguration(
+ CacheMode mode,
+ CacheAtomicityMode atomMode,
+ CacheMemoryMode memMode,
+ boolean nearEnabled,
+ boolean useEvictPlc
+ ) {
+ final CacheConfiguration<String, TestClass> ccfg = new CacheConfiguration<>(CACHE_NAME);
+
+ ccfg.setAtomicityMode(atomMode);
+ ccfg.setCacheMode(mode);
+ ccfg.setMemoryMode(memMode);
+ ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+
+ if (nearEnabled)
+ ccfg.setNearConfiguration(new NearCacheConfiguration<String, TestClass>());
+
+ if (memMode == CacheMemoryMode.ONHEAP_TIERED && useEvictPlc) {
+ ccfg.setOffHeapMaxMemory(10 * 1024 * 1024);
+ ccfg.setEvictionPolicy(new FifoEvictionPolicy(50));
+ }
+
+ return ccfg;
+ }
+
+ /**
+ * @throws Exception if failed.
+ */
+ public void testModesSingleNode() throws Exception {
+ checkModes(1);
+ }
+
+ /**
+ * @throws Exception if failed.
+ */
+ public void testModesMultiNode() throws Exception {
+ checkModes(3);
+ }
+
+ /**
+ * @throws Exception if failed.
+ */
+ public void checkModes(int gridCnt) throws Exception {
+ startGrids(gridCnt);
+
+ try {
+ for (CacheMode mode : CacheMode.values()) {
+ for (CacheAtomicityMode atomMode : CacheAtomicityMode.values()) {
+ for (CacheMemoryMode memMode : CacheMemoryMode.values()) {
+ if (mode == CacheMode.PARTITIONED) {
+ // Near cache makes sense only for partitioned cache.
+ checkTxCache(CacheMode.PARTITIONED, atomMode, memMode, true, false);
+ }
+
+ if (memMode == CacheMemoryMode.ONHEAP_TIERED)
+ checkTxCache(mode, atomMode, CacheMemoryMode.ONHEAP_TIERED, false, true);
+
+ checkTxCache(mode, atomMode, memMode, false, false);
+ }
+ }
+ }
+ }
+ finally {
+ stopAllGrids();
+ }
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ private void checkTxCache(
+ CacheMode mode,
+ CacheAtomicityMode atomMode,
+ CacheMemoryMode memMode,
+ boolean nearEnabled,
+ boolean useEvicPlc
+ ) throws Exception {
+ final Ignite ignite = grid(0);
+
+ final CacheConfiguration<String, TestClass> ccfg = cacheConfiguration(
+ mode,
+ atomMode,
+ memMode,
+ nearEnabled,
+ useEvicPlc);
+
+ final IgniteCache<String, TestClass> cache = ignite.createCache(ccfg);
+
+ info("Checking cache [mode=" + mode + ", atomMode=" + atomMode + ", memMode=" + memMode +
+ ", near=" + nearEnabled + ']');
+
+ try {
+ for (int i = 0; i < 30; i++) {
+ final TestClass val = new TestClass("data");
+ final String key = "key-" + i;
+
+ cache.put(key, val);
+
+ assertEquals(i + 1, cache.size());
+
+ for (TransactionIsolation iso : TransactionIsolation.values()) {
+ for (TransactionConcurrency con : TransactionConcurrency.values()) {
+ try (Transaction transaction = ignite.transactions().txStart(con, iso)) {
+ assertEquals(val, cache.get(key));
+
+ transaction.commit();
+ }
+
+ int cnt = iterateOverKeys(cache);
+
+ assertEquals("Failed [con=" + con + ", iso=" + iso + ']', i + 1, cnt);
+
+ assertEquals("Failed [con=" + con + ", iso=" + iso + ']', i + 1, cache.size());
+ }
+ }
+ }
+ }
+ finally {
+ grid(0).destroyCache(CACHE_NAME);
+ }
+ }
+
+ /**
+ * @param cache Cache.
+ */
+ @SuppressWarnings("TypeMayBeWeakened")
+ private int iterateOverKeys(final IgniteCache<String, TestClass> cache) {
+ int cnt = 0;
+
+ for (final Cache.Entry<String, TestClass> ignore : cache)
+ cnt++;
+
+ return cnt;
+ }
+
+ /**
+ *
+ */
+ private static class TestClass {
+ /** */
+ private String data;
+
+ /**
+ * @param data Data.
+ */
+ private TestClass(String data) {
+ this.data = data;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean equals(final Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ final TestClass testCls = (TestClass)o;
+
+ return data != null ? data.equals(testCls.data) : testCls.data == null;
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public int hashCode() {
+ return data != null ? data.hashCode() : 0;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString() {
+ return S.toString(TestClass.class, this);
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/b634a680/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
index c5c5c67..98a3c44 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
@@ -23,6 +23,7 @@ import org.apache.ignite.internal.processors.cache.CacheSerializableTransactions
import org.apache.ignite.internal.processors.cache.EntryVersionConsistencyReadThroughTest;
import org.apache.ignite.internal.processors.cache.IgniteCachePutStackOverflowSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheStoreCollectionTest;
+import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheTxIteratorSelfTest;
import org.apache.ignite.internal.processors.cache.store.IgniteCacheWriteBehindNoUpdateSelfTest;
/**
@@ -42,6 +43,7 @@ public class IgniteCacheTestSuite5 extends TestSuite {
suite.addTestSuite(IgniteCacheWriteBehindNoUpdateSelfTest.class);
suite.addTestSuite(IgniteCachePutStackOverflowSelfTest.class);
suite.addTestSuite(EntryVersionConsistencyReadThroughTest.class);
+ suite.addTestSuite(IgniteCacheTxIteratorSelfTest.class);
return suite;
}
[08/10] ignite git commit: IGNITE-3366: Hadoop: better configuration
defaults.
Posted by sb...@apache.org.
IGNITE-3366: Hadoop: better configuration defaults.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3c8ac9a5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3c8ac9a5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3c8ac9a5
Branch: refs/heads/ignite-3361
Commit: 3c8ac9a54b78715229d2a0b707624435c3a9e11f
Parents: 60a2e28
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Jun 24 17:32:19 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Jun 24 17:32:19 2016 +0300
----------------------------------------------------------------------
.../org/apache/ignite/configuration/HadoopConfiguration.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3c8ac9a5/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java
index a2a2fbe..84014d6 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java
@@ -27,16 +27,16 @@ import org.jetbrains.annotations.Nullable;
*/
public class HadoopConfiguration {
/** Default finished job info time-to-live. */
- public static final long DFLT_FINISHED_JOB_INFO_TTL = 10_000;
+ public static final long DFLT_FINISHED_JOB_INFO_TTL = 30_000;
/** Default value for external execution flag. */
public static final boolean DFLT_EXTERNAL_EXECUTION = false;
/** Default value for the max parallel tasks. */
- public static final int DFLT_MAX_PARALLEL_TASKS = Runtime.getRuntime().availableProcessors();
+ public static final int DFLT_MAX_PARALLEL_TASKS = Runtime.getRuntime().availableProcessors() * 2;
/** Default value for the max task queue size. */
- public static final int DFLT_MAX_TASK_QUEUE_SIZE = 1000;
+ public static final int DFLT_MAX_TASK_QUEUE_SIZE = 8192;
/** Map reduce planner. */
private HadoopMapReducePlanner planner;
[06/10] ignite git commit: Merge remote-tracking branch
'upstream/gridgain-7.5.27' into gridgain-7.5.27
Posted by sb...@apache.org.
Merge remote-tracking branch 'upstream/gridgain-7.5.27' into gridgain-7.5.27
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c0120b9f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c0120b9f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c0120b9f
Branch: refs/heads/ignite-3361
Commit: c0120b9f2f4632014437f4338b378bea80c4d3d6
Parents: c1000b1 b634a68
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Jun 22 16:44:49 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Jun 22 16:44:49 2016 +0300
----------------------------------------------------------------------
.../distributed/near/GridNearGetFuture.java | 8 +-
.../transactions/IgniteTxLocalAdapter.java | 12 +-
.../cache/transactions/IgniteTxManager.java | 16 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 2 +-
.../IgniteCacheTxIteratorSelfTest.java | 241 +++++++++++++++++++
.../vm/TcpDiscoveryVmIpFinderSelfTest.java | 75 ++++++
.../testsuites/IgniteCacheTestSuite5.java | 2 +
7 files changed, 342 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
[02/10] ignite git commit: IGNITE-3351: Hadoop: Fixed
HadoopClassLoader leak into IGFS thread pool.
Posted by sb...@apache.org.
IGNITE-3351: Hadoop: Fixed HadoopClassLoader leak into IGFS thread pool.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/05b3a0a0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/05b3a0a0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/05b3a0a0
Branch: refs/heads/ignite-3361
Commit: 05b3a0a0c40d8bb66bf317e8b7709a80902a0e1b
Parents: 82761bd
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Jun 22 12:18:38 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Jun 22 12:18:38 2016 +0300
----------------------------------------------------------------------
.../core/src/main/java/org/apache/ignite/internal/IgnitionEx.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/05b3a0a0/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 29d7ff6..6f5b9a6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1690,6 +1690,9 @@ public class IgnitionEx {
0,
new LinkedBlockingQueue<Runnable>());
+ // Pre-start all threads to avoid HadoopClassLoader leaks.
+ ((ThreadPoolExecutor)igfsExecSvc).prestartAllCoreThreads();
+
// Note that we do not pre-start threads here as this pool may not be needed.
callbackExecSvc = new IgniteStripedThreadPoolExecutor(
cfg.getAsyncCallbackPoolSize(),
[03/10] ignite git commit: IGNITE-3152 Client node's addresses are
registered in IP finder
Posted by sb...@apache.org.
IGNITE-3152 Client node's addresses are registered in IP finder
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8218a2a7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8218a2a7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8218a2a7
Branch: refs/heads/ignite-3361
Commit: 8218a2a70cc0286a3ca4c63920ac0cfd1f436b43
Parents: 05b3a0a
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed Jun 22 12:43:05 2016 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed Jun 22 12:43:05 2016 +0300
----------------------------------------------------------------------
.../ignite/spi/discovery/tcp/ServerImpl.java | 2 +-
.../vm/TcpDiscoveryVmIpFinderSelfTest.java | 75 ++++++++++++++++++++
2 files changed, 76 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8218a2a7/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 7d4bac5..8621496 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -4016,7 +4016,7 @@ class ServerImpl extends TcpDiscoveryImpl {
notifyDiscovery(EVT_NODE_JOINED, topVer, node);
try {
- if (spi.ipFinder.isShared() && locNodeCoord)
+ if (spi.ipFinder.isShared() && locNodeCoord && !node.isClient())
spi.ipFinder.registerAddresses(node.socketAddresses());
}
catch (IgniteSpiException e) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/8218a2a7/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinderSelfTest.java
index 86587ba..aa00007 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinderSelfTest.java
@@ -19,8 +19,16 @@ package org.apache.ignite.spi.discovery.tcp.ipfinder.vm;
import java.util.Arrays;
import java.util.Collections;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.lang.GridAbsPredicate;
+import org.apache.ignite.internal.util.typedef.G;
import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAbstractSelfTest;
+import org.apache.ignite.testframework.GridTestUtils;
+
+import static org.apache.ignite.internal.processors.cache.binary.GridCacheBinaryObjectsAbstractSelfTest.IP_FINDER;
/**
* GridTcpDiscoveryVmIpFinder test.
@@ -190,4 +198,71 @@ public class TcpDiscoveryVmIpFinderSelfTest
assertEquals("Registered addresses: " + finder.getRegisteredAddresses().toString(),
10, finder.getRegisteredAddresses().size());
}
+
+ /**
+ *
+ */
+ public void testUnregistration() throws Exception {
+ Ignition.start(config("server1", false, false));
+
+ int srvSize = IP_FINDER.getRegisteredAddresses().size();
+
+ Ignition.start(config("server2", false, false));
+ Ignition.start(config("client1", true, false));
+
+ assertEquals(2 * srvSize, IP_FINDER.getRegisteredAddresses().size());
+
+ Ignition.start(config("client2", true, false));
+ Ignition.start(config("client3", true, false));
+
+ assertEquals(2 * srvSize, IP_FINDER.getRegisteredAddresses().size());
+
+ Ignition.start(config("client4", true, true));
+
+ assertEquals(3 * srvSize, IP_FINDER.getRegisteredAddresses().size());
+
+ Ignition.stop("client1", true);
+ Ignition.stop("client2", true);
+
+ assertEquals(3 * srvSize, IP_FINDER.getRegisteredAddresses().size());
+
+ Ignition.stop("client4", true);
+
+ GridTestUtils.waitForCondition(new GridAbsPredicate() {
+ @Override public boolean apply() {
+ return 2 == G.allGrids().size();
+ }
+ }, 10000);
+
+ Ignition.stop("server1", true);
+ Ignition.stop("server2", true);
+
+ GridTestUtils.waitForCondition(new GridAbsPredicate() {
+ @Override public boolean apply() {
+ return 0 == G.allGrids().size();
+ }
+ }, 10000);
+
+ assertTrue(3 * srvSize >= IP_FINDER.getRegisteredAddresses().size());
+ }
+
+ /**
+ * @param name Name.
+ * @param client Client.
+ */
+ private static IgniteConfiguration config(String name, boolean client, boolean forceServerMode) {
+ IgniteConfiguration cfg = new IgniteConfiguration();
+
+ cfg.setGridName(name);
+ cfg.setClientMode(client);
+
+ TcpDiscoverySpi disco = new TcpDiscoverySpi();
+
+ disco.setForceServerMode(forceServerMode);
+ disco.setIpFinder(IP_FINDER);
+
+ cfg.setDiscoverySpi(disco);
+
+ return cfg;
+ }
}
\ No newline at end of file
[09/10] ignite git commit: IGNITE-3367: Hadoop: greater idle timeout
for protocol client.
Posted by sb...@apache.org.
IGNITE-3367: Hadoop: greater idle timeout for protocol client.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/46ba7011
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/46ba7011
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/46ba7011
Branch: refs/heads/ignite-3361
Commit: 46ba701174a2d79badb96d0b522254c296dc9d6b
Parents: 3c8ac9a
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Jun 24 17:36:55 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Jun 24 17:36:55 2016 +0300
----------------------------------------------------------------------
.../ignite/hadoop/mapreduce/IgniteHadoopClientProtocolProvider.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/46ba7011/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopClientProtocolProvider.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopClientProtocolProvider.java b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopClientProtocolProvider.java
index e40abe0..583af35 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopClientProtocolProvider.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopClientProtocolProvider.java
@@ -117,6 +117,7 @@ public class IgniteHadoopClientProtocolProvider extends ClientProtocolProvider {
cliCfg.setProtocol(TCP);
cliCfg.setServers(Collections.singletonList(addr));
cliCfg.setMarshaller(new GridClientJdkMarshaller());
+ cliCfg.setMaxConnectionIdleTime(24 * 60 * 60 * 1000L); // 1 day.
cliCfg.setDaemon(true);
try {