Repository: incubator-ignite Updated Branches: refs/heads/ignite-648 dd813e704 -> a79e13b45
ignite-648: fix todo with sleep. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a79e13b4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a79e13b4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a79e13b4 Branch: refs/heads/ignite-648 Commit: a79e13b45b663d0599224fa029593fb18be80293 Parents: dd813e7 Author: Artem Shutak <ashu...@gridgain.com> Authored: Wed May 13 17:30:22 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Wed May 13 17:30:22 2015 +0300 ---------------------------------------------------------------------- .../multijvm/framework/IgniteExProcessProxy.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a79e13b4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteExProcessProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteExProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteExProcessProxy.java index d6fef47..86c7dec 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteExProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteExProcessProxy.java @@ -21,6 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.events.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.cluster.*; import org.apache.ignite.internal.processors.cache.*; @@ -61,6 +62,9 @@ public class IgniteExProcessProxy implements IgniteEx { /** Compute. */ private transient final IgniteCompute compute; + /** Remote ignite instance started latch. */ + private transient final CountDownLatch rmtNodeStartedLatch = new CountDownLatch(1); + /** * @param cfg Configuration. * @param log Logger. @@ -83,6 +87,15 @@ public class IgniteExProcessProxy implements IgniteEx { filteredJvmArgs.add(arg); } + locJvmGrid.events().localListen(new IgnitePredicateX<Event>() { + @Override public boolean applyx(Event e) { + if (((DiscoveryEvent)e).eventNode().id().equals(id)) + rmtNodeStartedLatch.countDown(); + + return true; + } + }, EventType.EVT_NODE_JOINED); + proc = GridJavaProcess.exec( IgniteNodeRunner.class, cfgFileName, // Params. @@ -98,8 +111,7 @@ public class IgniteExProcessProxy implements IgniteEx { System.getProperty("surefire.test.class.path") ); - // TODO: delete sleep. - U.sleep(3_000); + assert rmtNodeStartedLatch.await(3, TimeUnit.SECONDS); gridProxies.put(cfg.getGridName(), this);
