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 2015/06/09 15:45:49 UTC
[1/2] incubator-ignite git commit: ignite-545: fixed hadoop tests
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-545 58c19aa97 -> cd9638373
ignite-545: fixed hadoop tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/681f79f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/681f79f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/681f79f0
Branch: refs/heads/ignite-545
Commit: 681f79f0e2b4811f926b3850c2fad32812014273
Parents: 58c19aa
Author: Denis Magda <dm...@gridgain.com>
Authored: Tue Jun 9 16:43:07 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue Jun 9 16:43:07 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/igfs/IgniteHadoopFileSystemAbstractSelfTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/681f79f0/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
index d9a3c59..e8ef414 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
@@ -85,7 +85,7 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
private static final int THREAD_CNT = 8;
/** IP finder. */
- private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+ private final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
/** Barrier for multithreaded tests. */
private static CyclicBarrier barrier;
[2/2] incubator-ignite git commit: ignite-545: merge from
ignite-sprint-6
Posted by sb...@apache.org.
ignite-545: merge from ignite-sprint-6
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cd963837
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cd963837
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cd963837
Branch: refs/heads/ignite-545
Commit: cd96383733948419051a53714ef869ea502f9255
Parents: 681f79f
Author: Denis Magda <dm...@gridgain.com>
Authored: Tue Jun 9 16:45:40 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue Jun 9 16:45:40 2015 +0300
----------------------------------------------------------------------
.../internal/interop/InteropIgnition.java | 52 +++++++++++++++++++-
.../internal/interop/InteropProcessor.java | 8 +++
2 files changed, 58 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd963837/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java
index 3ccd361..d8cc276 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java
@@ -35,6 +35,9 @@ import java.util.*;
*/
@SuppressWarnings("UnusedDeclaration")
public class InteropIgnition {
+ /** Map with active instances. */
+ private static final HashMap<String, InteropProcessor> instances = new HashMap<>();
+
/**
* Start Ignite node in interop mode.
*
@@ -44,8 +47,8 @@ public class InteropIgnition {
* @param envPtr Environment pointer.
* @return Ignite instance.
*/
- public static InteropProcessor start(@Nullable String springCfgPath, @Nullable String gridName, int factoryId,
- long envPtr) {
+ public static synchronized InteropProcessor start(@Nullable String springCfgPath, @Nullable String gridName,
+ int factoryId, long envPtr) {
IgniteConfiguration cfg = configuration(springCfgPath);
if (gridName != null)
@@ -57,10 +60,55 @@ public class InteropIgnition {
trackFinalization(proc);
+ InteropProcessor old = instances.put(gridName, proc);
+
+ assert old == null;
+
return proc;
}
/**
+ * Get instance by environment pointer.
+ *
+ * @param gridName Grid name.
+ * @return Instance or {@code null} if it doesn't exists (never started or stopped).
+ */
+ @Nullable public static synchronized InteropProcessor instance(@Nullable String gridName) {
+ return instances.get(gridName);
+ }
+
+ /**
+ * Stop single instance.
+ *
+ * @param gridName Grid name,
+ * @param cancel Cancel flag.
+ * @return {@code True} if instance was found and stopped.
+ */
+ public static synchronized boolean stop(@Nullable String gridName, boolean cancel) {
+ if (Ignition.stop(gridName, cancel)) {
+ InteropProcessor old = instances.remove(gridName);
+
+ assert old != null;
+
+ return true;
+ }
+ else
+ return false;
+ }
+
+ /**
+ * Stop all instances.
+ *
+ * @param cancel Cancel flag.
+ */
+ public static synchronized void stopAll(boolean cancel) {
+ for (InteropProcessor proc : instances.values())
+ Ignition.stop(proc.ignite().name(), cancel);
+
+ instances.clear();
+ }
+
+ /**
* Create configuration.
*
* @param springCfgPath Path to Spring XML.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd963837/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java
index aa4f877..325a464 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.interop;
+import org.apache.ignite.*;
import org.jetbrains.annotations.*;
/**
@@ -24,6 +25,13 @@ import org.jetbrains.annotations.*;
*/
public interface InteropProcessor {
/**
+ * Get owning Ignite instance.
+ *
+ * @return Ignite instance.
+ */
+ public Ignite ignite();
+
+ /**
* Get stop runnable to perform cleanup when interop is not longer used.
* <p/>
* <b>NOTE!</b> This runnable is called when current instance of interop processor is eligible for garbage