You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/12/08 10:54:53 UTC
[1/7] ignite git commit: IGNITE-4009: Removed error message check for
non-serializable fields in writeObjectOverride().
Repository: ignite
Updated Branches:
refs/heads/ignite-comm-balance-master 622f045aa -> 03593023d
IGNITE-4009: Removed error message check for non-serializable fields in writeObjectOverride().
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3ab5a2f1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3ab5a2f1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3ab5a2f1
Branch: refs/heads/ignite-comm-balance-master
Commit: 3ab5a2f126b08088bef444ad8b983f1654e5d215
Parents: 2c1881c
Author: shtykh_roman <rs...@yahoo.com>
Authored: Wed Dec 7 18:01:27 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Dec 7 18:01:27 2016 +0300
----------------------------------------------------------------------
.../optimized/OptimizedObjectOutputStream.java | 25 +-------------------
1 file changed, 1 insertion(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ab5a2f1/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java
index 96cbbcd..98d85a0 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java
@@ -26,7 +26,6 @@ import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -66,13 +65,6 @@ import static org.apache.ignite.marshaller.optimized.OptimizedMarshallerUtils.ge
*/
class OptimizedObjectOutputStream extends ObjectOutputStream {
/** */
- private static final Collection<String> CONVERTED_ERR = F.asList(
- "weblogic/management/ManagementException",
- "Externalizable class doesn't have default constructor: class " +
- "org.apache.ignite.internal.processors.email.IgniteEmailProcessor$2"
- );
-
- /** */
private final GridHandleTable handles = new GridHandleTable(10, 3.00f);
/** */
@@ -157,22 +149,7 @@ class OptimizedObjectOutputStream extends ObjectOutputStream {
/** {@inheritDoc} */
@Override protected void writeObjectOverride(Object obj) throws IOException {
- try {
- writeObject0(obj);
- }
- catch (IOException e) {
- Throwable t = e;
-
- do {
- if (CONVERTED_ERR.contains(t.getMessage()))
- throw new IOException("You are trying to serialize internal classes that are not supposed " +
- "to be serialized. Check that all non-serializable fields are transient. Consider using " +
- "static inner classes instead of non-static inner classes and anonymous classes.", e);
- }
- while ((t = t.getCause()) != null);
-
- throw e;
- }
+ writeObject0(obj);
}
/**
[4/7] ignite git commit: Added missing ',' in benchmark config.
Posted by sb...@apache.org.
Added missing ',' in benchmark config.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5099f143
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5099f143
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5099f143
Branch: refs/heads/ignite-comm-balance-master
Commit: 5099f143dd2489467ebff87e0a5324e4e34f8fe1
Parents: 7b50a25
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 8 11:15:10 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 8 11:15:10 2016 +0300
----------------------------------------------------------------------
modules/yardstick/config/benchmark-multicast.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5099f143/modules/yardstick/config/benchmark-multicast.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-multicast.properties b/modules/yardstick/config/benchmark-multicast.properties
index 3b31745..b1c6b31 100644
--- a/modules/yardstick/config/benchmark-multicast.properties
+++ b/modules/yardstick/config/benchmark-multicast.properties
@@ -121,10 +121,10 @@ CONFIGS="\
-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteReplaceIndexedValue1Benchmark -sn IgniteNode -ds ${ver}replace-indexed1-1-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutIfAbsentIndexedValue1Benchmark -sn IgniteNode -ds ${ver}put-if-absent-indexed1-1-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlMergeBenchmark -sn IgniteNode -ds ${ver}sql-merge-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlMergeQueryBenchmark -sn IgniteNode -ds ${ver}sql-merge-query-1-backup\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlMergeQueryBenchmark -sn IgniteNode -ds ${ver}sql-merge-query-1-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlMergeIndexedValue1Benchmark -sn IgniteNode -ds ${ver}sql-merge-indexed1-1-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlMergeIndexedValue2Benchmark -sn IgniteNode -ds ${ver}sql-merge-indexed2-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlMergeIndexedValue8Benchmark -sn IgniteNode -ds ${ver}sql-merge-indexed8-1-backup\
+-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlMergeIndexedValue8Benchmark -sn IgniteNode -ds ${ver}sql-merge-indexed8-1-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlInsertIndexedValue1Benchmark -sn IgniteNode -ds ${ver}sql-insert-indexed1-1-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlInsertIndexedValue2Benchmark -sn IgniteNode -ds ${ver}sql-insert-indexed2-1-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlInsertIndexedValue8Benchmark -sn IgniteNode -ds ${ver}sql-insert-indexed8-1-backup,\
[3/7] ignite git commit: ignite-comm-balance-master
Posted by sb...@apache.org.
ignite-comm-balance-master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/abc5d7a7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/abc5d7a7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/abc5d7a7
Branch: refs/heads/ignite-comm-balance-master
Commit: abc5d7a7ee219b2c2c815aff916cb77aa7d516e2
Parents: 622f045
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 8 11:09:26 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 8 11:09:26 2016 +0300
----------------------------------------------------------------------
.../ignite/spi/communication/tcp/TcpCommunicationSpi.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/abc5d7a7/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 b16169c..8f5fc74 100644
--- 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
@@ -2600,7 +2600,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
* @return Client.
* @throws IgniteCheckedException If failed.
*/
- @Nullable protected GridCommunicationClient createShmemClient(ClusterNode node,
+ @Nullable private GridCommunicationClient createShmemClient(ClusterNode node,
int connIdx,
Integer port) throws IgniteCheckedException {
int attempt = 1;
@@ -2715,9 +2715,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
", clientNode=" + node +
", slowClientQueueLimit=" + slowClientQueueLimit + ']';
- U.quietAndWarn(
- log,
- msg);
+ U.quietAndWarn(log, msg);
getSpiContext().failNode(id.nodeId(), msg);
}
[6/7] ignite git commit: ignite-comm-balance
Posted by sb...@apache.org.
ignite-comm-balance
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e88dbd87
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e88dbd87
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e88dbd87
Branch: refs/heads/ignite-comm-balance-master
Commit: e88dbd87e441aa4521bedd84789c8dbaf174497a
Parents: 276b53a
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 8 12:23:09 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 8 12:23:09 2016 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java | 6 +++++-
.../apache/ignite/testsuites/IgniteCacheRestartTestSuite2.java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e88dbd87/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java
index 3fca826..322690c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java
@@ -86,7 +86,6 @@ public class IgniteCacheMultiTxLockSelfTest extends GridCommonAbstractTest {
plc.setMaxSize(100000);
ccfg.setEvictionPolicy(plc);
- ccfg.setEvictSynchronized(true);
c.setCacheConfiguration(ccfg);
@@ -95,6 +94,11 @@ public class IgniteCacheMultiTxLockSelfTest extends GridCommonAbstractTest {
return c;
}
+ /** {@inheritDoc} */
+ @Override protected long getTestTimeout() {
+ return 60_000;
+ }
+
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/e88dbd87/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 0513786..e7eb540 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
@@ -44,7 +44,7 @@ public class IgniteCacheRestartTestSuite2 extends TestSuite {
suite.addTestSuite(IgniteCachePutAllRestartTest.class);
suite.addTestSuite(GridCachePutAllFailoverSelfTest.class);
- suite.addTestSuite(IgniteBinaryMetadataUpdateNodeRestartTest.class);
+ // suite.addTestSuite(IgniteBinaryMetadataUpdateNodeRestartTest.class);
suite.addTestSuite(IgniteCacheGetRestartTest.class);
[2/7] ignite git commit: IGNITE-4367 .NET: Fix flaky tests
Posted by sb...@apache.org.
IGNITE-4367 .NET: Fix flaky tests
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7b50a251
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7b50a251
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7b50a251
Branch: refs/heads/ignite-comm-balance-master
Commit: 7b50a25133e2fa2539d30de5dcfe26e66d38f3a0
Parents: 3ab5a2f
Author: Pavel Tupitsyn <pt...@apache.org>
Authored: Wed Dec 7 18:28:45 2016 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Wed Dec 7 18:28:45 2016 +0300
----------------------------------------------------------------------
.../Binary/BinaryCompactFooterInteropTest.cs | 31 ++++++++++---
.../Apache.Ignite.Core.Tests/ExecutableTest.cs | 2 +-
.../Apache.Ignite.Core.Tests/ReconnectTest.cs | 4 +-
.../Services/ServicesTest.cs | 46 ++++++++++++--------
.../EntityFrameworkCacheTest.cs | 6 +--
5 files changed, 61 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7b50a251/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryCompactFooterInteropTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryCompactFooterInteropTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryCompactFooterInteropTest.cs
index 27b97fd..830e7f4 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryCompactFooterInteropTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryCompactFooterInteropTest.cs
@@ -17,6 +17,7 @@
namespace Apache.Ignite.Core.Tests.Binary
{
+ using System;
using System.Collections;
using System.Linq;
using Apache.Ignite.Core.Binary;
@@ -63,12 +64,30 @@ namespace Apache.Ignite.Core.Tests.Binary
[Test]
public void TestFromJava([Values(true, false)] bool client)
{
- var grid = client ? _clientGrid : _grid;
-
- var fromJava = grid.GetCompute().ExecuteJavaTask<PlatformComputeBinarizable>(ComputeApiTest.EchoTask,
- ComputeApiTest.EchoTypeBinarizable);
-
- Assert.AreEqual(1, fromJava.Field);
+ // Retry multiple times: IGNITE-4377
+ for (int i = 0; i < 10; i++)
+ {
+ var grid = client ? _clientGrid : _grid;
+
+ try
+ {
+ var fromJava = grid.GetCompute().ExecuteJavaTask<PlatformComputeBinarizable>(ComputeApiTest.EchoTask,
+ ComputeApiTest.EchoTypeBinarizable);
+
+ Assert.AreEqual(1, fromJava.Field);
+
+ return;
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine("TestFromJava failed on try {0}: \n {1}", i, ex);
+
+ if (i < 9)
+ continue;
+
+ throw;
+ }
+ }
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/ignite/blob/7b50a251/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExecutableTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExecutableTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExecutableTest.cs
index 3b24b2e..636e0fe 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExecutableTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExecutableTest.cs
@@ -321,7 +321,7 @@ namespace Apache.Ignite.Core.Tests
var proc = new IgniteProcess(reader, args);
int exitCode;
- Assert.IsTrue(proc.Join(3000, out exitCode));
+ Assert.IsTrue(proc.Join(30000, out exitCode));
Assert.AreEqual(-1, exitCode);
lock (reader.List)
http://git-wip-us.apache.org/repos/asf/ignite/blob/7b50a251/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs
index 91e4c06..fdf64a3 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs
@@ -75,7 +75,7 @@ namespace Apache.Ignite.Core.Tests
Assert.IsTrue(ex.ClientReconnectTask.Result);
// Check the event args.
- Thread.Sleep(1); // Wait for event handler
+ Thread.Sleep(100); // Wait for event handler
Assert.IsNotNull(eventArgs);
Assert.IsTrue(eventArgs.HasClusterRestarted);
@@ -148,6 +148,8 @@ namespace Apache.Ignite.Core.Tests
Assert.AreEqual(1, cache[1]);
Assert.AreEqual(1, disconnected);
+
+ Thread.Sleep(100); // Wait for event handler
Assert.AreEqual(1, reconnected);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/7b50a251/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
index 0558d11..38a96bd 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs
@@ -762,6 +762,9 @@ namespace Apache.Ignite.Core.Tests.Services
[InstanceResource]
private IIgnite _grid;
+ /** */
+ private readonly object _syncRoot = new object();
+
/** <inheritdoc /> */
public int TestProperty { get; set; }
@@ -807,41 +810,50 @@ namespace Apache.Ignite.Core.Tests.Services
/** <inheritdoc /> */
public void Init(IServiceContext context)
{
- if (ThrowInit)
- throw new Exception("Expected exception");
+ lock (_syncRoot)
+ {
+ if (ThrowInit)
+ throw new Exception("Expected exception");
- CheckContext(context);
+ CheckContext(context);
- Assert.IsFalse(context.IsCancelled);
- Initialized = true;
+ Assert.IsFalse(context.IsCancelled);
+ Initialized = true;
+ }
}
/** <inheritdoc /> */
public void Execute(IServiceContext context)
{
- if (ThrowExecute)
- throw new Exception("Expected exception");
+ lock (_syncRoot)
+ {
+ if (ThrowExecute)
+ throw new Exception("Expected exception");
- CheckContext(context);
+ CheckContext(context);
- Assert.IsFalse(context.IsCancelled);
- Assert.IsTrue(Initialized);
- Assert.IsFalse(Cancelled);
+ Assert.IsFalse(context.IsCancelled);
+ Assert.IsTrue(Initialized);
+ Assert.IsFalse(Cancelled);
- Executed = true;
+ Executed = true;
+ }
}
/** <inheritdoc /> */
public void Cancel(IServiceContext context)
{
- if (ThrowCancel)
- throw new Exception("Expected exception");
+ lock (_syncRoot)
+ {
+ if (ThrowCancel)
+ throw new Exception("Expected exception");
- CheckContext(context);
+ CheckContext(context);
- Assert.IsTrue(context.IsCancelled);
+ Assert.IsTrue(context.IsCancelled);
- Cancelled = true;
+ Cancelled = true;
+ }
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/ignite/blob/7b50a251/modules/platforms/dotnet/Apache.Ignite.EntityFramework.Tests/EntityFrameworkCacheTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.EntityFramework.Tests/EntityFrameworkCacheTest.cs b/modules/platforms/dotnet/Apache.Ignite.EntityFramework.Tests/EntityFrameworkCacheTest.cs
index 8b9f955..0e095f4 100644
--- a/modules/platforms/dotnet/Apache.Ignite.EntityFramework.Tests/EntityFrameworkCacheTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.EntityFramework.Tests/EntityFrameworkCacheTest.cs
@@ -662,10 +662,10 @@ namespace Apache.Ignite.EntityFramework.Tests
[Category(TestUtils.CategoryIntensive)]
public void TestOldEntriesCleanupMultithreaded()
{
- TestUtils.RunMultiThreaded(CreateRemoveBlog, 4, 10);
+ TestUtils.RunMultiThreaded(CreateRemoveBlog, 4, 5);
// Wait for the cleanup to complete.
- Thread.Sleep(500);
+ Thread.Sleep(2000);
// Only one version of data is in the cache.
Assert.AreEqual(1, _cache.GetSize());
@@ -700,7 +700,7 @@ namespace Apache.Ignite.EntityFramework.Tests
}
Interlocked.Increment(ref opCnt);
- }, 4, 10);
+ }, 4, 5);
var setVersion = _metaCache["Blog"];
[5/7] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-comm-balance-master
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-comm-balance-master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/276b53ac
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/276b53ac
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/276b53ac
Branch: refs/heads/ignite-comm-balance-master
Commit: 276b53ace8fbc698bd164e8b300ceb4c5b19adc9
Parents: abc5d7a 5099f14
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 8 11:15:53 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 8 11:15:53 2016 +0300
----------------------------------------------------------------------
.../optimized/OptimizedObjectOutputStream.java | 25 +----------
.../Binary/BinaryCompactFooterInteropTest.cs | 31 ++++++++++---
.../Apache.Ignite.Core.Tests/ExecutableTest.cs | 2 +-
.../Apache.Ignite.Core.Tests/ReconnectTest.cs | 4 +-
.../Services/ServicesTest.cs | 46 ++++++++++++--------
.../EntityFrameworkCacheTest.cs | 6 +--
.../config/benchmark-multicast.properties | 4 +-
7 files changed, 64 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
[7/7] ignite git commit: ignite-comm-balance
Posted by sb...@apache.org.
ignite-comm-balance
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/03593023
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/03593023
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/03593023
Branch: refs/heads/ignite-comm-balance-master
Commit: 03593023dabe8bf295760c9a387a3e9af8964112
Parents: e88dbd8
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 8 13:51:40 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 8 13:51:40 2016 +0300
----------------------------------------------------------------------
.../TxOptimisticDeadlockDetectionTest.java | 29 ++++++++++++--------
1 file changed, 18 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/03593023/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionTest.java
index aa240aa..f6a06c2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionTest.java
@@ -111,6 +111,9 @@ public class TxOptimisticDeadlockDetectionTest extends GridCommonAbstractTest {
cfg.setClientMode(client);
+ // Test spi blocks message send, this can cause hang with striped pool.
+ cfg.setStripedPoolSize(-1);
+
return cfg;
}
@@ -274,8 +277,8 @@ public class TxOptimisticDeadlockDetectionTest extends GridCommonAbstractTest {
Object k;
- log.info(">>> Performs put [node=" + ((IgniteKernal)ignite).localNode() +
- ", tx=" + tx + ", key=" + transformer.apply(key) + ']');
+ log.info(">>> Performs put [node=" + ((IgniteKernal)ignite).localNode().id() +
+ ", tx=" + tx.xid() + ", key=" + transformer.apply(key) + ']');
cache.put(transformer.apply(key), 0);
@@ -309,23 +312,27 @@ public class TxOptimisticDeadlockDetectionTest extends GridCommonAbstractTest {
entries.put(k, 2);
}
- log.info(">>> Performs put [node=" + ((IgniteKernal)ignite).localNode() +
- ", tx=" + tx + ", entries=" + entries + ']');
+ log.info(">>> Performs put [node=" + ((IgniteKernal)ignite).localNode().id() +
+ ", tx=" + tx.xid() + ", entries=" + entries + ']');
cache.putAll(entries);
tx.commit();
}
catch (Throwable e) {
- U.error(log, "Expected exception: ", e);
+ log.info("Expected exception: " + e);
+
+ e.printStackTrace(System.out);
// At least one stack trace should contain TransactionDeadlockException.
if (hasCause(e, TransactionTimeoutException.class) &&
- hasCause(e, TransactionDeadlockException.class)
- ) {
- if (deadlockErr.compareAndSet(null, cause(e, TransactionDeadlockException.class)))
- U.error(log, "At least one stack trace should contain " +
- TransactionDeadlockException.class.getSimpleName(), e);
+ hasCause(e, TransactionDeadlockException.class)) {
+ if (deadlockErr.compareAndSet(null, cause(e, TransactionDeadlockException.class))) {
+ log.info("At least one stack trace should contain " +
+ TransactionDeadlockException.class.getSimpleName());
+
+ e.printStackTrace(System.out);
+ }
}
}
}
@@ -344,7 +351,7 @@ public class TxOptimisticDeadlockDetectionTest extends GridCommonAbstractTest {
TransactionDeadlockException deadlockE = deadlockErr.get();
- assertNotNull(deadlockE);
+ assertNotNull("Failed to detect deadlock", deadlockE);
boolean fail = false;