You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by pt...@apache.org on 2017/04/18 12:21:22 UTC
[1/3] ignite git commit: .NET: Fix resource cleanup in
AffinityFunctionTest
Repository: ignite
Updated Branches:
refs/heads/ignite-2.0 3b93f7913 -> ded9974e1
.NET: Fix resource cleanup in AffinityFunctionTest
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4c64568e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4c64568e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4c64568e
Branch: refs/heads/ignite-2.0
Commit: 4c64568ee7029dc1602bb666b0fe137bcb9752d7
Parents: 3b93f79
Author: Pavel Tupitsyn <pt...@apache.org>
Authored: Tue Apr 18 15:00:39 2017 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Tue Apr 18 15:00:39 2017 +0300
----------------------------------------------------------------------
.../Cache/Affinity/AffinityFunctionTest.cs | 25 ++++++++++++--------
1 file changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4c64568e/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Affinity/AffinityFunctionTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Affinity/AffinityFunctionTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Affinity/AffinityFunctionTest.cs
index a5f07ca..404094d 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Affinity/AffinityFunctionTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Affinity/AffinityFunctionTest.cs
@@ -91,18 +91,23 @@ namespace Apache.Ignite.Core.Tests.Cache.Affinity
[TestFixtureTearDown]
public void FixtureTearDown()
{
- // Check that affinity handles are present
- TestUtils.AssertHandleRegistryHasItems(_ignite, _ignite.GetCacheNames().Count - 3, 0);
- TestUtils.AssertHandleRegistryHasItems(_ignite2, _ignite.GetCacheNames().Count - 3, 0);
-
- // Destroy all caches
- _ignite.GetCacheNames().ToList().ForEach(_ignite.DestroyCache);
- Assert.AreEqual(0, _ignite.GetCacheNames().Count);
+ try
+ {
+ // Check that affinity handles are present
+ TestUtils.AssertHandleRegistryHasItems(_ignite, _ignite.GetCacheNames().Count - 3, 0);
+ TestUtils.AssertHandleRegistryHasItems(_ignite2, _ignite.GetCacheNames().Count - 3, 0);
- // Check that all affinity functions got released
- TestUtils.AssertHandleRegistryIsEmpty(1000, _ignite, _ignite2);
+ // Destroy all caches
+ _ignite.GetCacheNames().ToList().ForEach(_ignite.DestroyCache);
+ Assert.AreEqual(0, _ignite.GetCacheNames().Count);
- Ignition.StopAll(true);
+ // Check that all affinity functions got released
+ TestUtils.AssertHandleRegistryIsEmpty(1000, _ignite, _ignite2);
+ }
+ finally
+ {
+ Ignition.StopAll(true);
+ }
}
/// <summary>
[2/3] ignite git commit: Fix broken compilation of IGNITE-4832 commit.
Posted by pt...@apache.org.
Fix broken compilation of IGNITE-4832 commit.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e018eae6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e018eae6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e018eae6
Branch: refs/heads/ignite-2.0
Commit: e018eae6b9cf92baf9dfb9d41c77f8c31e56421d
Parents: 4c64568
Author: Andrey V. Mashenkov <an...@gmail.com>
Authored: Tue Apr 18 15:14:00 2017 +0300
Committer: Andrey V. Mashenkov <an...@gmail.com>
Committed: Tue Apr 18 15:14:00 2017 +0300
----------------------------------------------------------------------
.../processors/service/GridServiceProcessorAbstractSelfTest.java | 2 +-
.../processors/service/GridServiceProcessorMultiNodeSelfTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e018eae6/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java
index 5671d84..b9076b9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java
@@ -134,7 +134,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs
startExtraNodes(servers);
for (int i = 0; i < clients; i++) {
- final String nodeName = getTestGridName(nodeCount() + servers + i);
+ final String nodeName = getTestIgniteInstanceName(nodeCount() + servers + i);
startGrid(nodeName, getConfiguration(nodeName).setClientMode(true));
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e018eae6/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java
index 467974c..50f5999 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeSelfTest.java
@@ -210,7 +210,7 @@ public class GridServiceProcessorMultiNodeSelfTest extends GridServiceProcessorA
IgniteServices svcs = g.services();
- IgniteFuture<?> fut = svcs.deployAsync(name, new DummyService());
+ IgniteFuture<?> fut = svcs.deployAsync(srvcCfg);
info("Deployed service: " + name);
[3/3] ignite git commit: .NET: Fix AffinityFunctionTest
Posted by pt...@apache.org.
.NET: Fix AffinityFunctionTest
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ded9974e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ded9974e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ded9974e
Branch: refs/heads/ignite-2.0
Commit: ded9974e1e1ef456e7e5ea5cd1bc4370fd525038
Parents: e018eae
Author: Pavel Tupitsyn <pt...@apache.org>
Authored: Tue Apr 18 15:15:07 2017 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Tue Apr 18 15:15:07 2017 +0300
----------------------------------------------------------------------
.../Cache/Affinity/AffinityFunctionTest.cs | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ded9974e/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Affinity/AffinityFunctionTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Affinity/AffinityFunctionTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Affinity/AffinityFunctionTest.cs
index 404094d..5456ba4 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Affinity/AffinityFunctionTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Affinity/AffinityFunctionTest.cs
@@ -93,9 +93,10 @@ namespace Apache.Ignite.Core.Tests.Cache.Affinity
{
try
{
- // Check that affinity handles are present
- TestUtils.AssertHandleRegistryHasItems(_ignite, _ignite.GetCacheNames().Count - 3, 0);
- TestUtils.AssertHandleRegistryHasItems(_ignite2, _ignite.GetCacheNames().Count - 3, 0);
+ // Check that affinity handles are present:
+ // TestDynamicCachePredefined and TestSimpleInheritance do not produce extra handles, so "-2" here.
+ TestUtils.AssertHandleRegistryHasItems(_ignite, _ignite.GetCacheNames().Count - 2, 0);
+ TestUtils.AssertHandleRegistryHasItems(_ignite2, _ignite.GetCacheNames().Count - 2, 0);
// Destroy all caches
_ignite.GetCacheNames().ToList().ForEach(_ignite.DestroyCache);