ignite-1692 Changed test initialization logic to remove race confition that caused ClusterTopologyServerNotFoundException
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5cd0039a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5cd0039a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5cd0039a Branch: refs/heads/ignite-1.5.1 Commit: 5cd0039a535b4c2ea7434d4b085c9e18f28c930d Parents: d579183 Author: sboikov <sboi...@gridgain.com> Authored: Tue Dec 8 13:12:24 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Dec 8 13:12:24 2015 +0300 ---------------------------------------------------------------------- .../DataStreamProcessorSelfTest.java | 25 ++++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5cd0039a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java index 65dd690..9fedc35 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java @@ -206,14 +206,17 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest { @SuppressWarnings("ErrorNotRethrown") private void checkDataStreamer() throws Exception { try { - Ignite g1 = startGrid(1); - useCache = true; - Ignite g2 = startGrid(2); + Ignite igniteWithCache = startGrid(2); + startGrid(3); - final IgniteDataStreamer<Integer, Integer> ldr = g1.dataStreamer(null); + useCache = false; + + Ignite igniteWithoutCache = startGrid(1); + + final IgniteDataStreamer<Integer, Integer> ldr = igniteWithoutCache.dataStreamer(null); ldr.receiver(DataStreamerCacheUpdaters.<Integer, Integer>batchedSorted()); @@ -255,7 +258,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest { assertEquals(total, s2 + s3); - final IgniteDataStreamer<Integer, Integer> rmvLdr = g2.dataStreamer(null); + final IgniteDataStreamer<Integer, Integer> rmvLdr = igniteWithCache.dataStreamer(null); rmvLdr.receiver(DataStreamerCacheUpdaters.<Integer, Integer>batchedSorted()); @@ -443,15 +446,17 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest { // Start all required nodes. int idx = 1; - for (int i = 0; i < nodesCntNoCache; i++) - startGrid(idx++); - useCache = true; for (int i = 0; i < nodesCntCache; i++) startGrid(idx++); - Ignite g1 = grid(1); + useCache = false; + + for (int i = 0; i < nodesCntNoCache; i++) + startGrid(idx++); + + Ignite g1 = grid(idx - 1); // Get and configure loader. final IgniteDataStreamer<Integer, Integer> ldr = g1.dataStreamer(null); @@ -1019,4 +1024,4 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest { } } } -} \ No newline at end of file +}