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 2017/07/19 09:27:12 UTC
[01/32] ignite git commit: Fixed NPE in tests
Repository: ignite
Updated Branches:
refs/heads/ignite-5578 c7a606905 -> a7cb82962
Fixed NPE in tests
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/18bdfe96
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/18bdfe96
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/18bdfe96
Branch: refs/heads/ignite-5578
Commit: 18bdfe96a1e579371108c661e3374183c58a296d
Parents: 3c1749d
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Thu Jul 13 15:42:30 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Thu Jul 13 15:42:30 2017 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/database/BPlusTreeSelfTest.java | 4 +++-
.../internal/processors/database/FreeListImplSelfTest.java | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/18bdfe96/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
index fadfc23..4a32df2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
@@ -1774,7 +1774,9 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest {
* @return Page memory.
*/
protected PageMemory createPageMemory() throws Exception {
- MemoryPolicyConfiguration plcCfg = new MemoryPolicyConfiguration().setMaxSize(1024 * MB);
+ MemoryPolicyConfiguration plcCfg = new MemoryPolicyConfiguration()
+ .setInitialSize(1024 * MB)
+ .setMaxSize(1024 * MB);
PageMemory pageMem = new PageMemoryNoStoreImpl(log,
new UnsafeMemoryProvider(log),
http://git-wip-us.apache.org/repos/asf/ignite/blob/18bdfe96/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java
index d650ac1..c190b1d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java
@@ -335,7 +335,9 @@ public class FreeListImplSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
protected FreeList createFreeList(int pageSize) throws Exception {
- MemoryPolicyConfiguration plcCfg = new MemoryPolicyConfiguration().setMaxSize(1024 * MB);
+ MemoryPolicyConfiguration plcCfg = new MemoryPolicyConfiguration()
+ .setInitialSize(1024 * MB)
+ .setMaxSize(1024 * MB);
pageMem = createPageMemory(pageSize, plcCfg);
[31/32] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-5578
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-5578
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ef1dd608
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ef1dd608
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ef1dd608
Branch: refs/heads/ignite-5578
Commit: ef1dd608ad6c2f95e3bc9c94d1f256833da79bbc
Parents: 3b46d47 cde3da4
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jul 19 12:19:57 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jul 19 12:19:57 2017 +0300
----------------------------------------------------------------------
.../apache/ignite/IgniteSystemProperties.java | 20 +++
.../communication/GridIoMessageFactory.java | 2 +-
.../MetaPageUpdatePartitionDataRecord.java | 2 +
.../cache/CacheObjectsReleaseFuture.java | 60 +++++++++
.../cache/GridCacheExplicitLockSpan.java | 10 +-
.../processors/cache/GridCacheMvccManager.java | 24 +++-
.../cache/GridCacheSharedContext.java | 4 +-
...idNearAtomicAbstractSingleUpdateRequest.java | 9 +-
...GridNearAtomicSingleUpdateInvokeRequest.java | 6 +
.../atomic/GridNearAtomicUpdateResponse.java | 2 +-
.../GridDhtPartitionsExchangeFuture.java | 30 +++--
.../persistence/GridCacheOffheapManager.java | 2 +-
.../cache/transactions/IgniteTxAdapter.java | 44 ++++++-
.../cache/transactions/IgniteTxManager.java | 5 +-
.../service/GridServiceProcessor.java | 4 +-
.../processors/service/ServiceContextImpl.java | 2 +
.../util/future/GridCompoundFuture.java | 6 +-
.../util/tostring/GridToStringBuilder.java | 2 +-
.../spi/IgniteSpiOperationTimeoutHelper.java | 8 +-
.../communication/tcp/TcpCommunicationSpi.java | 131 ++++++++++++-------
.../ignite/spi/discovery/tcp/ServerImpl.java | 72 +++++++---
.../spi/discovery/tcp/TcpDiscoverySpi.java | 16 ++-
.../ignite/internal/GridVersionSelfTest.java | 2 +
.../IgniteClientReconnectAbstractTest.java | 5 +
...UpdateNotifierPerClusterSettingSelfTest.java | 2 +
.../cache/GridCachePutAllFailoverSelfTest.java | 15 +++
.../cache/IgniteCachePutAllRestartTest.java | 15 +++
.../CacheGetInsideLockChangingTopologyTest.java | 5 +
.../GridCacheAbstractNodeRestartSelfTest.java | 12 +-
...titionEvictionDuringReadThroughSelfTest.java | 1 +
...niteBinaryMetadataUpdateNodeRestartTest.java | 10 ++
.../distributed/IgniteCacheGetRestartTest.java | 5 +
.../IgniteCacheNearRestartRollbackSelfTest.java | 15 +++
...teSynchronizationModesMultithreadedTest.java | 5 +
.../IgniteCachePutRetryAbstractSelfTest.java | 5 +
.../GridCacheReplicatedNodeRestartSelfTest.java | 2 +-
.../processors/database/BPlusTreeSelfTest.java | 4 +-
.../database/FreeListImplSelfTest.java | 4 +-
.../org/apache/ignite/spi/GridTcpForwarder.java | 26 ++++
.../tcp/TcpCommunicationSpiDropNodesTest.java | 15 +++
.../TcpCommunicationSpiFaultyClientTest.java | 20 ++-
.../IgniteCacheRestartTestSuite2.java | 2 +
.../cache/IgnitePutTxLoadBenchmark.java | 3 +-
43 files changed, 511 insertions(+), 123 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ef1dd608/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index 003c2f0,29c89a5..97e06bf
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@@ -870,16 -869,10 +870,16 @@@ public class GridIoMessageFactory imple
break;
- // [-3..119] [124..127] [-23..-27] [-36..-55]- this
+ case 128:
+ msg = new CacheGroupAffinityMessage();
+
+ break;
+
+
+ // [-3..119] [124..128] [-23..-27] [-36..-55]- this
// [120..123] - DR
// [-4..-22, -30..-35] - SQL
- // [-54..-60] - Snapshots
+ // [2048..2053] - Snapshots
default:
if (ext != null) {
for (MessageFactory factory : ext) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/ef1dd608/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 3dca230,c4a4f83..3166401
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@@ -961,16 -896,18 +966,17 @@@ public class GridDhtPartitionsExchangeF
try {
long start = U.currentTimeMillis();
- IgniteInternalFuture fut = cctx.snapshot()
- .tryStartLocalSnapshotOperation(discoEvt);
+ IgniteInternalFuture fut = cctx.snapshot().tryStartLocalSnapshotOperation(discoEvt);
- if (fut != null)
+ if (fut != null) {
fut.get();
- long end = U.currentTimeMillis();
+ long end = U.currentTimeMillis();
- if (log.isInfoEnabled())
- log.info("Snapshot initialization completed [topVer=" + exchangeId().topologyVersion() +
- ", time=" + (end - start) + "ms]");
+ if (log.isInfoEnabled())
+ log.info("Snapshot initialization completed [topVer=" + exchangeId().topologyVersion() +
+ ", time=" + (end - start) + "ms]");
+ }
}
catch (IgniteCheckedException e) {
U.error(log, "Error while starting snapshot operation", e);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ef1dd608/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
----------------------------------------------------------------------
[24/32] ignite git commit: Merge remote-tracking branch
'origin/master'
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bd5e8a02
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bd5e8a02
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bd5e8a02
Branch: refs/heads/ignite-5578
Commit: bd5e8a02b25b8fa39d5a9c479498cf14bdb935cd
Parents: 54585ab 2a0d9d6
Author: sboikov <sb...@gridgain.com>
Authored: Tue Jul 18 17:53:08 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Jul 18 17:53:08 2017 +0300
----------------------------------------------------------------------
.../processors/rest/handlers/cache/GridCacheCommandHandler.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[12/32] ignite git commit: IGNITE-5515: Tests were enabled to get
hangup on TC
Posted by sb...@apache.org.
IGNITE-5515: Tests were enabled to get hangup on TC
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2b504869
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2b504869
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2b504869
Branch: refs/heads/ignite-5578
Commit: 2b50486983fcda8d4b599d9af33e08673e87668e
Parents: b32800a
Author: dpavlov <dp...@gridgain.com>
Authored: Fri Jul 14 21:10:06 2017 +0300
Committer: dpavlov <dp...@gridgain.com>
Committed: Fri Jul 14 21:10:06 2017 +0300
----------------------------------------------------------------------
.../replicated/GridCacheReplicatedNodeRestartSelfTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2b504869/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java
index 22f7adf..bff8755 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java
@@ -51,7 +51,7 @@ public class GridCacheReplicatedNodeRestartSelfTest extends GridCacheAbstractNod
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-5515");
+ //outcommented to get failure on TC: fail("https://issues.apache.org/jira/browse/IGNITE-5515");
}
/** {@inheritDoc} */
[18/32] ignite git commit: Added test in suite.
Posted by sb...@apache.org.
Added test in suite.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/32f5cbc3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/32f5cbc3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/32f5cbc3
Branch: refs/heads/ignite-5578
Commit: 32f5cbc30228129c238dcb3a15394d9a438985c3
Parents: 644c9f3
Author: sboikov <sb...@gridgain.com>
Authored: Tue Jul 18 12:15:46 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Jul 18 12:15:46 2017 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/32f5cbc3/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java
index f09973b..5b562c3 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java
@@ -18,11 +18,12 @@
package org.apache.ignite.testsuites;
import junit.framework.TestSuite;
+import org.apache.ignite.internal.processors.cache.IgniteClusterActivateDeactivateTestWithPersistence;
import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsClientNearCachePutGetTest;
import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsDynamicCacheTest;
import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsSingleNodePutGetPersistenceTest;
-import org.apache.ignite.internal.processors.cache.persistence.db.file.IgnitePdsEvictionTest;
import org.apache.ignite.internal.processors.cache.persistence.db.file.IgnitePdsCheckpointSimulationWithRealCpDisabledTest;
+import org.apache.ignite.internal.processors.cache.persistence.db.file.IgnitePdsEvictionTest;
import org.apache.ignite.internal.processors.cache.persistence.pagemem.BPlusTreePageMemoryImplTest;
import org.apache.ignite.internal.processors.cache.persistence.pagemem.BPlusTreeReuseListPageMemoryImplTest;
import org.apache.ignite.internal.processors.cache.persistence.pagemem.MetadataStoragePageMemoryImplTest;
@@ -71,6 +72,8 @@ public class IgnitePdsTestSuite extends TestSuite {
suite.addTestSuite(IgnitePdsDynamicCacheTest.class);
suite.addTestSuite(IgnitePdsClientNearCachePutGetTest.class);
+ suite.addTestSuite(IgniteClusterActivateDeactivateTestWithPersistence.class);
+
return suite;
}
}
[16/32] ignite git commit: Merge branch 'ignite-2.1'
Posted by sb...@apache.org.
Merge branch 'ignite-2.1'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/624b451b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/624b451b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/624b451b
Branch: refs/heads/ignite-5578
Commit: 624b451b2daad843c50fe359e61759c78ea951de
Parents: 621b0ed 1a2dde9
Author: devozerov <vo...@gridgain.com>
Authored: Mon Jul 17 15:13:05 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Mon Jul 17 15:13:05 2017 +0300
----------------------------------------------------------------------
examples/pom.xml | 7 +++++++
modules/geospatial/pom.xml | 24 ++++++++++++++++++++++++
modules/hibernate-4.2/pom.xml | 24 ++++++++++++++++++++++++
modules/hibernate-5.1/pom.xml | 24 ++++++++++++++++++++++++
modules/schedule/pom.xml | 24 ++++++++++++++++++++++++
5 files changed, 103 insertions(+)
----------------------------------------------------------------------
[07/32] ignite git commit: GridCacheAbstractNodeRestartSelfTest
stopping all grids after each test to prevent subsequent test failures when
one test fails or hangs
Posted by sb...@apache.org.
GridCacheAbstractNodeRestartSelfTest stopping all grids after each test to prevent subsequent test failures when one test fails or hangs
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d5cc82cb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d5cc82cb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d5cc82cb
Branch: refs/heads/ignite-5578
Commit: d5cc82cb09cf37da783c9bcfbf6743b8910ceb30
Parents: 1e7e692
Author: Sergey Chugunov <se...@gmail.com>
Authored: Fri Jul 14 14:52:09 2017 +0300
Committer: Sergey Chugunov <se...@gmail.com>
Committed: Fri Jul 14 14:52:09 2017 +0300
----------------------------------------------------------------------
.../cache/distributed/GridCacheAbstractNodeRestartSelfTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d5cc82cb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
index 211cc34..8d5a4aa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
@@ -165,7 +165,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
+ @Override protected void afterTest() throws Exception {
stopAllGrids();
}
[26/32] ignite git commit: Fixed test.
Posted by sb...@apache.org.
Fixed test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b3bce81d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b3bce81d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b3bce81d
Branch: refs/heads/ignite-5578
Commit: b3bce81d13c4a7d064f0a5edc0c364d39bb5096e
Parents: bd5e8a0
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jul 19 07:25:21 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jul 19 07:25:21 2017 +0300
----------------------------------------------------------------------
.../processors/cache/IgniteDynamicCacheMultinodeTest.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b3bce81d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheMultinodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheMultinodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheMultinodeTest.java
index d362189..28edb5e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheMultinodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheMultinodeTest.java
@@ -92,6 +92,7 @@ public class IgniteDynamicCacheMultinodeTest extends GridCommonAbstractTest {
}
/**
+ * @param op Operation to test.
* @throws Exception If failed.
*/
private void createCacheMultinode(final TestOp op) throws Exception {
@@ -135,6 +136,8 @@ public class IgniteDynamicCacheMultinodeTest extends GridCommonAbstractTest {
for (String cache : ignite(0).cacheNames())
ignite(0).destroyCache(cache);
+
+ awaitPartitionMapExchange();
}
}
[30/32] ignite git commit: Merge branch 'ignite-2.1.3' of
https://github.com/gridgain/apache-ignite
Posted by sb...@apache.org.
Merge branch 'ignite-2.1.3' of https://github.com/gridgain/apache-ignite
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cde3da44
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cde3da44
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cde3da44
Branch: refs/heads/ignite-5578
Commit: cde3da448e297846e0ae5aca58a8f8f07fc407fc
Parents: e5f2d90 23f26af
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Wed Jul 19 12:13:01 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Wed Jul 19 12:13:01 2017 +0300
----------------------------------------------------------------------
.../apache/ignite/IgniteSystemProperties.java | 20 +++
.../cache/CacheObjectsReleaseFuture.java | 60 +++++++++
.../cache/GridCacheExplicitLockSpan.java | 10 +-
.../processors/cache/GridCacheMvccManager.java | 24 +++-
.../cache/GridCacheSharedContext.java | 4 +-
...idNearAtomicAbstractSingleUpdateRequest.java | 9 +-
...GridNearAtomicSingleUpdateInvokeRequest.java | 6 +
.../atomic/GridNearAtomicUpdateResponse.java | 2 +-
.../GridDhtPartitionsExchangeFuture.java | 30 +++--
.../cache/transactions/IgniteTxAdapter.java | 44 ++++++-
.../cache/transactions/IgniteTxManager.java | 5 +-
.../service/GridServiceProcessor.java | 4 +-
.../processors/service/ServiceContextImpl.java | 2 +
.../util/future/GridCompoundFuture.java | 6 +-
.../util/tostring/GridToStringBuilder.java | 2 +-
.../spi/IgniteSpiOperationTimeoutHelper.java | 8 +-
.../communication/tcp/TcpCommunicationSpi.java | 131 ++++++++++++-------
.../ignite/spi/discovery/tcp/ServerImpl.java | 72 +++++++---
.../spi/discovery/tcp/TcpDiscoverySpi.java | 16 ++-
.../IgniteClientReconnectAbstractTest.java | 5 +
.../cache/GridCachePutAllFailoverSelfTest.java | 15 +++
.../cache/IgniteCachePutAllRestartTest.java | 15 +++
.../CacheGetInsideLockChangingTopologyTest.java | 5 +
.../GridCacheAbstractNodeRestartSelfTest.java | 12 +-
...niteBinaryMetadataUpdateNodeRestartTest.java | 10 ++
.../distributed/IgniteCacheGetRestartTest.java | 5 +
.../IgniteCacheNearRestartRollbackSelfTest.java | 15 +++
...teSynchronizationModesMultithreadedTest.java | 5 +
.../IgniteCachePutRetryAbstractSelfTest.java | 5 +
.../org/apache/ignite/spi/GridTcpForwarder.java | 26 ++++
.../tcp/TcpCommunicationSpiDropNodesTest.java | 15 +++
.../TcpCommunicationSpiFaultyClientTest.java | 20 ++-
.../IgniteCacheRestartTestSuite2.java | 2 +
33 files changed, 494 insertions(+), 116 deletions(-)
----------------------------------------------------------------------
[04/32] ignite git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-2.1.3
Posted by sb...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-2.1.3
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2788a740
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2788a740
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2788a740
Branch: refs/heads/ignite-5578
Commit: 2788a740c9aec88d14808d5927a346d121ad42b1
Parents: 18bdfe9 7338445
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Fri Jul 14 12:23:42 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Jul 14 12:23:42 2017 +0300
----------------------------------------------------------------------
examples/config/example-memory-policies.xml | 7 +-
.../jmh/cache/JmhCacheLocksBenchmark.java | 119 +
.../apache/ignite/cache/affinity/Affinity.java | 16 +-
.../rendezvous/RendezvousAffinityFunction.java | 4 +-
.../org/apache/ignite/internal/IgnitionEx.java | 5 +-
.../ignite/internal/binary/BinaryUtils.java | 19 +-
.../internal/binary/BinaryWriterExImpl.java | 4 +-
.../binary/builder/BinaryBuilderSerializer.java | 6 +-
.../eventstorage/GridEventStorageManager.java | 309 +--
.../eventstorage/HighPriorityListener.java | 28 +
.../cache/CacheAffinitySharedManager.java | 211 +-
.../processors/cache/GridCacheMvccManager.java | 5 -
.../GridCachePartitionExchangeManager.java | 140 +-
.../processors/cache/GridCachePreloader.java | 8 +-
.../cache/GridCachePreloaderAdapter.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 2 -
.../cache/distributed/dht/GridDhtTxLocal.java | 13 -
.../preloader/ForceRebalanceExchangeTask.java | 58 +
.../dht/preloader/GridDhtPartitionDemander.java | 22 +-
.../preloader/GridDhtPartitionExchangeId.java | 61 +-
.../GridDhtPartitionsExchangeFuture.java | 136 +-
.../dht/preloader/GridDhtPreloader.java | 33 +-
.../preloader/GridDhtPreloaderAssignments.java | 21 +-
.../RebalanceReassignExchangeTask.java | 44 +
.../continuous/GridContinuousProcessor.java | 91 +-
.../communication/tcp/TcpCommunicationSpi.java | 30 +-
.../tcp/internal/TcpDiscoveryStatistics.java | 6 +-
.../internal/binary/BinaryEnumsSelfTest.java | 71 +
.../binary/BinaryMarshallerSelfTest.java | 61 +
.../sink/flink/FlinkIgniteSinkSelfTest.java | 2 +-
.../Apache.Ignite.Core.Tests.csproj | 17 +-
.../Cache/Query/CacheLinqTest.cs | 2084 ------------------
.../Cache/Query/CacheLinqTestSimpleName.cs | 35 -
.../Cache/Query/CacheLinqTestSqlEscapeAll.cs | 34 -
.../Query/Linq/CacheLinqTest.Aggregates.cs | 91 +
.../Cache/Query/Linq/CacheLinqTest.Base.cs | 506 +++++
.../Query/Linq/CacheLinqTest.CompiledQuery.cs | 215 ++
.../Cache/Query/Linq/CacheLinqTest.Contains.cs | 128 ++
.../Cache/Query/Linq/CacheLinqTest.Custom.cs | 107 +
.../Cache/Query/Linq/CacheLinqTest.DateTime.cs | 89 +
.../Cache/Query/Linq/CacheLinqTest.Functions.cs | 211 ++
.../Query/Linq/CacheLinqTest.Introspection.cs | 145 ++
.../Linq/CacheLinqTest.Join.LocalCollection.cs | 182 ++
.../Cache/Query/Linq/CacheLinqTest.Join.cs | 310 +++
.../Cache/Query/Linq/CacheLinqTest.Misc.cs | 350 +++
.../Cache/Query/Linq/CacheLinqTest.Numerics.cs | 131 ++
.../Cache/Query/Linq/CacheLinqTest.Strings.cs | 91 +
.../Cache/Query/Linq/CacheLinqTestSimpleName.cs | 35 +
.../Query/Linq/CacheLinqTestSqlEscapeAll.cs | 34 +
.../cache/IgniteCacheLockBenchmark.java | 57 +
.../yardstick/cache/IgniteLockBenchmark.java | 47 +
51 files changed, 3664 insertions(+), 2771 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2788a740/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2788a740/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
[27/32] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-5578-locJoin
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-5578-locJoin
# Conflicts:
# modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f006bfb8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f006bfb8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f006bfb8
Branch: refs/heads/ignite-5578
Commit: f006bfb88ae949de1509c01654aaf99566521b58
Parents: 5307bcb b3bce81
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jul 19 08:22:38 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jul 19 08:22:38 2017 +0300
----------------------------------------------------------------------
examples/pom.xml | 7 +
.../discovery/GridDiscoveryManager.java | 38 ++++-
.../cache/query/GridCacheQueryResponse.java | 4 +-
.../handlers/cache/GridCacheCommandHandler.java | 4 +-
.../IgniteClusterActivateDeactivateTest.java | 9 +-
.../cache/IgniteDynamicCacheMultinodeTest.java | 171 +++++++++++++++++++
.../testsuites/IgniteCacheTestSuite4.java | 2 +
modules/geospatial/pom.xml | 24 +++
modules/hibernate-4.2/pom.xml | 24 +++
modules/hibernate-5.1/pom.xml | 24 +++
modules/schedule/pom.xml | 24 +++
11 files changed, 319 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f006bfb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java
----------------------------------------------------------------------
[15/32] ignite git commit: IGNITE-5762: LGPL modules are no longer
deployed into Maven repository.
Posted by sb...@apache.org.
IGNITE-5762: LGPL modules are no longer deployed into Maven repository.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1a2dde91
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1a2dde91
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1a2dde91
Branch: refs/heads/ignite-5578
Commit: 1a2dde91083a2d733e2ccc1c03bc9959caa921af
Parents: 3c1749d
Author: Oleg Ostanin <oo...@gridgain.com>
Authored: Mon Jul 17 15:10:36 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Mon Jul 17 15:10:36 2017 +0300
----------------------------------------------------------------------
examples/pom.xml | 7 +++++++
modules/geospatial/pom.xml | 24 ++++++++++++++++++++++++
modules/hibernate-4.2/pom.xml | 24 ++++++++++++++++++++++++
modules/hibernate-5.1/pom.xml | 24 ++++++++++++++++++++++++
modules/schedule/pom.xml | 24 ++++++++++++++++++++++++
5 files changed, 103 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1a2dde91/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 58da342..6042781 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -312,6 +312,13 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/ignite/blob/1a2dde91/modules/geospatial/pom.xml
----------------------------------------------------------------------
diff --git a/modules/geospatial/pom.xml b/modules/geospatial/pom.xml
index c715ffa..488a4a4 100644
--- a/modules/geospatial/pom.xml
+++ b/modules/geospatial/pom.xml
@@ -83,6 +83,23 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>lgpl</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<!-- Generate the OSGi MANIFEST.MF for this bundle.
@@ -99,6 +116,13 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/ignite/blob/1a2dde91/modules/hibernate-4.2/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate-4.2/pom.xml b/modules/hibernate-4.2/pom.xml
index adcf1b1..e40a550 100644
--- a/modules/hibernate-4.2/pom.xml
+++ b/modules/hibernate-4.2/pom.xml
@@ -132,6 +132,23 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>lgpl</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<build>
<testResources>
<testResource>
@@ -154,6 +171,13 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/ignite/blob/1a2dde91/modules/hibernate-5.1/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate-5.1/pom.xml b/modules/hibernate-5.1/pom.xml
index 8424806..a99408e 100644
--- a/modules/hibernate-5.1/pom.xml
+++ b/modules/hibernate-5.1/pom.xml
@@ -132,6 +132,23 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>lgpl</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<build>
<testResources>
<testResource>
@@ -154,6 +171,13 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/ignite/blob/1a2dde91/modules/schedule/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml
index 22c2571..2686701 100644
--- a/modules/schedule/pom.xml
+++ b/modules/schedule/pom.xml
@@ -83,6 +83,23 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>lgpl</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<!-- Generate the OSGi MANIFEST.MF for this fragment. It is a fragment because it contains internal processors
@@ -96,6 +113,13 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
[14/32] ignite git commit: GG-12495 SaveStoreMetadata doesn't work
for local cache. Got NPE.
Posted by sb...@apache.org.
GG-12495 SaveStoreMetadata doesn't work for local cache. Got NPE.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0d6b7308
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0d6b7308
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0d6b7308
Branch: refs/heads/ignite-5578
Commit: 0d6b73081725d006947a11bfe787bf01f0e869f4
Parents: 310d903
Author: Ivan Rakov <iv...@gmail.com>
Authored: Mon Jul 17 13:25:58 2017 +0300
Committer: Ivan Rakov <iv...@gmail.com>
Committed: Mon Jul 17 13:25:58 2017 +0300
----------------------------------------------------------------------
.../wal/record/delta/MetaPageUpdatePartitionDataRecord.java | 2 ++
.../processors/cache/persistence/GridCacheOffheapManager.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0d6b7308/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdatePartitionDataRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdatePartitionDataRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdatePartitionDataRecord.java
index f85f468..a6ed7c5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdatePartitionDataRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdatePartitionDataRecord.java
@@ -111,6 +111,8 @@ public class MetaPageUpdatePartitionDataRecord extends PageDeltaRecord {
io.setGlobalRemoveId(pageAddr, globalRmvId);
io.setSize(pageAddr, partSize);
io.setCountersPageId(pageAddr, cntrsPageId);
+ io.setPartitionState(pageAddr, state);
+ io.setCandidatePageCount(pageAddr, allocatedIdxCandidate);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/0d6b7308/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
index 6e6b7df..ed6eee2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
@@ -363,7 +363,7 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple
rmvId,
size,
cntrsPageId,
- (byte)state.ordinal(),
+ state == null ? -1 : (byte)state.ordinal(),
pageCnt
));
}
[11/32] ignite git commit: Corrected benchmark output
Posted by sb...@apache.org.
Corrected benchmark output
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b32800a0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b32800a0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b32800a0
Branch: refs/heads/ignite-5578
Commit: b32800a0ec573fb60b77bd00cb04578c5114233b
Parents: e7ed26b
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Fri Jul 14 20:17:15 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Jul 14 20:17:44 2017 +0300
----------------------------------------------------------------------
.../apache/ignite/yardstick/cache/IgnitePutTxLoadBenchmark.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b32800a0/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxLoadBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxLoadBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxLoadBenchmark.java
index 7ac7c3a..eb3abb2 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxLoadBenchmark.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxLoadBenchmark.java
@@ -84,13 +84,12 @@ public class IgnitePutTxLoadBenchmark extends IgniteCacheAbstractBenchmark<Integ
tx.commit();
endTime = System.currentTimeMillis();
-
}
TransactionMetrics tm = transactions.metrics();
if (endTime - startTime > args.getWarningTime())
- BenchmarkUtils.println("Transaction commit time = " + (tm.commitTime() - startTime));
+ BenchmarkUtils.println("Transaction commit time = " + (endTime - startTime));
if (tm.txRollbacks() > 0 && args.printRollBacks())
BenchmarkUtils.println("Transaction rollbacks = " + tm.txRollbacks());
[02/32] ignite git commit: Functionality of muted test is debated now
Posted by sb...@apache.org.
Functionality of muted test is debated now
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d9ed07c6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d9ed07c6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d9ed07c6
Branch: refs/heads/ignite-5578
Commit: d9ed07c67e4a4ff3a9de543cbe039ac2a48f03a0
Parents: 18bdfe9
Author: Sergey Chugunov <se...@gmail.com>
Authored: Thu Jul 13 17:32:06 2017 +0300
Committer: Sergey Chugunov <se...@gmail.com>
Committed: Thu Jul 13 17:32:06 2017 +0300
----------------------------------------------------------------------
.../internal/IgniteUpdateNotifierPerClusterSettingSelfTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d9ed07c6/modules/core/src/test/java/org/apache/ignite/internal/IgniteUpdateNotifierPerClusterSettingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteUpdateNotifierPerClusterSettingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteUpdateNotifierPerClusterSettingSelfTest.java
index a348ea5..5f11088 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteUpdateNotifierPerClusterSettingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteUpdateNotifierPerClusterSettingSelfTest.java
@@ -66,6 +66,8 @@ public class IgniteUpdateNotifierPerClusterSettingSelfTest extends GridCommonAbs
* @throws Exception If failed.
*/
public void testNotifierEnabledForCluster() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-5413");
+
checkNotifierStatusForCluster(true);
}
[23/32] ignite git commit: Fixed test
IgniteClusterActivateDeactivateTestWithPersistence.
Posted by sb...@apache.org.
Fixed test IgniteClusterActivateDeactivateTestWithPersistence.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/54585ab3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/54585ab3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/54585ab3
Branch: refs/heads/ignite-5578
Commit: 54585ab3ea98b3236ac2635440ed496fb24742d8
Parents: 32f5cbc
Author: sboikov <sb...@gridgain.com>
Authored: Tue Jul 18 17:52:51 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Jul 18 17:52:51 2017 +0300
----------------------------------------------------------------------
.../processors/cache/query/GridCacheQueryResponse.java | 4 ++--
.../cache/IgniteClusterActivateDeactivateTest.java | 9 +++++++--
2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/54585ab3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java
index 521aacf..13e0915 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java
@@ -130,10 +130,10 @@ public class GridCacheQueryResponse extends GridCacheIdMessage implements GridCa
if (err != null && errBytes == null)
errBytes = U.marshal(ctx, err);
- if (metaDataBytes == null)
+ if (metaDataBytes == null && metadata != null)
metaDataBytes = marshalCollection(metadata, cctx);
- if (dataBytes == null)
+ if (dataBytes == null && data != null)
dataBytes = marshalCollection(data, cctx);
if (addDepInfo && !F.isEmpty(data)) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/54585ab3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java
index 8a604be..cb7c274 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java
@@ -366,13 +366,18 @@ public class IgniteClusterActivateDeactivateTest extends GridCommonAbstractTest
startWithCaches1(srvs, clients);
- if (initiallyActive && persistenceEnabled())
+ int minorVer = 1;
+
+ if (initiallyActive && persistenceEnabled()) {
ignite(0).active(true);
+ minorVer++;
+ }
+
if (blockMsgNodes.length == 0)
blockMsgNodes = new int[]{1};
- final AffinityTopologyVersion STATE_CHANGE_TOP_VER = new AffinityTopologyVersion(srvs + clients, 1);
+ final AffinityTopologyVersion STATE_CHANGE_TOP_VER = new AffinityTopologyVersion(srvs + clients, minorVer);
List<TestRecordingCommunicationSpi> spis = new ArrayList<>();
[19/32] ignite git commit: IGNITE-5774 - Added more information about
long-running partition release future
Posted by sb...@apache.org.
IGNITE-5774 - Added more information about long-running partition release future
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a71691ae
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a71691ae
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a71691ae
Branch: refs/heads/ignite-5578
Commit: a71691ae22e30eea775324363d13e8875be8c4d9
Parents: 0d6b730
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Tue Jul 18 12:37:14 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Jul 18 12:37:14 2017 +0300
----------------------------------------------------------------------
.../apache/ignite/IgniteSystemProperties.java | 7 +++
.../cache/CacheObjectsReleaseFuture.java | 60 ++++++++++++++++++++
.../cache/GridCacheExplicitLockSpan.java | 10 +++-
.../processors/cache/GridCacheMvccManager.java | 24 +++++---
.../cache/GridCacheSharedContext.java | 4 +-
.../GridDhtPartitionsExchangeFuture.java | 30 +++++++---
.../cache/transactions/IgniteTxAdapter.java | 44 ++++++++++++--
.../cache/transactions/IgniteTxManager.java | 5 +-
.../util/future/GridCompoundFuture.java | 6 +-
9 files changed, 161 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a71691ae/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index 1a2887a..616ac3f 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -677,6 +677,13 @@ public final class IgniteSystemProperties {
"IGNITE_CLIENT_CACHE_CHANGE_MESSAGE_TIMEOUT";
/**
+ * If a partition release future completion time during an exchange exceeds this threshold, the contents of
+ * the future will be dumped to the log on exchange. Default is {@code 0} (disabled).
+ */
+ public static final String IGNITE_PARTITION_RELEASE_FUTURE_DUMP_THRESHOLD =
+ "IGNITE_PARTITION_RELEASE_FUTURE_DUMP_THRESHOLD";
+
+ /**
* Enforces singleton.
*/
private IgniteSystemProperties() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/a71691ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectsReleaseFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectsReleaseFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectsReleaseFuture.java
new file mode 100644
index 0000000..f7af009
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectsReleaseFuture.java
@@ -0,0 +1,60 @@
+/*
+ * 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;
+
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.util.future.GridCompoundFuture;
+import org.apache.ignite.lang.IgniteReducer;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ *
+ */
+public class CacheObjectsReleaseFuture<T, R> extends GridCompoundFuture<T, R> {
+ /** */
+ private AffinityTopologyVersion topVer;
+
+ /** */
+ private String type;
+
+ /**
+ * @param type Wait object type.
+ * @param topVer Topology version to wait for.
+ */
+ public CacheObjectsReleaseFuture(String type, AffinityTopologyVersion topVer) {
+ this.type = type;
+ this.topVer = topVer;
+ }
+
+ /**
+ * @param type Wait object type.
+ * @param topVer Topology version to wait for.
+ * @param rdc Reducer object.
+ */
+ public CacheObjectsReleaseFuture(String type, AffinityTopologyVersion topVer, @Nullable IgniteReducer<T, R> rdc) {
+ super(rdc);
+
+ this.topVer = topVer;
+ this.type = type;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return type + "ReleaseFuture [topVer=" + topVer + ", futures=" + futures() + "]";
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a71691ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
index df32e77..b0cb302 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
@@ -51,15 +51,21 @@ public class GridCacheExplicitLockSpan extends ReentrantLock {
/** Span lock release future. */
@GridToStringExclude
- private final GridFutureAdapter<Object> releaseFut = new GridFutureAdapter<>();
+ private final GridFutureAdapter<Object> releaseFut;
/**
* @param topVer Topology version.
* @param cand Candidate.
*/
- public GridCacheExplicitLockSpan(AffinityTopologyVersion topVer, GridCacheMvccCandidate cand) {
+ public GridCacheExplicitLockSpan(final AffinityTopologyVersion topVer, final GridCacheMvccCandidate cand) {
this.topVer = topVer;
+ releaseFut = new GridFutureAdapter<Object>() {
+ @Override public String toString() {
+ return "ExplicitLockSpan [topVer=" + topVer + ", firstCand=" + cand + "]";
+ }
+ };
+
ensureDeque(cand.key()).addFirst(cand);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a71691ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
index b156708..09bf762 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
@@ -1048,7 +1048,7 @@ public class GridCacheMvccManager extends GridCacheSharedManagerAdapter {
* @return Explicit locks release future.
*/
public IgniteInternalFuture<?> finishExplicitLocks(AffinityTopologyVersion topVer) {
- GridCompoundFuture<Object, Object> res = new GridCompoundFuture<>();
+ GridCompoundFuture<Object, Object> res = new CacheObjectsReleaseFuture<>("ExplicitLock", topVer);
for (GridCacheExplicitLockSpan span : pendingExplicit.values()) {
AffinityTopologyVersion snapshot = span.topologyVersion();
@@ -1069,7 +1069,7 @@ public class GridCacheMvccManager extends GridCacheSharedManagerAdapter {
*/
@SuppressWarnings("unchecked")
public IgniteInternalFuture<?> finishAtomicUpdates(AffinityTopologyVersion topVer) {
- GridCompoundFuture<Object, Object> res = new FinishAtomicUpdateFuture();
+ GridCompoundFuture<Object, Object> res = new FinishAtomicUpdateFuture("AtomicUpdate", topVer);
for (GridCacheAtomicFuture<?> fut : atomicFuts.values()) {
IgniteInternalFuture<Void> complete = fut.completeFuture(topVer);
@@ -1088,11 +1088,13 @@ public class GridCacheMvccManager extends GridCacheSharedManagerAdapter {
* @return Finish update future.
*/
@SuppressWarnings("unchecked")
- public IgniteInternalFuture<?> finishDataStreamerUpdates() {
- GridCompoundFuture<Object, Object> res = new GridCompoundFuture<>();
+ public IgniteInternalFuture<?> finishDataStreamerUpdates(AffinityTopologyVersion topVer) {
+ GridCompoundFuture<Void, Object> res = new CacheObjectsReleaseFuture<>("DataStreamer", topVer);
- for (IgniteInternalFuture fut : dataStreamerFuts)
- res.add(fut);
+ for (DataStreamerFuture fut : dataStreamerFuts) {
+ if (fut.topVer.compareTo(topVer) < 0)
+ res.add(fut);
+ }
res.markInitialized();
@@ -1340,10 +1342,18 @@ public class GridCacheMvccManager extends GridCacheSharedManagerAdapter {
/**
* Finish atomic update future.
*/
- private static class FinishAtomicUpdateFuture extends GridCompoundFuture<Object, Object> {
+ private static class FinishAtomicUpdateFuture extends CacheObjectsReleaseFuture<Object, Object> {
/** */
private static final long serialVersionUID = 0L;
+ /**
+ * @param type Type.
+ * @param topVer Topology version.
+ */
+ private FinishAtomicUpdateFuture(String type, AffinityTopologyVersion topVer) {
+ super(type, topVer);
+ }
+
/** {@inheritDoc} */
@Override protected boolean ignoreFailure(Throwable err) {
Class cls = err.getClass();
http://git-wip-us.apache.org/repos/asf/ignite/blob/a71691ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
index efd90a8..5387cc8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
@@ -809,12 +809,12 @@ public class GridCacheSharedContext<K, V> {
*/
@SuppressWarnings({"unchecked"})
public IgniteInternalFuture<?> partitionReleaseFuture(AffinityTopologyVersion topVer) {
- GridCompoundFuture f = new GridCompoundFuture();
+ GridCompoundFuture f = new CacheObjectsReleaseFuture("Partition", topVer);
f.add(mvcc().finishExplicitLocks(topVer));
f.add(tm().finishTxs(topVer));
f.add(mvcc().finishAtomicUpdates(topVer));
- f.add(mvcc().finishDataStreamerUpdates());
+ f.add(mvcc().finishDataStreamerUpdates(topVer));
f.markInitialized();
http://git-wip-us.apache.org/repos/asf/ignite/blob/a71691ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index ea34f75..c4a4f83 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -35,6 +35,7 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.ReadWriteLock;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.events.CacheEvent;
@@ -92,6 +93,7 @@ import org.jetbrains.annotations.Nullable;
import org.jsr166.ConcurrentHashMap8;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_LONG_OPERATIONS_DUMP_TIMEOUT_LIMIT;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_PARTITION_RELEASE_FUTURE_DUMP_THRESHOLD;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_THREAD_DUMP_ON_EXCHANGE_TIMEOUT;
import static org.apache.ignite.IgniteSystemProperties.getBoolean;
import static org.apache.ignite.IgniteSystemProperties.getLong;
@@ -111,6 +113,10 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
public static final String EXCHANGE_LOG = "org.apache.ignite.internal.exchange.time";
/** */
+ private static final int RELEASE_FUTURE_DUMP_THRESHOLD =
+ IgniteSystemProperties.getInteger(IGNITE_PARTITION_RELEASE_FUTURE_DUMP_THRESHOLD, 0);
+
+ /** */
@GridToStringExclude
private volatile DiscoCache discoCache;
@@ -623,9 +629,8 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
/**
* @param crd Coordinator flag.
* @return Exchange type.
- * @throws IgniteCheckedException If failed.
*/
- private ExchangeType onClusterStateChangeRequest(boolean crd) throws IgniteCheckedException {
+ private ExchangeType onClusterStateChangeRequest(boolean crd) {
assert exchActions != null && !exchActions.empty() : this;
StateChangeRequest req = exchActions.stateChangeRequest();
@@ -894,14 +899,15 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
IgniteInternalFuture fut = cctx.snapshot()
.tryStartLocalSnapshotOperation(discoEvt);
- if (fut != null)
+ if (fut != null) {
fut.get();
- long end = U.currentTimeMillis();
+ long end = U.currentTimeMillis();
- if (log.isInfoEnabled())
- log.info("Snapshot initialization completed [topVer=" + exchangeId().topologyVersion() +
- ", time=" + (end - start) + "ms]");
+ if (log.isInfoEnabled())
+ log.info("Snapshot initialization completed [topVer=" + exchangeId().topologyVersion() +
+ ", time=" + (end - start) + "ms]");
+ }
}
catch (IgniteCheckedException e) {
U.error(log, "Error while starting snapshot operation", e);
@@ -955,9 +961,15 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
long waitEnd = U.currentTimeMillis();
- if (log.isInfoEnabled())
+ if (log.isInfoEnabled()) {
+ long waitTime = (waitEnd - waitStart);
+
+ String futInfo = RELEASE_FUTURE_DUMP_THRESHOLD > 0 && waitTime > RELEASE_FUTURE_DUMP_THRESHOLD ?
+ partReleaseFut.toString() : "NA";
+
log.info("Finished waiting for partition release future [topVer=" + exchangeId().topologyVersion() +
- ", waitTime=" + (waitEnd - waitStart) + "ms]");
+ ", waitTime=" + (waitEnd - waitStart) + "ms, futInfo=" + futInfo + "]");
+ }
IgniteInternalFuture<?> locksFut = cctx.mvcc().finishLocks(exchId.topologyVersion());
http://git-wip-us.apache.org/repos/asf/ignite/blob/a71691ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
index 880d9b9..91ce3ce 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
@@ -938,11 +938,7 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter implement
fut = finFut;
if (fut == null) {
- fut = new GridFutureAdapter<IgniteInternalTx>() {
- @Override public String toString() {
- return S.toString(GridFutureAdapter.class, this, "tx", IgniteTxAdapter.this);
- }
- };
+ fut = new TxFinishFuture(this);
finFut = fut;
}
@@ -2287,4 +2283,42 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter implement
return S.toString(TxShadow.class, this);
}
}
+
+ /**
+ *
+ */
+ private static class TxFinishFuture extends GridFutureAdapter<IgniteInternalTx> {
+ /** */
+ @GridToStringInclude
+ private IgniteTxAdapter tx;
+
+ /** */
+ private volatile long completionTime;
+
+ /**
+ * @param tx Transaction being awaited.
+ */
+ private TxFinishFuture(IgniteTxAdapter tx) {
+ this.tx = tx;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean onDone(@Nullable IgniteInternalTx res, @Nullable Throwable err) {
+ completionTime = U.currentTimeMillis();
+
+ return super.onDone(res, err);
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ long ct = completionTime;
+
+ if (ct == 0)
+ ct = U.currentTimeMillis();
+
+ long duration = ct - tx.startTime();
+
+ return S.toString(TxFinishFuture.class, this, "duration", duration);
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a71691ae/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 3a3b766..26a4a91 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
@@ -42,6 +42,7 @@ import org.apache.ignite.internal.managers.communication.GridIoPolicy;
import org.apache.ignite.internal.managers.communication.GridMessageListener;
import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.CacheObjectsReleaseFuture;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
@@ -535,7 +536,9 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter {
*/
public IgniteInternalFuture<Boolean> finishTxs(AffinityTopologyVersion topVer) {
GridCompoundFuture<IgniteInternalTx, Boolean> res =
- new GridCompoundFuture<>(
+ new CacheObjectsReleaseFuture<>(
+ "Tx",
+ topVer,
new IgniteReducer<IgniteInternalTx, Boolean>() {
@Override public boolean collect(IgniteInternalTx e) {
return true;
http://git-wip-us.apache.org/repos/asf/ignite/blob/a71691ae/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
index 3e08cd9..74a8f41 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
@@ -166,7 +166,7 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> implements Ig
* @return Collection of futures.
*/
@SuppressWarnings("unchecked")
- public synchronized final Collection<IgniteInternalFuture<T>> futures() {
+ public final synchronized Collection<IgniteInternalFuture<T>> futures() {
if (futs == null)
return Collections.emptyList();
@@ -249,7 +249,7 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> implements Ig
/**
* Clear futures.
*/
- protected synchronized final void clear() {
+ protected final synchronized void clear() {
futs = null;
}
@@ -338,7 +338,7 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> implements Ig
/**
* @return {@code True} if has at least one future.
*/
- protected synchronized final boolean hasFutures() {
+ protected final synchronized boolean hasFutures() {
return futs != null;
}
[32/32] ignite git commit: ignite-5578
Posted by sb...@apache.org.
ignite-5578
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a7cb8296
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a7cb8296
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a7cb8296
Branch: refs/heads/ignite-5578
Commit: a7cb829628246e8fc514de03b5de67983867e4f7
Parents: ef1dd608
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jul 19 12:26:49 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jul 19 12:26:49 2017 +0300
----------------------------------------------------------------------
.../distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a7cb8296/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 3166401..9ae4032 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -1375,7 +1375,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
if (!done.compareAndSet(false, true))
return false;
- log.info("Finish exchange future [startVer=" + topologyVersion() + ", resVer=" + res + ']');
+ log.info("Finish exchange future [startVer=" + topologyVersion() + ", resVer=" + res + ", err=" + err + ']');
assert res != null || err != null;
[10/32] ignite git commit: Test configuration fix to pass validation.
Posted by sb...@apache.org.
Test configuration fix to pass validation.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e7ed26b6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e7ed26b6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e7ed26b6
Branch: refs/heads/ignite-5578
Commit: e7ed26b6d305485d3a48ffcca0b9f4069e1fad30
Parents: 1d75560
Author: Sergey Chugunov <se...@gmail.com>
Authored: Fri Jul 14 17:04:51 2017 +0300
Committer: Sergey Chugunov <se...@gmail.com>
Committed: Fri Jul 14 18:44:33 2017 +0300
----------------------------------------------------------------------
.../GridCachePartitionEvictionDuringReadThroughSelfTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e7ed26b6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionEvictionDuringReadThroughSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionEvictionDuringReadThroughSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionEvictionDuringReadThroughSelfTest.java
index d5351f7..ee0e536 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionEvictionDuringReadThroughSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionEvictionDuringReadThroughSelfTest.java
@@ -53,6 +53,7 @@ public class GridCachePartitionEvictionDuringReadThroughSelfTest extends GridCom
.setAtomicityMode(CacheAtomicityMode.ATOMIC)
.setBackups(0) // No need for backup, just load from the store if needed
.setCacheStoreFactory(new CacheStoreFactory())
+ .setOnheapCacheEnabled(true)
.setEvictionPolicy(new LruEvictionPolicy(100))
.setNearConfiguration(new NearCacheConfiguration<Integer, Integer>()
.setNearEvictionPolicy(new LruEvictionPolicy<Integer, Integer>()));
[13/32] ignite git commit: Minor (comments)
Posted by sb...@apache.org.
Minor (comments)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/310d903a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/310d903a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/310d903a
Branch: refs/heads/ignite-5578
Commit: 310d903a3ae23a2761c5c8339e5cd53ea6a7eb03
Parents: 2b50486
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Mon Jul 17 12:45:20 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Mon Jul 17 12:45:20 2017 +0300
----------------------------------------------------------------------
.../internal/managers/communication/GridIoMessageFactory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/310d903a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index 3dac18e..29c89a5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -872,7 +872,7 @@ public class GridIoMessageFactory implements MessageFactory {
// [-3..119] [124..127] [-23..-27] [-36..-55]- this
// [120..123] - DR
// [-4..-22, -30..-35] - SQL
- // [-54..-60] - Snapshots
+ // [2048..2053] - Snapshots
default:
if (ext != null) {
for (MessageFactory factory : ext) {
[25/32] ignite git commit: Enable forcible node prop for failover
tests.
Posted by sb...@apache.org.
Enable forcible node prop for failover tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/23f26af5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/23f26af5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/23f26af5
Branch: refs/heads/ignite-5578
Commit: 23f26af5887782b8ac3946231f72c9d9f63e4f05
Parents: cf345b8
Author: Andrey V. Mashenkov <an...@gmail.com>
Authored: Tue Jul 18 20:36:20 2017 +0300
Committer: Andrey V. Mashenkov <an...@gmail.com>
Committed: Tue Jul 18 20:36:20 2017 +0300
----------------------------------------------------------------------
.../cache/GridCachePutAllFailoverSelfTest.java | 15 +++++++++++++++
.../cache/IgniteCachePutAllRestartTest.java | 15 +++++++++++++++
.../CacheGetInsideLockChangingTopologyTest.java | 5 +++++
.../GridCacheAbstractNodeRestartSelfTest.java | 12 +++++++++++-
.../cache/distributed/IgniteCacheGetRestartTest.java | 5 +++++
.../dht/IgniteCachePutRetryAbstractSelfTest.java | 5 +++++
.../testsuites/IgniteCacheRestartTestSuite2.java | 2 ++
7 files changed, 58 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/23f26af5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
index 71eb767..19bef92 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
@@ -37,6 +37,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCompute;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.compute.ComputeJobContext;
@@ -119,6 +120,20 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest {
/** Test failover SPI. */
private MasterFailoverSpi failoverSpi = new MasterFailoverSpi((IgnitePredicate)workerNodesFilter);
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ System.setProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL, "true");
+
+ super.beforeTestsStarted();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ super.afterTestsStopped();
+
+ System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
+ }
+
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/23f26af5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java
index b00b3c8..5adafb1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java
@@ -26,6 +26,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import javax.cache.CacheException;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -79,6 +80,20 @@ public class IgniteCachePutAllRestartTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ System.setProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL, "true");
+
+ super.beforeTestsStarted();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ super.afterTestsStopped();
+
+ System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
+ }
+
+ /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
stopAllGrids();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/23f26af5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
index bb2a55d..6ec1440 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
@@ -28,6 +28,7 @@ import javax.cache.CacheException;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -118,6 +119,8 @@ public class CacheGetInsideLockChangingTopologyTest extends GridCommonAbstractTe
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
+ System.setProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL, "true");
+
super.beforeTestsStarted();
startGridsMultiThreaded(SRVS);
@@ -149,6 +152,8 @@ public class CacheGetInsideLockChangingTopologyTest extends GridCommonAbstractTe
stopAllGrids();
super.afterTestsStopped();
+
+ System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/23f26af5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
index 8d5a4aa..d849559 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
@@ -33,6 +33,7 @@ import javax.cache.CacheException;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.IgniteTransactions;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheRebalanceMode;
@@ -161,7 +162,16 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
- // No-op.
+ System.setProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL, "true");
+
+ super.beforeTestsStarted();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ super.afterTestsStopped();
+
+ System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/23f26af5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java
index fb57ecd..aa82b9a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java
@@ -26,6 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -90,6 +91,8 @@ public class IgniteCacheGetRestartTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
+ System.setProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL, "true");
+
super.beforeTestsStarted();
startGrids(SRVS);
@@ -108,6 +111,8 @@ public class IgniteCacheGetRestartTest extends GridCommonAbstractTest {
super.afterTestsStopped();
stopAllGrids();
+
+ System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/23f26af5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
index e65bff4..0620f60 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
@@ -34,6 +34,7 @@ import javax.cache.processor.EntryProcessorResult;
import javax.cache.processor.MutableEntry;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheEntryProcessor;
import org.apache.ignite.cache.CachePartialUpdateException;
@@ -136,6 +137,8 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
+ System.setProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL, "true");
+
super.beforeTestsStarted();
startGridsMultiThreaded(GRID_CNT);
@@ -146,6 +149,8 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst
super.afterTestsStopped();
stopAllGrids();
+
+ System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/23f26af5/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite2.java
index 1901283..6a4c487 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite2.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite2.java
@@ -18,6 +18,8 @@
package org.apache.ignite.testsuites;
import junit.framework.TestSuite;
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.internal.IgniteProperties;
import org.apache.ignite.internal.processors.cache.GridCachePutAllFailoverSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicPutAllFailoverSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCachePutAllRestartTest;
[17/32] ignite git commit: ignite-5763 Race in concurrent client
cache start
Posted by sb...@apache.org.
ignite-5763 Race in concurrent client cache start
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/644c9f39
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/644c9f39
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/644c9f39
Branch: refs/heads/ignite-5578
Commit: 644c9f39cd980e8087438519b34a79986c82d8b4
Parents: 624b451
Author: sboikov <sb...@gridgain.com>
Authored: Mon Jul 17 17:06:55 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Jul 17 17:06:55 2017 +0300
----------------------------------------------------------------------
.../discovery/GridDiscoveryManager.java | 38 ++++-
.../cache/IgniteDynamicCacheMultinodeTest.java | 168 +++++++++++++++++++
.../testsuites/IgniteCacheTestSuite4.java | 2 +
3 files changed, 202 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/644c9f39/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 9f5bd3f..347f6fe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -192,6 +192,9 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
}
};
+ /** */
+ private final Object discoEvtMux = new Object();
+
/** Discovery event worker. */
private final DiscoveryWorker discoWrk = new DiscoveryWorker();
@@ -551,6 +554,26 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
final ClusterNode node,
final Collection<ClusterNode> topSnapshot,
final Map<Long, Collection<ClusterNode>> snapshots,
+ @Nullable DiscoverySpiCustomMessage spiCustomMsg) {
+ synchronized (discoEvtMux) {
+ onDiscovery0(type, topVer, node, topSnapshot, snapshots, spiCustomMsg);
+ }
+ }
+
+ /**
+ * @param type Event type.
+ * @param topVer Event topology version.
+ * @param node Event node.
+ * @param topSnapshot Topology snapsjot.
+ * @param snapshots Topology snapshots history.
+ * @param spiCustomMsg Custom event.
+ */
+ private void onDiscovery0(
+ final int type,
+ final long topVer,
+ final ClusterNode node,
+ final Collection<ClusterNode> topSnapshot,
+ final Map<Long, Collection<ClusterNode>> snapshots,
@Nullable DiscoverySpiCustomMessage spiCustomMsg
) {
DiscoveryCustomMessage customMsg = spiCustomMsg == null ? null
@@ -2062,12 +2085,15 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
public void clientCacheStartEvent(UUID reqId,
@Nullable Map<String, DynamicCacheChangeRequest> startReqs,
@Nullable Set<String> cachesToClose) {
- discoWrk.addEvent(EVT_DISCOVERY_CUSTOM_EVT,
- AffinityTopologyVersion.NONE,
- localNode(),
- null,
- Collections.<ClusterNode>emptyList(),
- new ClientCacheChangeDummyDiscoveryMessage(reqId, startReqs, cachesToClose));
+ // Prevent race when discovery message was processed, but was passed to discoWrk.
+ synchronized (discoEvtMux) {
+ discoWrk.addEvent(EVT_DISCOVERY_CUSTOM_EVT,
+ AffinityTopologyVersion.NONE,
+ localNode(),
+ null,
+ Collections.<ClusterNode>emptyList(),
+ new ClientCacheChangeDummyDiscoveryMessage(reqId, startReqs, cachesToClose));
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/644c9f39/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheMultinodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheMultinodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheMultinodeTest.java
new file mode 100644
index 0000000..d362189
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheMultinodeTest.java
@@ -0,0 +1,168 @@
+/*
+ * 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;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+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;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+
+/**
+ *
+ */
+public class IgniteDynamicCacheMultinodeTest extends GridCommonAbstractTest {
+ /** */
+ private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
+
+ /** */
+ private static final int NODES = 6;
+
+ /** */
+ private boolean client;
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
+
+ ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
+
+ cfg.setClientMode(client);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ super.beforeTestsStarted();
+
+ startGridsMultiThreaded(NODES - 2);
+
+ client = true;
+
+ startGridsMultiThreaded(NODES - 2, 2);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ stopAllGrids();
+
+ super.afterTestsStopped();
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testGetOrCreateCache() throws Exception {
+ createCacheMultinode(TestOp.GET_OR_CREATE_CACHE);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testGetOrCreateCaches() throws Exception {
+ createCacheMultinode(TestOp.GET_OR_CREATE_CACHES);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ private void createCacheMultinode(final TestOp op) throws Exception {
+ final int THREADS = NODES * 3;
+
+ for (int i = 0; i < 10; i++) {
+ log.info("Iteration: " + i);
+
+ final CyclicBarrier b = new CyclicBarrier(THREADS);
+
+ final AtomicInteger idx = new AtomicInteger();
+
+ final int iter = i;
+
+ GridTestUtils.runMultiThreaded(new Callable<Void>() {
+ @Override public Void call() throws Exception {
+ Ignite node = ignite(idx.incrementAndGet() % NODES);
+
+ b.await();
+
+ boolean sleep = iter % 2 == 0;
+
+ if (sleep)
+ Thread.sleep(ThreadLocalRandom.current().nextLong(100) + 1);
+
+ switch (op) {
+ case GET_OR_CREATE_CACHE:
+ node.getOrCreateCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME));
+
+ break;
+
+ case GET_OR_CREATE_CACHES:
+ node.getOrCreateCaches(cacheConfigurations());
+
+ break;
+ }
+
+ return null;
+ }
+ }, THREADS, "start-cache");
+
+ for (String cache : ignite(0).cacheNames())
+ ignite(0).destroyCache(cache);
+ }
+ }
+
+ /**
+ * @return Cache configurations.
+ */
+ private List<CacheConfiguration> cacheConfigurations() {
+ List<CacheConfiguration> ccfgs = new ArrayList<>();
+
+ for (int i = 0; i < 10; i++) {
+ CacheConfiguration ccfg = new CacheConfiguration("cache-" + i);
+
+ ccfg.setAtomicityMode(i % 2 == 0 ? ATOMIC : TRANSACTIONAL);
+
+ ccfgs.add(ccfg);
+ }
+
+ return ccfgs;
+ }
+
+ /**
+ *
+ */
+ enum TestOp {
+ /** */
+ GET_OR_CREATE_CACHE,
+
+ /** */
+ GET_OR_CREATE_CACHES
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/644c9f39/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
index e7f38be..d931ea9 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
@@ -74,6 +74,7 @@ import org.apache.ignite.internal.processors.cache.IgniteCacheTxPreloadNoWriteTe
import org.apache.ignite.internal.processors.cache.IgniteCacheTxReplicatedPeekModesTest;
import org.apache.ignite.internal.processors.cache.IgniteClientCacheInitializationFailTest;
import org.apache.ignite.internal.processors.cache.IgniteDynamicCacheFilterTest;
+import org.apache.ignite.internal.processors.cache.IgniteDynamicCacheMultinodeTest;
import org.apache.ignite.internal.processors.cache.IgniteDynamicCacheStartNoExchangeTimeoutTest;
import org.apache.ignite.internal.processors.cache.IgniteDynamicCacheStartSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteDynamicCacheStartStopConcurrentTest;
@@ -219,6 +220,7 @@ public class IgniteCacheTestSuite4 extends TestSuite {
suite.addTestSuite(IgniteCacheTxPreloadNoWriteTest.class);
suite.addTestSuite(IgniteDynamicCacheStartSelfTest.class);
+ suite.addTestSuite(IgniteDynamicCacheMultinodeTest.class);
suite.addTestSuite(IgniteDynamicCacheWithConfigStartSelfTest.class);
suite.addTestSuite(IgniteCacheDynamicStopSelfTest.class);
suite.addTestSuite(IgniteDynamicCacheStartStopConcurrentTest.class);
[05/32] ignite git commit: Merge branch 'ignite-2.1.3' of
https://github.com/gridgain/apache-ignite into ignite-2.1.3
Posted by sb...@apache.org.
Merge branch 'ignite-2.1.3' of https://github.com/gridgain/apache-ignite into ignite-2.1.3
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1e7e692b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1e7e692b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1e7e692b
Branch: refs/heads/ignite-5578
Commit: 1e7e692bd4ce0fe2e092117190b59382840317a7
Parents: 2788a74 871d926
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Fri Jul 14 12:25:08 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Jul 14 12:25:08 2017 +0300
----------------------------------------------------------------------
.../test/java/org/apache/ignite/internal/GridVersionSelfTest.java | 2 ++
.../internal/IgniteUpdateNotifierPerClusterSettingSelfTest.java | 2 ++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
[08/32] ignite git commit: Merge branch 'ignite-2.1.3' of
https://github.com/gridgain/apache-ignite into ignite-2.1.3
Posted by sb...@apache.org.
Merge branch 'ignite-2.1.3' of https://github.com/gridgain/apache-ignite into ignite-2.1.3
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8f1d732f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8f1d732f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8f1d732f
Branch: refs/heads/ignite-5578
Commit: 8f1d732fc8065e59a29bb538456194d7f4edd3e9
Parents: d5cc82c 9fa7884
Author: Sergey Chugunov <se...@gmail.com>
Authored: Fri Jul 14 14:52:17 2017 +0300
Committer: Sergey Chugunov <se...@gmail.com>
Committed: Fri Jul 14 14:52:17 2017 +0300
----------------------------------------------------------------------
.../apache/ignite/IgniteSystemProperties.java | 8 ++
.../org/apache/ignite/cache/CacheManager.java | 10 ++
.../apache/ignite/internal/IgniteKernal.java | 71 ++++++-----
.../org/apache/ignite/internal/IgnitionEx.java | 10 +-
.../client/router/impl/GridTcpRouterImpl.java | 57 ++++++---
.../processors/cache/GridCacheProcessor.java | 11 +-
.../GridCacheDatabaseSharedManager.java | 28 +++--
.../IgniteCacheDatabaseSharedManager.java | 44 ++++---
.../ignite/internal/util/IgniteUtils.java | 23 +++-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 10 +-
.../testsuites/IgniteUtilSelfTestSuite.java | 2 +
.../util/mbeans/GridMBeanDisableSelfTest.java | 121 +++++++++++++++++++
12 files changed, 312 insertions(+), 83 deletions(-)
----------------------------------------------------------------------
[29/32] ignite git commit: Merge remote-tracking branch
'remotes/community/ignite-2.1.3'
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/community/ignite-2.1.3'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e5f2d90c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e5f2d90c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e5f2d90c
Branch: refs/heads/ignite-5578
Commit: e5f2d90c6db491ea03b2f76230a1467bc93e35df
Parents: b3bce81 0d6b730
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jul 19 12:08:37 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jul 19 12:08:37 2017 +0300
----------------------------------------------------------------------
.../internal/managers/communication/GridIoMessageFactory.java | 2 +-
.../wal/record/delta/MetaPageUpdatePartitionDataRecord.java | 2 ++
.../processors/cache/persistence/GridCacheOffheapManager.java | 2 +-
.../java/org/apache/ignite/internal/GridVersionSelfTest.java | 2 ++
.../internal/IgniteUpdateNotifierPerClusterSettingSelfTest.java | 2 ++
.../cache/distributed/GridCacheAbstractNodeRestartSelfTest.java | 2 +-
.../GridCachePartitionEvictionDuringReadThroughSelfTest.java | 1 +
.../replicated/GridCacheReplicatedNodeRestartSelfTest.java | 2 +-
.../ignite/internal/processors/database/BPlusTreeSelfTest.java | 4 +++-
.../internal/processors/database/FreeListImplSelfTest.java | 4 +++-
.../apache/ignite/yardstick/cache/IgnitePutTxLoadBenchmark.java | 3 +--
11 files changed, 18 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[28/32] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-5578-locJoin' into ignite-5578
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-5578-locJoin' into ignite-5578
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3b46d47f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3b46d47f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3b46d47f
Branch: refs/heads/ignite-5578
Commit: 3b46d47f41c5adfb1133886a98aa79684ef6e152
Parents: c7a6069 f006bfb
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jul 19 10:57:40 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jul 19 10:57:40 2017 +0300
----------------------------------------------------------------------
examples/pom.xml | 7 +
.../discovery/GridDiscoveryManager.java | 38 ++++-
.../cache/query/GridCacheQueryResponse.java | 4 +-
.../handlers/cache/GridCacheCommandHandler.java | 4 +-
.../IgniteClusterActivateDeactivateTest.java | 9 +-
.../cache/IgniteDynamicCacheMultinodeTest.java | 171 +++++++++++++++++++
.../testsuites/IgniteCacheTestSuite4.java | 2 +
modules/geospatial/pom.xml | 24 +++
modules/hibernate-4.2/pom.xml | 24 +++
modules/hibernate-5.1/pom.xml | 24 +++
modules/schedule/pom.xml | 24 +++
11 files changed, 319 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3b46d47f/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
[09/32] ignite git commit: Merge branch 'master' into ignite-2.1.3
Posted by sb...@apache.org.
Merge branch 'master' into ignite-2.1.3
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1d75560f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1d75560f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1d75560f
Branch: refs/heads/ignite-5578
Commit: 1d75560f9f418628da7d212207267482a1ea16aa
Parents: 8f1d732 abe8e67
Author: devozerov <vo...@gridgain.com>
Authored: Fri Jul 14 16:07:49 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Fri Jul 14 16:07:49 2017 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
[20/32] ignite git commit: Null cache shouldn't be mentioned in
GridCacheCommandHandler error message when a cache is not found.
Posted by sb...@apache.org.
Null cache shouldn't be mentioned in GridCacheCommandHandler error message when a cache is not found.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2a0d9d69
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2a0d9d69
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2a0d9d69
Branch: refs/heads/ignite-5578
Commit: 2a0d9d691d49c3ae82962684b3d114bb0079867c
Parents: 32f5cbc
Author: shroman <rs...@yahoo.com>
Authored: Tue Jul 18 21:25:12 2017 +0900
Committer: shroman <rs...@yahoo.com>
Committed: Tue Jul 18 21:25:12 2017 +0900
----------------------------------------------------------------------
.../processors/rest/handlers/cache/GridCacheCommandHandler.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2a0d9d69/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
index c2ca587..0006f4b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
@@ -338,7 +338,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
if (cache == null)
throw new IgniteCheckedException(
- "Failed to find cache for given cache name (null for default cache): " + cacheName);
+ "Failed to find cache for given cache name: " + cacheName);
return cache;
}
@@ -756,7 +756,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
if (cache == null)
throw new IgniteCheckedException(
- "Failed to find cache for given cache name (null for default cache): " + cacheName);
+ "Failed to find cache for given cache name: " + cacheName);
return cache;
}
[22/32] ignite git commit: Partial fix of IGNITE-5473: Introduce
troubleshooting logger
Posted by sb...@apache.org.
Partial fix of IGNITE-5473: Introduce troubleshooting logger
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cf345b81
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cf345b81
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cf345b81
Branch: refs/heads/ignite-5578
Commit: cf345b81820fbbcb82e5fcb2283b43ea286a40b4
Parents: e46cf95
Author: Andrey V. Mashenkov <an...@gmail.com>
Authored: Tue Jul 18 15:50:03 2017 +0300
Committer: Andrey V. Mashenkov <an...@gmail.com>
Committed: Tue Jul 18 15:50:03 2017 +0300
----------------------------------------------------------------------
.../apache/ignite/IgniteSystemProperties.java | 7 ++
...idNearAtomicAbstractSingleUpdateRequest.java | 9 ++-
...GridNearAtomicSingleUpdateInvokeRequest.java | 6 ++
.../atomic/GridNearAtomicUpdateResponse.java | 2 +-
.../processors/service/ServiceContextImpl.java | 2 +
.../util/tostring/GridToStringBuilder.java | 2 +-
.../communication/tcp/TcpCommunicationSpi.java | 66 ++++++++++--------
.../ignite/spi/discovery/tcp/ServerImpl.java | 72 ++++++++++++++------
.../spi/discovery/tcp/TcpDiscoverySpi.java | 16 +++--
9 files changed, 123 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cf345b81/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index 5da7bd6..264fb4b 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -146,6 +146,13 @@ public final class IgniteSystemProperties {
public static final String IGNITE_QUIET = "IGNITE_QUIET";
/**
+ * Setting this option to {@code true} will enable troubleshooting logger.
+ * Troubleshooting logger makes logging more verbose without enabling debug mode
+ * to provide more detailed logs without performance penalty.
+ */
+ public static final String IGNITE_TROUBLESHOOTING_LOGGER = "IGNITE_TROUBLESHOOTING_LOGGER";
+
+ /**
* Setting to {@code true} enables writing sensitive information in {@code toString()} output.
*/
public static final String IGNITE_TO_STRING_INCLUDE_SENSITIVE = "IGNITE_TO_STRING_INCLUDE_SENSITIVE";
http://git-wip-us.apache.org/repos/asf/ignite/blob/cf345b81/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java
index 7022561..45ccb0e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java
@@ -21,10 +21,10 @@ import java.io.Externalizable;
import java.util.UUID;
import javax.cache.expiry.ExpiryPolicy;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
-import org.apache.ignite.internal.GridDirectTransient;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
import org.apache.ignite.internal.processors.cache.GridCacheOperation;
+import org.apache.ignite.internal.util.typedef.internal.S;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -100,4 +100,11 @@ public abstract class GridNearAtomicAbstractSingleUpdateRequest extends GridNear
@Nullable @Override public CacheEntryPredicate[] filter() {
return NO_FILTER;
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(GridNearAtomicAbstractSingleUpdateRequest.class, this,
+ "nodeId", nodeId, "futId", futId, "topVer", topVer,
+ "parent", super.toString());
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cf345b81/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
index b1fb530..865d6f8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
@@ -34,6 +34,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.KeyCacheObject;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
@@ -282,4 +283,9 @@ public class GridNearAtomicSingleUpdateInvokeRequest extends GridNearAtomicSingl
@Override public short directType() {
return 126;
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(GridNearAtomicSingleUpdateRequest.class, this, super.toString());
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cf345b81/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
index 9492164..37fe824 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
@@ -536,6 +536,6 @@ public class GridNearAtomicUpdateResponse extends GridCacheIdMessage implements
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(GridNearAtomicUpdateResponse.class, this, "parent");
+ return S.toString(GridNearAtomicUpdateResponse.class, this, super.toString());
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cf345b81/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceContextImpl.java
index 66061d5..490b598 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceContextImpl.java
@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutorService;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.services.Service;
import org.apache.ignite.services.ServiceContext;
@@ -48,6 +49,7 @@ public class ServiceContextImpl implements ServiceContext {
private final String cacheName;
/** Affinity key. */
+ @GridToStringInclude
private final Object affKey;
/** Executor service. */
http://git-wip-us.apache.org/repos/asf/ignite/blob/cf345b81/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
index 0c49b51..8d578ac 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
@@ -87,7 +87,7 @@ public class GridToStringBuilder {
private static final ReadWriteLock rwLock = new ReentrantReadWriteLock();
/** Maximum number of collection (map) entries to print. */
- public static final int MAX_COL_SIZE = 100;
+ public static final int MAX_COL_SIZE = 200;
/** {@link IgniteSystemProperties#IGNITE_TO_STRING_INCLUDE_SENSITIVE} */
public static final boolean INCLUDE_SENSITIVE =
http://git-wip-us.apache.org/repos/asf/ignite/blob/cf345b81/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index af12d3b..35d3032 100755
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -346,6 +346,10 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
private boolean enableForcibleNodeKill = IgniteSystemProperties
.getBoolean(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
+ /** */
+ private boolean enableTroubleshootingLog = IgniteSystemProperties
+ .getBoolean(IgniteSystemProperties.IGNITE_TROUBLESHOOTING_LOGGER);
+
/** Server listener. */
private final GridNioServerListener<Message> srvLsnr =
new GridNioServerListenerAdapter<Message>() {
@@ -459,8 +463,8 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
final ClusterNode rmtNode = getSpiContext().node(sndId);
if (rmtNode == null) {
- if (log.isDebugEnabled())
- log.debug("Close incoming connection, unknown node: " + sndId);
+ U.warn(log, "Close incoming connection, unknown node [nodeId=" + sndId +
+ ", ses=" + ses + ']');
ses.close();
@@ -523,10 +527,10 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
if (oldClient != null) {
if (oldClient instanceof GridTcpNioCommunicationClient) {
- if (log.isDebugEnabled())
- log.debug("Received incoming connection when already connected " +
- "to this node, rejecting [locNode=" + locNode.id() +
- ", rmtNode=" + sndId + ']');
+ if (log.isInfoEnabled())
+ log.info("Received incoming connection when already connected " +
+ "to this node, rejecting [locNode=" + locNode.id() +
+ ", rmtNode=" + sndId + ']');
ses.send(new RecoveryLastReceivedMessage(ALREADY_CONNECTED));
@@ -555,10 +559,10 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
if (oldClient instanceof GridTcpNioCommunicationClient) {
assert oldClient.connectionIndex() == connKey.connectionIndex() : oldClient;
- if (log.isDebugEnabled())
- log.debug("Received incoming connection when already connected " +
- "to this node, rejecting [locNode=" + locNode.id() +
- ", rmtNode=" + sndId + ']');
+ if (log.isInfoEnabled())
+ log.info("Received incoming connection when already connected " +
+ "to this node, rejecting [locNode=" + locNode.id() +
+ ", rmtNode=" + sndId + ']');
ses.send(new RecoveryLastReceivedMessage(ALREADY_CONNECTED));
@@ -578,7 +582,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
if (log.isDebugEnabled())
log.debug("Received incoming connection from remote node " +
- "[rmtNode=" + rmtNode.id() + ", reserved=" + reserved +
+ "[rmtNode=" + rmtNode.id() + ", reserved=" + reserved +
", recovery=" + recoveryDesc + ']');
if (reserved) {
@@ -595,11 +599,11 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
}
else {
if (oldFut instanceof ConnectFuture && locNode.order() < rmtNode.order()) {
- if (log.isDebugEnabled()) {
- log.debug("Received incoming connection from remote node while " +
- "connecting to this node, rejecting [locNode=" + locNode.id() +
- ", locNodeOrder=" + locNode.order() + ", rmtNode=" + rmtNode.id() +
- ", rmtNodeOrder=" + rmtNode.order() + ']');
+ if (log.isInfoEnabled()) {
+ log.info("Received incoming connection from remote node while " +
+ "connecting to this node, rejecting [locNode=" + locNode.id() +
+ ", locNodeOrder=" + locNode.order() + ", rmtNode=" + rmtNode.id() +
+ ", rmtNodeOrder=" + rmtNode.order() + ']');
}
ses.send(new RecoveryLastReceivedMessage(ALREADY_CONNECTED));
@@ -3131,11 +3135,11 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
", addr=" + addr + ", err=" + e + ']');
if (attempt == reconCnt || connTimeout0 > maxConnTimeout) {
- if (log.isDebugEnabled())
- log.debug("Handshake timedout (will stop attempts to perform the handshake) " +
- "[timeout=" + connTimeout0 + ", maxConnTimeout=" + maxConnTimeout +
- ", attempt=" + attempt + ", reconCnt=" + reconCnt +
- ", err=" + e.getMessage() + ", addr=" + addr + ']');
+ U.warn(log, "Handshake timedout (will stop attempts to perform the handshake) " +
+ "[node=" + node.id() + ", timeout=" + connTimeout0 +
+ ", maxConnTimeout=" + maxConnTimeout +
+ ", attempt=" + attempt + ", reconCnt=" + reconCnt +
+ ", err=" + e.getMessage() + ", addr=" + addr + ']');
if (errs == null)
errs = new IgniteCheckedException("Failed to connect to node (is node still alive?). " +
@@ -3172,6 +3176,11 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
boolean failureDetThrReached = timeoutHelper.checkFailureTimeoutReached(e);
+ if (enableTroubleshootingLog)
+ U.error(log, "Failed to establish connection to a remote node [node=" + node +
+ ", addr=" + addr + ", connectAttempts=" + connectAttempts +
+ ", failureDetThrReached=" + failureDetThrReached + ']', e);
+
if (failureDetThrReached)
LT.warn(log, "Connect timed out (consider increasing 'failureDetectionTimeout' " +
"configuration property) [addr=" + addr + ", failureDetectionTimeout=" +
@@ -3216,15 +3225,14 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
"operating system firewall is disabled on local and remote hosts) " +
"[addrs=" + addrs + ']');
- if (enableForcibleNodeKill) {
- if (getSpiContext().node(node.id()) != null && (CU.clientNode(node) || !CU.clientNode(getLocalNode())) &&
- X.hasCause(errs, ConnectException.class, HandshakeException.class,
- SocketTimeoutException.class, HandshakeTimeoutException.class,
- IgniteSpiOperationTimeoutException.class)) {
+ if (enableForcibleNodeKill) {if (getSpiContext().node(node.id()) != null && (CU.clientNode(node) || !CU.clientNode(getLocalNode())) &&
+ X.hasCause(errs, ConnectException.class,HandshakeException.class, SocketTimeoutException.class, HandshakeTimeoutException.class,
+ IgniteSpiOperationTimeoutException.class)) {String msg = "TcpCommunicationSpi failed to establish connection to node, node will be dropped from " +
+ "cluster [" + "rmtNode=" + node + ']';
- U.error(log, "TcpCommunicationSpi failed to establish connection to node, node will be dropped from " +
- "cluster [" +
- "rmtNode=" + node + "]", errs);
+ if(enableTroubleshootingLog)U.error(log, msg, errs);
+ else
+ U.warn(log, msg);
getSpiContext().failNode(node.id(), "TcpCommunicationSpi failed to establish connection to node [" +
"rmtNode=" + node +
http://git-wip-us.apache.org/repos/asf/ignite/blob/cf345b81/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 d75aae9..d621fb3 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
@@ -521,9 +521,6 @@ class ServerImpl extends TcpDiscoveryImpl {
@Override public boolean pingNode(UUID nodeId) {
assert nodeId != null;
- if (log.isDebugEnabled())
- log.debug("Pinging node: " + nodeId + "]");
-
if (nodeId == getLocalNodeId())
return true;
@@ -535,8 +532,18 @@ class ServerImpl extends TcpDiscoveryImpl {
if (!nodeAlive(nodeId))
return false;
+ long start = U.currentTimeMillis();
+
+ if (log.isInfoEnabled())
+ log.info("Pinging node: " + nodeId);
+
boolean res = pingNode(node);
+ long end = System.currentTimeMillis();
+
+ if (log.isInfoEnabled())
+ log.info("Finished node ping [nodeId=" + nodeId + ", res=" + res + ", time=" + (end - start) + "ms]");
+
if (!res && !node.isClient() && nodeAlive(nodeId)) {
LT.warn(log, "Failed to ping node (status check will be initiated): " + nodeId);
@@ -1698,9 +1705,9 @@ class ServerImpl extends TcpDiscoveryImpl {
assert log.isInfoEnabled();
- synchronized (mux) {
- StringBuilder b = new StringBuilder(U.nl());
+ StringBuilder b = new StringBuilder(U.nl());
+ synchronized (mux) {
b.append(">>>").append(U.nl());
b.append(">>>").append("Dumping discovery SPI debug info.").append(U.nl());
b.append(">>>").append(U.nl());
@@ -1747,9 +1754,9 @@ class ServerImpl extends TcpDiscoveryImpl {
b.append(U.nl());
b.append("Stats: ").append(spi.stats).append(U.nl());
-
- U.quietAndInfo(log, b.toString());
}
+
+ U.quietAndInfo(log, b.toString());
}
/**
@@ -3137,12 +3144,8 @@ class ServerImpl extends TcpDiscoveryImpl {
// If node existed on connection initialization we should check
// whether it has not gone yet.
- if (nextNodeExists)
- U.warn(log, "Failed to send message to next node [msg=" + msg + ", next=" + next +
- ", errMsg=" + (err != null ? err.getMessage() : "N/A") + ']');
- else if (log.isDebugEnabled())
- log.debug("Failed to send message to next node [msg=" + msg + ", next=" + next +
- ", errMsg=" + (err != null ? err.getMessage() : "N/A") + ']');
+ U.warn(log, "Failed to send message to next node [msg=" + msg + ", next=" + next +
+ ", errMsg=" + (err != null ? err.getMessage() : "N/A") + ']');
}
}
@@ -3324,6 +3327,8 @@ class ServerImpl extends TcpDiscoveryImpl {
if (existingNode != null) {
if (!node.socketAddresses().equals(existingNode.socketAddresses())) {
if (!pingNode(existingNode)) {
+ U.warn(log, "Sending node failed message for existing node: " + node);
+
addMessage(new TcpDiscoveryNodeFailedMessage(locNodeId,
existingNode.id(), existingNode.internalOrder()));
@@ -5373,8 +5378,7 @@ class ServerImpl extends TcpDiscoveryImpl {
if (msgs != null) {
for (TcpDiscoveryNodeFailedMessage msg : msgs) {
- if (log.isDebugEnabled())
- log.debug("Add node failed message for node from failed nodes list: " + msg);
+ U.warn(log, "Added node failed message for node from failed nodes list: " + msg);
addMessage(msg);
}
@@ -5593,8 +5597,9 @@ class ServerImpl extends TcpDiscoveryImpl {
long tstamp = U.currentTimeMillis();
- if (log.isDebugEnabled())
- log.debug("Accepted incoming connection from addr: " + sock.getInetAddress());
+ if (log.isInfoEnabled())
+ log.info("TCP discovery accepted incoming connection " +
+ "[rmtAddr=" + sock.getInetAddress() + ", rmtPort=" + sock.getPort() + ']');
SocketReader reader = new SocketReader(sock);
@@ -5602,6 +5607,10 @@ class ServerImpl extends TcpDiscoveryImpl {
readers.add(reader);
}
+ if (log.isInfoEnabled())
+ log.info("TCP discovery spawning a new thread for connection " +
+ "[rmtAddr=" + sock.getInetAddress() + ", rmtPort=" + sock.getPort() + ']');
+
reader.start();
spi.stats.onServerSocketInitialized(U.currentTimeMillis() - tstamp);
@@ -5664,6 +5673,12 @@ class ServerImpl extends TcpDiscoveryImpl {
ClientMessageWorker clientMsgWrk = null;
+ SocketAddress rmtAddr = sock.getRemoteSocketAddress();
+
+ if (log.isInfoEnabled())
+ log.info("Started serving remote node connection [rmtAddr=" + rmtAddr +
+ ", rmtPort=" + sock.getPort() + ']');
+
boolean srvSock;
try {
@@ -5696,11 +5711,11 @@ class ServerImpl extends TcpDiscoveryImpl {
else {
if (log.isDebugEnabled())
log.debug("Failed to read magic header (too few bytes received) " +
- "[rmtAddr=" + sock.getRemoteSocketAddress() +
+ "[rmtAddr=" + rmtAddr +
", locAddr=" + sock.getLocalSocketAddress() + ']');
LT.warn(log, "Failed to read magic header (too few bytes received) [rmtAddr=" +
- sock.getRemoteSocketAddress() + ", locAddr=" + sock.getLocalSocketAddress() + ']');
+ rmtAddr + ", locAddr=" + sock.getLocalSocketAddress() + ']');
return;
}
@@ -5712,7 +5727,7 @@ class ServerImpl extends TcpDiscoveryImpl {
"this Ignite port?" +
(!spi.isSslEnabled() ? " missed SSL configuration?" : "" ) +
") " +
- "[rmtAddr=" + sock.getRemoteSocketAddress() +
+ "[rmtAddr=" + rmtAddr +
", locAddr=" + sock.getLocalSocketAddress() + ']');
LT.warn(log, "Unknown connection detected (is some other software connecting to " +
@@ -5733,6 +5748,11 @@ class ServerImpl extends TcpDiscoveryImpl {
if (!spi.isNodeStopping0()) {
TcpDiscoveryPingRequest req = (TcpDiscoveryPingRequest)msg;
+ if (log.isInfoEnabled())
+ log.info("Received ping request from the remote node " +
+ "[rmtNodeId=" + msg.creatorNodeId() +
+ ", rmtAddr=" + rmtAddr + ", rmtPort=" + sock.getPort() + "]");
+
TcpDiscoveryPingResponse res = new TcpDiscoveryPingResponse(locNodeId);
IgniteSpiOperationTimeoutHelper timeoutHelper =
@@ -5746,6 +5766,12 @@ class ServerImpl extends TcpDiscoveryImpl {
}
spi.writeToSocket(sock, res, timeoutHelper.nextTimeoutChunk(spi.getSocketTimeout()));
+
+ sock.shutdownOutput();
+
+ if (log.isInfoEnabled())
+ log.info("Finished writing ping response " + "[rmtNodeId=" + msg.creatorNodeId() +
+ ", rmtAddr=" + rmtAddr + ", rmtPort=" + sock.getPort() + "]");
}
else if (log.isDebugEnabled())
log.debug("Ignore ping request, node is stopping.");
@@ -5872,7 +5898,7 @@ class ServerImpl extends TcpDiscoveryImpl {
else if (e.hasCause(ClassNotFoundException.class))
LT.warn(log, "Failed to read message due to ClassNotFoundException " +
"(make sure same versions of all classes are available on all nodes) " +
- "[rmtAddr=" + sock.getRemoteSocketAddress() +
+ "[rmtAddr=" + rmtAddr +
", err=" + X.cause(e, ClassNotFoundException.class).getMessage() + ']');
// Always report marshalling problems.
@@ -6162,6 +6188,10 @@ class ServerImpl extends TcpDiscoveryImpl {
}
U.closeQuiet(sock);
+
+ if (log.isInfoEnabled())
+ log.info("Finished serving remote node connection [rmtAddr=" + rmtAddr +
+ ", rmtPort=" + sock.getPort());
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cf345b81/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 371f308..c988d7e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -1585,7 +1585,8 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi {
catch (IOException | IgniteCheckedException e) {
if (X.hasCause(e, SocketTimeoutException.class))
LT.warn(log, "Timed out waiting for message to be read (most probably, the reason is " +
- "in long GC pauses on remote node) [curTimeout=" + timeout + ']');
+ "long GC pauses on remote node) [curTimeout=" + timeout +
+ ", rmtAddr=" + sock.getRemoteSocketAddress() + ", rmtPort=" + sock.getPort() + ']');
throw e;
}
@@ -1626,8 +1627,9 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi {
catch (SocketTimeoutException e) {
LT.warn(log, "Timed out waiting for message delivery receipt (most probably, the reason is " +
"in long GC pauses on remote node; consider tuning GC and increasing 'ackTimeout' " +
- "configuration property). Will retry to send message with increased timeout. " +
- "Current timeout: " + timeout + '.');
+ "configuration property). Will retry to send message with increased timeout " +
+ "[currentTimeout=" + timeout + ", rmtAddr=" + sock.getRemoteSocketAddress() +
+ ", rmtPort=" + sock.getPort() + ']');
stats.onAckTimeout();
@@ -2164,9 +2166,11 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi {
LT.warn(log, "Socket write has timed out (consider increasing " +
(failureDetectionTimeoutEnabled() ?
- "'IgniteConfiguration.failureDetectionTimeout' configuration property) [" +
- "failureDetectionTimeout=" + failureDetectionTimeout() + ']' :
- "'sockTimeout' configuration property) [sockTimeout=" + sockTimeout + ']'));
+ "'IgniteConfiguration.failureDetectionTimeout' configuration property) [" +
+ "failureDetectionTimeout=" + failureDetectionTimeout() :
+ "'sockTimeout' configuration property) [sockTimeout=" + sockTimeout) +
+ ", rmtAddr=" + sock.getRemoteSocketAddress() + ", rmtPort=" + sock.getPort() +
+ ", sockTimeout=" + sockTimeout + ']');
stats.onSocketTimeout();
}
[06/32] ignite git commit: IGNITE-4831: Add an option to disable
MBeans. This closes #2265.
Posted by sb...@apache.org.
IGNITE-4831: Add an option to disable MBeans. This closes #2265.
(cherry picked from commit 7283edb)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9fa78849
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9fa78849
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9fa78849
Branch: refs/heads/ignite-5578
Commit: 9fa78849c1ecc45fa56f518ad229e76725c27790
Parents: 1e7e692
Author: Andrey V. Mashenkov <an...@gmail.com>
Authored: Fri Jul 14 14:12:29 2017 +0300
Committer: Andrey V. Mashenkov <an...@gmail.com>
Committed: Fri Jul 14 14:29:25 2017 +0300
----------------------------------------------------------------------
.../apache/ignite/IgniteSystemProperties.java | 8 ++
.../org/apache/ignite/cache/CacheManager.java | 10 ++
.../apache/ignite/internal/IgniteKernal.java | 71 ++++++-----
.../org/apache/ignite/internal/IgnitionEx.java | 10 +-
.../client/router/impl/GridTcpRouterImpl.java | 57 ++++++---
.../processors/cache/GridCacheProcessor.java | 11 +-
.../GridCacheDatabaseSharedManager.java | 28 +++--
.../IgniteCacheDatabaseSharedManager.java | 44 ++++---
.../ignite/internal/util/IgniteUtils.java | 23 +++-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 10 +-
.../testsuites/IgniteUtilSelfTestSuite.java | 2 +
.../util/mbeans/GridMBeanDisableSelfTest.java | 121 +++++++++++++++++++
12 files changed, 312 insertions(+), 83 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9fa78849/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index 35b0577..1a2887a 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -404,6 +404,14 @@ public final class IgniteSystemProperties {
public static final String IGNITE_MBEAN_APPEND_CLASS_LOADER_ID = "IGNITE_MBEAN_APPEND_CLASS_LOADER_ID";
/**
+ * If property is set to {@code true}, then Ignite will disable MBeans registration.
+ * This may be helpful if MBeans are not allowed e.g. for security reasons.
+ *
+ * Default is {@code false}
+ */
+ public static final String IGNITE_MBEANS_DISABLED = "IGNITE_MBEANS_DISABLED";
+
+ /**
* Property controlling size of buffer holding last exception. Default value of {@code 1000}.
*/
public static final String IGNITE_EXCEPTION_REGISTRY_MAX_SIZE = "IGNITE_EXCEPTION_REGISTRY_MAX_SIZE";
http://git-wip-us.apache.org/repos/asf/ignite/blob/9fa78849/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
index 97409fa..351cd0d 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
@@ -44,6 +44,7 @@ import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.internal.IgnitionEx;
import org.apache.ignite.internal.mxbean.IgniteStandardMXBean;
import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
+import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
@@ -314,6 +315,9 @@ public class CacheManager implements javax.cache.CacheManager {
/** {@inheritDoc} */
@Override public void enableManagement(String cacheName, boolean enabled) {
+ if(IgniteUtils.IGNITE_MBEANS_DISABLED)
+ return;
+
kernalGateway.readLock();
try {
@@ -336,6 +340,9 @@ public class CacheManager implements javax.cache.CacheManager {
/** {@inheritDoc} */
@Override public void enableStatistics(String cacheName, boolean enabled) {
+ if(IgniteUtils.IGNITE_MBEANS_DISABLED)
+ return;
+
kernalGateway.readLock();
try {
@@ -389,6 +396,9 @@ public class CacheManager implements javax.cache.CacheManager {
* @param beanType Mxbean name.
*/
private void unregisterCacheObject(String name, String beanType) {
+ if(IgniteUtils.IGNITE_MBEANS_DISABLED)
+ return;
+
MBeanServer mBeanSrv = ignite.configuration().getMBeanServer();
Set<ObjectName> registeredObjNames = mBeanSrv.queryNames(getObjectName(name, beanType), null);
http://git-wip-us.apache.org/repos/asf/ignite/blob/9fa78849/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 0c17b32..00c1d73 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1605,6 +1605,9 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
/** @throws IgniteCheckedException If registration failed. */
private void registerKernalMBean() throws IgniteCheckedException {
+ if(U.IGNITE_MBEANS_DISABLED)
+ return;
+
try {
kernalMBean = U.registerMBean(
cfg.getMBeanServer(),
@@ -1626,6 +1629,9 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
/** @throws IgniteCheckedException If registration failed. */
private void registerLocalNodeMBean() throws IgniteCheckedException {
+ if(U.IGNITE_MBEANS_DISABLED)
+ return;
+
ClusterLocalNodeMetricsMXBean mbean = new ClusterLocalNodeMetricsMXBeanImpl(ctx.discovery().localNode());
try {
@@ -1662,7 +1668,9 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
ExecutorService mgmtExecSvc,
ExecutorService restExecSvc,
ExecutorService qryExecSvc,
- ExecutorService schemaExecSvc) throws IgniteCheckedException {
+ ExecutorService schemaExecSvc
+ ) throws IgniteCheckedException {if(U.IGNITE_MBEANS_DISABLED)
+ return;
pubExecSvcMBean = registerExecutorMBean(execSvc, "GridExecutionExecutor");
sysExecSvcMBean = registerExecutorMBean(sysExecSvc, "GridSystemExecutor");
mgmtExecSvcMBean = registerExecutorMBean(mgmtExecSvc, "GridManagementExecutor");
@@ -1684,6 +1692,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
*/
private ObjectName registerExecutorMBean(ExecutorService exec, String name) throws IgniteCheckedException {
assert exec != null;
+ assert !U.IGNITE_MBEANS_DISABLED;
try {
ObjectName res = U.registerMBean(
@@ -1710,24 +1719,26 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
* @throws IgniteCheckedException If registration failed.
*/
private void registerStripedExecutorMBean(StripedExecutor stripedExecSvc) throws IgniteCheckedException {
- if (stripedExecSvc != null) {
- String name = "StripedExecutor";
+ if (stripedExecSvc == null || U.IGNITE_MBEANS_DISABLED)
+ return;
- try {
- stripedExecSvcMBean = U.registerMBean(
- cfg.getMBeanServer(),
- cfg.getIgniteInstanceName(),
- "Thread Pools",
- name,
- new StripedExecutorMXBeanAdapter(stripedExecSvc),
- StripedExecutorMXBean.class);
+ String name = "StripedExecutor";
- if (log.isDebugEnabled())
- log.debug("Registered executor service MBean: " + stripedExecSvcMBean);
- } catch (JMException e) {
- throw new IgniteCheckedException("Failed to register executor service MBean [name="
- + name + ", exec=" + stripedExecSvc + ']', e);
- }
+ try {
+ stripedExecSvcMBean = U.registerMBean(
+ cfg.getMBeanServer(),
+ cfg.getIgniteInstanceName(),
+ "Thread Pools",
+ name,
+ new StripedExecutorMXBeanAdapter(stripedExecSvc),
+ StripedExecutorMXBean.class);
+
+ if (log.isDebugEnabled())
+ log.debug("Registered executor service MBean: " + stripedExecSvcMBean);
+ }
+ catch (JMException e) {
+ throw new IgniteCheckedException("Failed to register executor service MBean [name="
+ + name + ", exec=" + stripedExecSvc + ']', e);
}
}
@@ -1738,22 +1749,24 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
* @return {@code True} if successfully unregistered, {@code false} otherwise.
*/
private boolean unregisterMBean(@Nullable ObjectName mbean) {
- if (mbean != null)
- try {
- cfg.getMBeanServer().unregisterMBean(mbean);
+ if (mbean == null)
+ return true;
- if (log.isDebugEnabled())
- log.debug("Unregistered MBean: " + mbean);
+ assert !U.IGNITE_MBEANS_DISABLED;
- return true;
- }
- catch (JMException e) {
- U.error(log, "Failed to unregister MBean.", e);
+ try {
+ cfg.getMBeanServer().unregisterMBean(mbean);
- return false;
- }
+ if (log.isDebugEnabled())
+ log.debug("Unregistered MBean: " + mbean);
- return true;
+ return true;
+ }
+ catch (JMException e) {
+ U.error(log, "Failed to unregister MBean.", e);
+
+ return false;
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9fa78849/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 187d4af..d219333 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
@@ -2120,7 +2120,7 @@ public class IgnitionEx {
if (myCfg.getUserAttributes() == null)
myCfg.setUserAttributes(Collections.<String, Object>emptyMap());
- if (myCfg.getMBeanServer() == null)
+ if (myCfg.getMBeanServer() == null && !U.IGNITE_MBEANS_DISABLED)
myCfg.setMBeanServer(ManagementFactory.getPlatformMBeanServer());
Marshaller marsh = myCfg.getMarshaller();
@@ -2570,6 +2570,11 @@ public class IgnitionEx {
* @throws IgniteCheckedException If registration failed.
*/
private void registerFactoryMbean(MBeanServer srv) throws IgniteCheckedException {
+ if(U.IGNITE_MBEANS_DISABLED)
+ return;
+
+ assert srv != null;
+
synchronized (mbeans) {
GridMBeanServerData data = mbeans.get(srv);
@@ -2620,6 +2625,9 @@ public class IgnitionEx {
* Unregister delegate Mbean instance for {@link Ignition}.
*/
private void unregisterFactoryMBean() {
+ if(U.IGNITE_MBEANS_DISABLED)
+ return;
+
synchronized (mbeans) {
Iterator<Entry<MBeanServer, GridMBeanServerData>> iter = mbeans.entrySet().iterator();
http://git-wip-us.apache.org/repos/asf/ignite/blob/9fa78849/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterImpl.java
index cb8325b..da55ec7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterImpl.java
@@ -169,6 +169,32 @@ public class GridTcpRouterImpl implements GridTcpRouter, GridTcpRouterMBean, Lif
"are in use) [firstPort=" + cfg.getPort() + ", lastPort=" + (cfg.getPort() + cfg.getPortRange()) +
", addr=" + hostAddr + ']');
+ registerMBean();
+ }
+
+ /**
+ * Stops this router.
+ */
+ @Override public void stop() {
+ if (srv != null)
+ srv.stop();
+
+ if (client != null)
+ client.stop(true);
+
+ unregisterMBean();
+
+ if (log.isInfoEnabled())
+ log.info("TCP router successfully stopped.");
+ }
+
+ /**
+ * Try to register MBean.
+ */
+ private void registerMBean() {
+ if (U.IGNITE_MBEANS_DISABLED)
+ return;
+
try {
ObjectName objName = U.registerMBean(
ManagementFactory.getPlatformMBeanServer(),
@@ -189,28 +215,23 @@ public class GridTcpRouterImpl implements GridTcpRouter, GridTcpRouterMBean, Lif
}
/**
- * Stops this router.
+ * Unregister MBean.
*/
- @Override public void stop() {
- if (srv != null)
- srv.stop();
-
- if (client != null)
- client.stop(true);
+ private void unregisterMBean() {
+ if (mbeanName == null)
+ return;
- if (mbeanName != null)
- try {
- ManagementFactory.getPlatformMBeanServer().unregisterMBean(mbeanName);
+ assert !U.IGNITE_MBEANS_DISABLED;
- if (log.isDebugEnabled())
- log.debug("Unregistered MBean: " + mbeanName);
- }
- catch (JMException e) {
- U.error(log, "Failed to unregister MBean.", e);
- }
+ try {
+ ManagementFactory.getPlatformMBeanServer().unregisterMBean(mbeanName);
- if (log.isInfoEnabled())
- log.info("TCP router successfully stopped.");
+ if (log.isDebugEnabled())
+ log.debug("Unregistered MBean: " + mbeanName);
+ }
+ catch (JMException e) {
+ U.error(log, "Failed to unregister MBean.", e);
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9fa78849/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 5149d4b..5b709b3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -37,7 +37,6 @@ import java.util.concurrent.CountDownLatch;
import javax.cache.configuration.Factory;
import javax.cache.integration.CacheLoader;
import javax.cache.integration.CacheWriter;
-import javax.management.JMException;
import javax.management.MBeanServer;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
@@ -3584,6 +3583,9 @@ public class GridCacheProcessor extends GridProcessorAdapter {
@SuppressWarnings("unchecked")
private void registerMbean(Object obj, @Nullable String cacheName, boolean near)
throws IgniteCheckedException {
+ if(U.IGNITE_MBEANS_DISABLED)
+ return;
+
assert obj != null;
MBeanServer srvr = ctx.config().getMBeanServer();
@@ -3602,7 +3604,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
U.registerCacheMBean(srvr, ctx.igniteInstanceName(), cacheName, obj.getClass().getName(), mbeanImpl,
(Class<Object>)itf);
}
- catch (JMException e) {
+ catch (Throwable e) {
throw new IgniteCheckedException("Failed to register MBean for component: " + obj, e);
}
@@ -3619,6 +3621,9 @@ public class GridCacheProcessor extends GridProcessorAdapter {
* @param near Near flag.
*/
private void unregisterMbean(Object o, @Nullable String cacheName, boolean near) {
+ if(U.IGNITE_MBEANS_DISABLED)
+ return;
+
assert o != null;
MBeanServer srvr = ctx.config().getMBeanServer();
@@ -3645,7 +3650,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
try {
srvr.unregisterMBean(U.makeCacheMBeanName(ctx.igniteInstanceName(), cacheName, o.getClass().getName()));
}
- catch (JMException e) {
+ catch (Throwable e) {
U.error(log, "Failed to unregister MBean for component: " + o, e);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9fa78849/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
index d147f36..39038ba 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
@@ -477,9 +477,13 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
}
/**
+ * Try to register Metrics MBean.
* @throws IgniteCheckedException If failed.
*/
private void registrateMetricsMBean() throws IgniteCheckedException {
+ if (U.IGNITE_MBEANS_DISABLED)
+ return;
+
try {
persistenceMetricsMbeanName = U.registerMBean(
cctx.kernalContext().config().getMBeanServer(),
@@ -489,25 +493,25 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
persStoreMetrics,
PersistenceMetricsMXBean.class);
}
- catch (JMException e) {
+ catch (Throwable e) {
throw new IgniteCheckedException("Failed to register " + MBEAN_NAME + " MBean.", e);
}
}
/**
- *
+ * Unregister metrics MBean.
*/
private void unRegistrateMetricsMBean() {
- if (persistenceMetricsMbeanName != null) {
- try {
- cctx.kernalContext().config().getMBeanServer().unregisterMBean(persistenceMetricsMbeanName);
- }
- catch (InstanceNotFoundException ignore) {
- // No-op, nothing to unregister.
- }
- catch (MBeanRegistrationException e) {
- U.error(log, "Failed to unregister " + MBEAN_NAME + " MBean.", e);
- }
+ if (persistenceMetricsMbeanName == null)
+ return;
+
+ assert !U.IGNITE_MBEANS_DISABLED;
+
+ try {
+ cctx.kernalContext().config().getMBeanServer().unregisterMBean(persistenceMetricsMbeanName);
+ }
+ catch (Throwable e) {
+ U.error(log, "Failed to unregister " + MBEAN_NAME + " MBean.", e);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9fa78849/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java
index c503fb4..eec3b85 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java
@@ -115,6 +115,9 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap
* Registers MBeans for all MemoryMetrics configured in this instance.
*/
private void registerMetricsMBeans() {
+ if(U.IGNITE_MBEANS_DISABLED)
+ return;
+
IgniteConfiguration cfg = cctx.gridConfig();
for (MemoryMetrics memMetrics : memMetricsMap.values()) {
@@ -134,6 +137,8 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap
MemoryPolicyConfiguration memPlcCfg,
IgniteConfiguration cfg
) {
+ assert !U.IGNITE_MBEANS_DISABLED;
+
try {
U.registerMBean(
cfg.getMBeanServer(),
@@ -143,7 +148,7 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap
new MemoryMetricsMXBeanImpl(memMetrics, memPlcCfg),
MemoryMetricsMXBean.class);
}
- catch (JMException e) {
+ catch (Throwable e) {
U.error(log, "Failed to register MBean for MemoryMetrics with name: '" + memMetrics.getName() + "'", e);
}
}
@@ -647,19 +652,7 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap
memPlc.evictionTracker().stop();
- IgniteConfiguration cfg = cctx.gridConfig();
-
- try {
- cfg.getMBeanServer().unregisterMBean(
- U.makeMBeanName(
- cfg.getIgniteInstanceName(),
- "MemoryMetrics",
- memPlc.memoryMetrics().getName()));
- }
- catch (JMException e) {
- U.error(log, "Failed to unregister MBean for memory metrics: " +
- memPlc.memoryMetrics().getName(), e);
- }
+ unregisterMBean(memPlc.memoryMetrics().getName());
}
memPlcMap.clear();
@@ -669,6 +662,29 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap
}
/**
+ * Unregister MBean.
+ * @param name Name of mbean.
+ */
+ private void unregisterMBean(String name) {
+ if(U.IGNITE_MBEANS_DISABLED)
+ return;
+
+ IgniteConfiguration cfg = cctx.gridConfig();
+
+ try {
+ cfg.getMBeanServer().unregisterMBean(
+ U.makeMBeanName(
+ cfg.getIgniteInstanceName(),
+ "MemoryMetrics", name
+ ));
+ }
+ catch (Throwable e) {
+ U.error(log, "Failed to unregister MBean for memory metrics: " +
+ name, e);
+ }
+ }
+
+ /**
*
*/
public boolean persistenceEnabled() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/9fa78849/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 6b94d09..6a3be55 100755
--- 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
@@ -139,6 +139,7 @@ import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream;
import javax.management.DynamicMBean;
import javax.management.JMException;
+import javax.management.MBeanRegistrationException;
import javax.management.MBeanServer;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
@@ -155,6 +156,7 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteClientDisconnectedException;
import org.apache.ignite.IgniteDeploymentException;
import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteIllegalStateException;
import org.apache.ignite.IgniteInterruptedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.IgniteSystemProperties;
@@ -515,11 +517,14 @@ public abstract class IgniteUtils {
}
};
+ /** Ignite MBeans disabled flag. */
+ public static boolean IGNITE_MBEANS_DISABLED = IgniteSystemProperties.getBoolean(IgniteSystemProperties.IGNITE_MBEANS_DISABLED);
+
/** */
private static final boolean assertionsEnabled;
/*
- *
+ * Initializes enterprise check.
*/
static {
boolean assertionsEnabled0 = true;
@@ -4486,10 +4491,12 @@ public abstract class IgniteUtils {
* @param impl MBean implementation.
* @param itf MBean interface.
* @return JMX object name.
+ * @throws MBeanRegistrationException if MBeans are disabled.
* @throws JMException If MBean creation failed.
*/
- public static <T> ObjectName registerMBean(MBeanServer mbeanSrv, @Nullable String igniteInstanceName,
- @Nullable String grp, String name, T impl, @Nullable Class<T> itf) throws JMException {
+ public static <T> ObjectName registerMBean(MBeanServer mbeanSrv, @Nullable String igniteInstanceName, @Nullable String grp,
+ String name, T impl, @Nullable Class<T> itf) throws JMException {if(IGNITE_MBEANS_DISABLED)
+ throw new MBeanRegistrationException(new IgniteIllegalStateException("No MBeans are allowed."));
assert mbeanSrv != null;
assert name != null;
assert itf != null;
@@ -4510,10 +4517,15 @@ public abstract class IgniteUtils {
* @param impl MBean implementation.
* @param itf MBean interface.
* @return JMX object name.
+ * @throws MBeanRegistrationException if MBeans are disabled.
* @throws JMException If MBean creation failed.
+ * @throws IgniteException If MBean creation are not allowed.
*/
public static <T> ObjectName registerMBean(MBeanServer mbeanSrv, ObjectName name, T impl, Class<T> itf)
throws JMException {
+ if(IGNITE_MBEANS_DISABLED)
+ throw new MBeanRegistrationException(new IgniteIllegalStateException("MBeans are disabled."));
+
assert mbeanSrv != null;
assert name != null;
assert itf != null;
@@ -4536,10 +4548,15 @@ public abstract class IgniteUtils {
* @param impl MBean implementation.
* @param itf MBean interface.
* @return JMX object name.
+ * @throws MBeanRegistrationException if MBeans are disabled.
* @throws JMException If MBean creation failed.
+ * @throws IgniteException If MBean creation are not allowed.
*/
public static <T> ObjectName registerCacheMBean(MBeanServer mbeanSrv, @Nullable String igniteInstanceName,
@Nullable String cacheName, String name, T impl, Class<T> itf) throws JMException {
+ if(IGNITE_MBEANS_DISABLED)
+ throw new MBeanRegistrationException(new IgniteIllegalStateException("MBeans are disabled."));
+
assert mbeanSrv != null;
assert name != null;
assert itf != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9fa78849/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
index 59c2656..07ba214 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
@@ -401,9 +401,11 @@ public abstract class IgniteSpiAdapter implements IgniteSpi {
* @param <T> Type of the MBean
* @throws IgniteSpiException If registration failed.
*/
- protected final <T extends IgniteSpiManagementMBean> void registerMBean(
- String igniteInstanceName, T impl, Class<T> mbeanItf
- ) throws IgniteSpiException {
+ protected final <T extends IgniteSpiManagementMBean> void registerMBean(String igniteInstanceName, T impl, Class<T> mbeanItf
+ ) throws IgniteSpiException {
+ if(ignite == null || U.IGNITE_MBEANS_DISABLED)
+ return;
+
MBeanServer jmx = ignite.configuration().getMBeanServer();
assert mbeanItf == null || mbeanItf.isInterface();
@@ -428,6 +430,8 @@ public abstract class IgniteSpiAdapter implements IgniteSpi {
protected final void unregisterMBean() throws IgniteSpiException {
// Unregister SPI MBean.
if (spiMBean != null && ignite != null) {
+ assert !U.IGNITE_MBEANS_DISABLED;
+
MBeanServer jmx = ignite.configuration().getMBeanServer();
assert jmx != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9fa78849/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java
index 1298a75..20f37f7 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java
@@ -46,6 +46,7 @@ import org.apache.ignite.util.GridPartitionMapSelfTest;
import org.apache.ignite.util.GridQueueSelfTest;
import org.apache.ignite.util.GridSpinReadWriteLockSelfTest;
import org.apache.ignite.util.GridStringBuilderFactorySelfTest;
+import org.apache.ignite.util.mbeans.GridMBeanDisableSelfTest;
import org.apache.ignite.util.mbeans.GridMBeanSelfTest;
/**
@@ -77,6 +78,7 @@ public class IgniteUtilSelfTestSuite extends TestSuite {
suite.addTestSuite(GridToStringBuilderSelfTest.class);
suite.addTestSuite(GridByteArrayListSelfTest.class);
suite.addTestSuite(GridMBeanSelfTest.class);
+ suite.addTestSuite(GridMBeanDisableSelfTest.class);
suite.addTestSuite(GridLongListSelfTest.class);
suite.addTestSuite(GridIntListSelfTest.class);
suite.addTestSuite(GridArraysSelfTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/9fa78849/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanDisableSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanDisableSelfTest.java b/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanDisableSelfTest.java
new file mode 100644
index 0000000..f08f58b
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanDisableSelfTest.java
@@ -0,0 +1,121 @@
+/*
+ * 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.util.mbeans;
+
+import java.util.concurrent.Callable;
+import javax.management.MBeanRegistrationException;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.internal.util.IgniteUtils;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+/**
+ * Disabling MBeans test.
+ */
+public class GridMBeanDisableSelfTest extends GridCommonAbstractTest {
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ IgniteUtils.IGNITE_MBEANS_DISABLED = true;
+
+ super.beforeTestsStarted();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ super.afterTestsStopped();
+
+ IgniteUtils.IGNITE_MBEANS_DISABLED = false;
+ }
+
+ /**
+ * Test MBean registration.
+ *
+ * @throws Exception Thrown if test fails.
+ */
+ public void testCorrectMBeanInfo() throws Exception {
+ // Node should start and stopped with no errors.
+ try (final Ignite ignite = startGrid(0)) {
+
+ // Cache should be created and closed with no errors.
+ try (IgniteCache cache = ignite.getOrCreateCache(new CacheConfiguration("MyCache"))) {
+
+ final MBeanServer server = ignite.configuration().getMBeanServer();
+
+ GridTestUtils.assertThrowsWithCause(
+ new Callable<Void>() {
+ @Override public Void call() throws Exception {
+ U.registerMBean(server, ignite.name(), "dummy", "DummyMbean1", new DummyMBeanImpl(), DummyMBean.class);
+
+ return null;
+
+ }
+ }, MBeanRegistrationException.class);
+
+ GridTestUtils.assertThrowsWithCause(
+ new Callable<Void>() {
+ @Override public Void call() throws Exception {
+ ObjectName objName = U.makeMBeanName(
+ ignite.name(),
+ "dummy",
+ "DummyMbean2"
+ );
+
+ U.registerMBean(server, objName, new DummyMBeanImpl(), DummyMBean.class);
+
+ return null;
+
+ }
+ }, MBeanRegistrationException.class);
+
+ GridTestUtils.assertThrowsWithCause(
+ new Callable<Void>() {
+ @Override public Void call() throws Exception {
+ U.registerCacheMBean(server, ignite.name(), "MyCache", "DummyMbean3",
+ new DummyMBeanImpl(), DummyMBean.class);
+
+ return null;
+
+ }
+ }, MBeanRegistrationException.class);
+ }
+ }
+ }
+
+ /**
+ * MBean dummy interface.
+ */
+ interface DummyMBean {
+ /** */
+ void noop();
+ }
+
+ /**
+ * MBean stub.
+ */
+ static class DummyMBeanImpl implements DummyMBean {
+ /** {@inheritDoc} */
+ @Override public void noop() {
+ // No op.
+ }
+ }
+}
\ No newline at end of file
[03/32] ignite git commit: Functionality of GridVersionSelfTest is
debated now
Posted by sb...@apache.org.
Functionality of GridVersionSelfTest is debated now
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/871d9260
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/871d9260
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/871d9260
Branch: refs/heads/ignite-5578
Commit: 871d9260f3b32bed5273852dbdb74c758f73d383
Parents: d9ed07c
Author: Sergey Chugunov <se...@gmail.com>
Authored: Thu Jul 13 18:34:01 2017 +0300
Committer: Sergey Chugunov <se...@gmail.com>
Committed: Thu Jul 13 18:34:01 2017 +0300
----------------------------------------------------------------------
.../test/java/org/apache/ignite/internal/GridVersionSelfTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/871d9260/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java
index 4751a0c..13af907 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java
@@ -32,6 +32,8 @@ public class GridVersionSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testVersions() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-5413");
+
String propVal = System.getProperty(IGNITE_UPDATE_NOTIFIER);
System.setProperty(IGNITE_UPDATE_NOTIFIER, "true");
[21/32] ignite git commit: Forcible node drop makes cluster unstable
in some cases. Disable forcible node drop by default.
Posted by sb...@apache.org.
Forcible node drop makes cluster unstable in some cases. Disable forcible node drop by default.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e46cf958
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e46cf958
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e46cf958
Branch: refs/heads/ignite-5578
Commit: e46cf9582bb05c22a45b868c2c78ea7ed4818d62
Parents: a71691a
Author: Andrey V. Mashenkov <an...@gmail.com>
Authored: Tue Jul 18 15:49:00 2017 +0300
Committer: Andrey V. Mashenkov <an...@gmail.com>
Committed: Tue Jul 18 15:49:00 2017 +0300
----------------------------------------------------------------------
.../apache/ignite/IgniteSystemProperties.java | 6 ++
.../service/GridServiceProcessor.java | 4 +-
.../spi/IgniteSpiOperationTimeoutHelper.java | 8 +-
.../communication/tcp/TcpCommunicationSpi.java | 81 ++++++++++++++------
.../IgniteClientReconnectAbstractTest.java | 5 ++
...niteBinaryMetadataUpdateNodeRestartTest.java | 10 +++
.../IgniteCacheNearRestartRollbackSelfTest.java | 15 ++++
...teSynchronizationModesMultithreadedTest.java | 5 ++
.../org/apache/ignite/spi/GridTcpForwarder.java | 26 +++++++
.../tcp/TcpCommunicationSpiDropNodesTest.java | 15 ++++
.../TcpCommunicationSpiFaultyClientTest.java | 20 +++--
11 files changed, 160 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e46cf958/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index 616ac3f..5da7bd6 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -684,6 +684,12 @@ public final class IgniteSystemProperties {
"IGNITE_PARTITION_RELEASE_FUTURE_DUMP_THRESHOLD";
/**
+ * If this property is set, a node will forcible fail a remote node when it fails to establish a communication
+ * connection.
+ */
+ public static final String IGNITE_ENABLE_FORCIBLE_NODE_KILL = "IGNITE_ENABLE_FORCIBLE_NODE_KILL";
+
+ /**
* Enforces singleton.
*/
private IgniteSystemProperties() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/e46cf958/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 23a29f8..db632ec 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
@@ -1528,7 +1528,7 @@ public class GridServiceProcessor extends GridProcessorAdapter implements Ignite
private volatile AffinityTopologyVersion currTopVer = null;
/** {@inheritDoc} */
- @Override public void onEvent(DiscoveryEvent evt, final DiscoCache discoCache) {
+ @Override public void onEvent(final DiscoveryEvent evt, final DiscoCache discoCache) {
GridSpinBusyLock busyLock = GridServiceProcessor.this.busyLock;
if (busyLock == null || !busyLock.enterBusy())
@@ -1589,7 +1589,7 @@ public class GridServiceProcessor extends GridProcessorAdapter implements Ignite
log.info("Service processor detected a topology change during " +
"assignments calculation (will abort current iteration and " +
"re-calculate on the newer version): " +
- "[topVer=" + topVer + ", newTopVer=" + currTopVer + ']');
+ "[topVer=" + topVer + ", newTopVer=" + currTopVer0 + ']');
return;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e46cf958/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutHelper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutHelper.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutHelper.java
index c685ea9..b2432ce 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutHelper.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutHelper.java
@@ -98,7 +98,9 @@ public class IgniteSpiOperationTimeoutHelper {
if (!failureDetectionTimeoutEnabled)
return false;
- return e instanceof IgniteSpiOperationTimeoutException || e instanceof SocketTimeoutException ||
- X.hasCause(e, IgniteSpiOperationTimeoutException.class, SocketException.class);
+ if (X.hasCause(e, IgniteSpiOperationTimeoutException.class, SocketTimeoutException.class, SocketException.class))
+ return true;
+
+ return (timeout - (U.currentTimeMillis() - lastOperStartTs) <= 0);
}
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/e46cf958/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 5aca2f9..af12d3b 100755
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -23,6 +23,7 @@ import java.io.OutputStream;
import java.net.ConnectException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
+import java.net.SocketException;
import java.net.SocketTimeoutException;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
@@ -341,6 +342,10 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
/** */
private ConnectionPolicy connPlc;
+ /** */
+ private boolean enableForcibleNodeKill = IgniteSystemProperties
+ .getBoolean(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
+
/** Server listener. */
private final GridNioServerListener<Message> srvLsnr =
new GridNioServerListenerAdapter<Message>() {
@@ -2663,8 +2668,13 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
}
}
}
- else
+ else {
U.sleep(200);
+
+ if (getSpiContext().node(node.id()) == null)
+ throw new ClusterTopologyCheckedException("Failed to send message " +
+ "(node left topology): " + node);
+ }
}
fut.onDone(client0);
@@ -3088,6 +3098,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
}
if (failureDetectionTimeoutEnabled() && (e instanceof HandshakeTimeoutException ||
+ X.hasCause(e, SocketException.class) ||
timeoutHelper.checkFailureTimeoutReached(e))) {
String msg = "Handshake timed out (failure detection timeout is reached) " +
@@ -3179,8 +3190,10 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
"[addr=" + addr + ", err=" + e.getMessage() + ']', e));
// Reconnect for the second time, if connection is not established.
- if (!failureDetThrReached && connectAttempts < 2 &&
- (e instanceof ConnectException || X.hasCause(e, ConnectException.class))) {
+ if (!failureDetThrReached && connectAttempts < 5 &&
+ (X.hasCause(e, ConnectException.class, HandshakeException.class, SocketTimeoutException.class))) {
+ U.sleep(200);
+
connectAttempts++;
continue;
@@ -3203,21 +3216,25 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
"operating system firewall is disabled on local and remote hosts) " +
"[addrs=" + addrs + ']');
- if (getSpiContext().node(node.id()) != null && (CU.clientNode(node) || !CU.clientNode(getLocalNode())) &&
- X.hasCause(errs, ConnectException.class, SocketTimeoutException.class, HandshakeTimeoutException.class,
- IgniteSpiOperationTimeoutException.class)) {
+ if (enableForcibleNodeKill) {
+ if (getSpiContext().node(node.id()) != null && (CU.clientNode(node) || !CU.clientNode(getLocalNode())) &&
+ X.hasCause(errs, ConnectException.class, HandshakeException.class,
+ SocketTimeoutException.class, HandshakeTimeoutException.class,
+ IgniteSpiOperationTimeoutException.class)) {
- U.error(log, "TcpCommunicationSpi failed to establish connection to node, node will be dropped from " +
- "cluster [" +
- "rmtNode=" + node + "]", errs);
+ U.error(log, "TcpCommunicationSpi failed to establish connection to node, node will be dropped from " +
+ "cluster [" +
+ "rmtNode=" + node + "]", errs);
- getSpiContext().failNode(node.id(), "TcpCommunicationSpi failed to establish connection to node [" +
- "rmtNode=" + node +
- ", errs=" + errs +
- ", connectErrs=" + Arrays.toString(errs.getSuppressed()) + ']');
+ getSpiContext().failNode(node.id(), "TcpCommunicationSpi failed to establish connection to node [" +
+ "rmtNode=" + node +
+ ", errs=" + errs +
+ ", connectErrs=" + Arrays.toString(errs.getSuppressed()) + ']');
+ }
}
- throw errs;
+ if (X.hasCause(errs, ConnectException.class, HandshakeException.class))
+ throw errs;
}
return client;
@@ -3269,7 +3286,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
sslHnd = new BlockingSslHandler(sslMeta.sslEngine(), ch, directBuf, ByteOrder.nativeOrder(), log);
if (!sslHnd.handshake())
- throw new IgniteCheckedException("SSL handshake is not completed.");
+ throw new HandshakeException("SSL handshake is not completed.");
ByteBuffer handBuff = sslHnd.applicationBuffer();
@@ -3279,7 +3296,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
int read = ch.read(buf);
if (read == -1)
- throw new IgniteCheckedException("Failed to read remote node ID (connection closed).");
+ throw new HandshakeException("Failed to read remote node ID (connection closed).");
buf.flip();
@@ -3295,7 +3312,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
int read = ch.read(buf);
if (read == -1)
- throw new IgniteCheckedException("Failed to read remote node ID (connection closed).");
+ throw new HandshakeException("Failed to read remote node ID (connection closed).");
i += read;
}
@@ -3304,7 +3321,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
UUID rmtNodeId0 = U.bytesToUuid(buf.array(), Message.DIRECT_TYPE_SIZE);
if (!rmtNodeId.equals(rmtNodeId0))
- throw new IgniteCheckedException("Remote node ID is not as expected [expected=" + rmtNodeId +
+ throw new HandshakeException("Remote node ID is not as expected [expected=" + rmtNodeId +
", rcvd=" + rmtNodeId0 + ']');
else if (log.isDebugEnabled())
log.debug("Received remote node ID: " + rmtNodeId0);
@@ -3391,7 +3408,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
int read = ch.read(buf);
if (read == -1)
- throw new IgniteCheckedException("Failed to read remote node recovery handshake " +
+ throw new HandshakeException("Failed to read remote node recovery handshake " +
"(connection closed).");
buf.flip();
@@ -3429,7 +3446,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
int read = ch.read(buf);
if (read == -1)
- throw new IgniteCheckedException("Failed to read remote node recovery handshake " +
+ throw new HandshakeException("Failed to read remote node recovery handshake " +
"(connection closed).");
i += read;
@@ -3471,8 +3488,9 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
// Ignoring whatever happened after timeout - reporting only timeout event.
if (!cancelled)
- throw new HandshakeTimeoutException("Failed to perform handshake due to timeout (consider increasing " +
- "'connectionTimeout' configuration property).");
+ throw new HandshakeTimeoutException(
+ new IgniteSpiOperationTimeoutException("Failed to perform handshake due to timeout " +
+ "(consider increasing 'connectionTimeout' configuration property)."));
}
return rcvCnt;
@@ -3662,18 +3680,31 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
}
/** Internal exception class for proper timeout handling. */
- private static class HandshakeTimeoutException extends IgniteCheckedException {
+ private static class HandshakeException extends IgniteCheckedException {
/** */
private static final long serialVersionUID = 0L;
/**
- * @param msg Message.
+ * @param msg Error message.
*/
- HandshakeTimeoutException(String msg) {
+ HandshakeException(String msg) {
super(msg);
}
}
+ /** Internal exception class for proper timeout handling. */
+ private static class HandshakeTimeoutException extends IgniteCheckedException {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /**
+ * @param cause Exception cause
+ */
+ HandshakeTimeoutException(IgniteSpiOperationTimeoutException cause) {
+ super(cause);
+ }
+ }
+
/**
* This worker takes responsibility to shut the server down when stopping,
* No other thread shall stop passed server.
http://git-wip-us.apache.org/repos/asf/ignite/blob/e46cf958/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
index 10fa6ad..fa9cc35 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
@@ -33,6 +33,7 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteClientDisconnectedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.events.Event;
@@ -152,6 +153,8 @@ public abstract class IgniteClientReconnectAbstractTest extends GridCommonAbstra
@Override protected void beforeTestsStarted() throws Exception {
super.beforeTestsStarted();
+ System.setProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL, "true");
+
int srvs = serverCount();
if (srvs > 0)
@@ -172,6 +175,8 @@ public abstract class IgniteClientReconnectAbstractTest extends GridCommonAbstra
@Override protected void afterTestsStopped() throws Exception {
super.afterTestsStopped();
+ System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
+
stopAllGrids();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e46cf958/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateNodeRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateNodeRestartTest.java
index ee1b48e..420fdd8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateNodeRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateNodeRestartTest.java
@@ -26,6 +26,7 @@ import javax.cache.processor.MutableEntry;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheEntryProcessor;
import org.apache.ignite.cluster.ClusterTopologyException;
@@ -89,9 +90,18 @@ public class IgniteBinaryMetadataUpdateNodeRestartTest extends GridCommonAbstrac
}
/** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ super.beforeTestsStarted();
+
+ System.setProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL,"true");
+ }
+
+ /** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
stopAllGrids();
+ System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
+
super.afterTestsStopped();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e46cf958/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNearRestartRollbackSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNearRestartRollbackSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNearRestartRollbackSelfTest.java
index 79f15ad..1a9e13a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNearRestartRollbackSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNearRestartRollbackSelfTest.java
@@ -31,6 +31,7 @@ import javax.cache.processor.EntryProcessorException;
import javax.cache.processor.MutableEntry;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
@@ -92,6 +93,20 @@ public class IgniteCacheNearRestartRollbackSelfTest extends GridCommonAbstractTe
return cfg;
}
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ super.beforeTestsStarted();
+
+ System.setProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL,"true");
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ super.afterTestsStopped();
+
+ System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
+ }
+
/**
* @param igniteInstanceName Ignite instance name.
* @return Cache configuration.
http://git-wip-us.apache.org/repos/asf/ignite/blob/e46cf958/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCacheWriteSynchronizationModesMultithreadedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCacheWriteSynchronizationModesMultithreadedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCacheWriteSynchronizationModesMultithreadedTest.java
index d23e870..8e57387 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCacheWriteSynchronizationModesMultithreadedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCacheWriteSynchronizationModesMultithreadedTest.java
@@ -32,6 +32,7 @@ import javax.cache.integration.CacheWriterException;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.store.CacheStore;
import org.apache.ignite.cache.store.CacheStoreAdapter;
@@ -106,6 +107,8 @@ public class IgniteTxCacheWriteSynchronizationModesMultithreadedTest extends Gri
@Override protected void beforeTestsStarted() throws Exception {
super.beforeTestsStarted();
+ System.setProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL,"true");
+
startGrids(SRVS);
clientMode = true;
@@ -121,6 +124,8 @@ public class IgniteTxCacheWriteSynchronizationModesMultithreadedTest extends Gri
@Override protected void afterTestsStopped() throws Exception {
stopAllGrids();
+ System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
+
super.afterTestsStopped();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e46cf958/modules/core/src/test/java/org/apache/ignite/spi/GridTcpForwarder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/GridTcpForwarder.java b/modules/core/src/test/java/org/apache/ignite/spi/GridTcpForwarder.java
index d08321e..68d97c1 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/GridTcpForwarder.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/GridTcpForwarder.java
@@ -23,6 +23,7 @@ import java.io.OutputStream;
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
+import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -85,6 +86,10 @@ public final class GridTcpForwarder implements AutoCloseable {
outputCon.getInputStream(), inputCon.getOutputStream()
);
+ //Force closing sibling if one of thread failed.
+ forwardThread1.setUncaughtExceptionHandler(new ForwarderExceptionHandler(forwardThread2));
+ forwardThread2.setUncaughtExceptionHandler(new ForwarderExceptionHandler(forwardThread1));
+
forwardThread1.start();
forwardThread2.start();
@@ -128,6 +133,25 @@ public final class GridTcpForwarder implements AutoCloseable {
}
/**
+ *
+ */
+ private static class ForwarderExceptionHandler implements Thread.UncaughtExceptionHandler {
+ /** */
+ private Thread siblingThread;
+
+ /** */
+ public ForwarderExceptionHandler(Thread siblingThread) {
+
+ this.siblingThread = siblingThread;
+ }
+
+ /** */
+ @Override public void uncaughtException(Thread t, Throwable e) {
+ siblingThread.interrupt();
+ }
+ }
+
+ /**
* Thread reads data from input stream and write to output stream.
*/
private class ForwardThread extends Thread {
@@ -166,6 +190,8 @@ public final class GridTcpForwarder implements AutoCloseable {
}
catch (IOException e) {
log.error("IOException while forwarding data [threadName=" + getName() + "]", e);
+
+ throw new IgniteException(e);
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e46cf958/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java
index ddebd40..e215a34 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java
@@ -25,6 +25,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.TimeUnit;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.events.Event;
@@ -82,6 +83,20 @@ public class TcpCommunicationSpiDropNodesTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ super.beforeTestsStarted();
+
+ System.setProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL,"true");
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ super.afterTestsStopped();
+
+ System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
+ }
+
+ /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
super.beforeTest();
http://git-wip-us.apache.org/repos/asf/ignite/blob/e46cf958/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java
index b4d6cbc..bead697 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java
@@ -18,18 +18,16 @@
package org.apache.ignite.spi.communication.tcp;
import java.io.IOException;
-import java.io.OutputStream;
import java.net.InetAddress;
import java.net.ServerSocket;
-import java.net.Socket;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.events.Event;
@@ -44,8 +42,6 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
-import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage;
-import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeFailedMessage;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -95,6 +91,20 @@ public class TcpCommunicationSpiFaultyClientTest extends GridCommonAbstractTest
}
/** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ super.beforeTestsStarted();
+
+ System.setProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL,"true");
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ super.afterTestsStopped();
+
+ System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
+ }
+
+ /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
super.beforeTest();