ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [05/25] ignite git commit: ignite-3207 Rename IgniteConfiguration.gridName -> igniteInstanceName.
Date Mon, 13 Mar 2017 11:24:32 GMT
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiConsistencySelfTest.java
index 8efafdf..559303d 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiConsistencySelfTest.java
@@ -57,21 +57,21 @@ public class GridSwapSpaceSpiConsistencySelfTest extends GridCommonAbstractTest
 
     /** {@inheritDoc} */
     @SuppressWarnings({"unchecked"})
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        if (GRID_WITHOUT_SWAP_SPACE.equals(gridName))
+        if (GRID_WITHOUT_SWAP_SPACE.equals(igniteInstanceName))
             cfg.setSwapSpaceSpi(new NoopSwapSpaceSpi());
 
-        if (GRID_WITH_SWAP_SPACE.equals(gridName))
+        if (GRID_WITH_SWAP_SPACE.equals(igniteInstanceName))
             cfg.setSwapSpaceSpi(new FileSwapSpaceSpi());
 
-        if (GRID_CLIENT_WITHOUT_SWAP_SPACE.equals(gridName)) {
+        if (GRID_CLIENT_WITHOUT_SWAP_SPACE.equals(igniteInstanceName)) {
             cfg.setClientMode(true);
             cfg.setSwapSpaceSpi(new NoopSwapSpaceSpi());
         }
 
-        if (GRID_CLIENT_WITH_SWAP_SPACE.equals(gridName)) {
+        if (GRID_CLIENT_WITH_SWAP_SPACE.equals(igniteInstanceName)) {
             cfg.setClientMode(true);
             cfg.setSwapSpaceSpi(new FileSwapSpaceSpi());
         }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/swapspace/inmemory/GridTestSwapSpaceSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/swapspace/inmemory/GridTestSwapSpaceSpi.java b/modules/core/src/test/java/org/apache/ignite/spi/swapspace/inmemory/GridTestSwapSpaceSpi.java
index f50a732..e40ee77 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/swapspace/inmemory/GridTestSwapSpaceSpi.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/swapspace/inmemory/GridTestSwapSpaceSpi.java
@@ -57,7 +57,7 @@ public class GridTestSwapSpaceSpi extends IgniteSpiAdapter implements SwapSpaceS
     private ConcurrentMap<String, Space> spaces = new ConcurrentHashMap8<>();
 
     /** {@inheritDoc} */
-    @Override public void spiStart(@Nullable String gridName) throws IgniteSpiException {
+    @Override public void spiStart(@Nullable String igniteInstanceName) throws IgniteSpiException {
         // No-op.
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/spi/swapspace/noop/GridNoopSwapSpaceSpiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/swapspace/noop/GridNoopSwapSpaceSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/swapspace/noop/GridNoopSwapSpaceSpiSelfTest.java
index e9e3349..2c907d8 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/swapspace/noop/GridNoopSwapSpaceSpiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/swapspace/noop/GridNoopSwapSpaceSpiSelfTest.java
@@ -29,8 +29,8 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
  */
 public class GridNoopSwapSpaceSpiSelfTest extends GridCommonAbstractTest {
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         TcpDiscoverySpi disco = new TcpDiscoverySpi();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/startup/GridVmNodesStarter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/startup/GridVmNodesStarter.java b/modules/core/src/test/java/org/apache/ignite/startup/GridVmNodesStarter.java
index a8a6f17..b2f2f02 100644
--- a/modules/core/src/test/java/org/apache/ignite/startup/GridVmNodesStarter.java
+++ b/modules/core/src/test/java/org/apache/ignite/startup/GridVmNodesStarter.java
@@ -54,7 +54,7 @@ public final class GridVmNodesStarter {
     private static final String IGNITE_PROG_NAME = "IGNITE_PROG_NAME";
 
     /** */
-    private static final String GRID_NAME_PREF = "gg-vm-grid-";
+    private static final String IGNITE_INSTANCE_NAME_PREF = "gg-vm-grid-";
 
     /** */
     private static final int DFLT_NODES_COUNT = 20;
@@ -243,7 +243,7 @@ public final class GridVmNodesStarter {
         for (IgniteConfiguration cfg : (Collection<IgniteConfiguration>)cfgMap.values()) {
             res.add(cfg);
 
-            cfg.setGridName(GRID_NAME_PREF + gridCnt.incrementAndGet());
+            cfg.setIgniteInstanceName(IGNITE_INSTANCE_NAME_PREF + gridCnt.incrementAndGet());
         }
 
         return res;

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java
index 1056990..eed99f6 100644
--- a/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java
@@ -74,8 +74,8 @@ public class SocketStreamerSelfTest extends GridCommonAbstractTest {
     private static int port;
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         CacheConfiguration ccfg = defaultCacheConfiguration();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/testframework/GridTestNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestNode.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestNode.java
index 6365443..09d4765 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestNode.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestNode.java
@@ -81,7 +81,7 @@ public class GridTestNode extends GridMetadataAwareAdapter implements ClusterNod
     /** */
     private void initAttributes() {
         attrs.put(IgniteNodeAttributes.ATTR_BUILD_VER, "10");
-        attrs.put(IgniteNodeAttributes.ATTR_GRID_NAME, "null");
+        attrs.put(IgniteNodeAttributes.ATTR_IGNITE_INSTANCE_NAME, "null");
         attrs.put(IgniteNodeAttributes.ATTR_CLIENT_MODE, false);
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
index 0ae6575..91220b2 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
@@ -966,16 +966,16 @@ public final class GridTestUtils {
      * Silent stop grid.
      * Method doesn't throw any exception.
      *
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @param log Logger.
      */
     @SuppressWarnings({"CatchGenericClass"})
-    public static void stopGrid(String gridName, IgniteLogger log) {
+    public static void stopGrid(String igniteInstanceName, IgniteLogger log) {
         try {
-            G.stop(gridName, false);
+            G.stop(igniteInstanceName, false);
         }
         catch (Throwable e) {
-            U.error(log, "Failed to stop grid: " + gridName, e);
+            U.error(log, "Failed to stop grid: " + igniteInstanceName, e);
         }
     }
 
@@ -1061,7 +1061,7 @@ public final class GridTestUtils {
                     Collection<ClusterNode> nodes = top.nodes(p, AffinityTopologyVersion.NONE);
 
                     if (nodes.size() > backups + 1) {
-                        LT.warn(log, "Partition map was not updated yet (will wait) [grid=" + g.name() +
+                        LT.warn(log, "Partition map was not updated yet (will wait) [igniteInstanceName=" + g.name() +
                             ", p=" + p + ", nodes=" + F.nodeIds(nodes) + ']');
 
                         wait = true;

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigFactory.java b/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigFactory.java
index 9541c1a..5dbb9e0 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigFactory.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigFactory.java
@@ -25,15 +25,15 @@ import org.apache.ignite.configuration.IgniteConfiguration;
  */
 public interface ConfigFactory {
     /**
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @param srcCfg Source config.
      * @return IgniteConfiguration.
      */
-    public IgniteConfiguration getConfiguration(String gridName, IgniteConfiguration srcCfg);
+    public IgniteConfiguration getConfiguration(String igniteInstanceName, IgniteConfiguration srcCfg);
 
     /**
-     * @param gridName Name.
+     * @param igniteInstanceName Name.
      * @return CacheConfiguration.
      */
-    public CacheConfiguration cacheConfiguration(String gridName);
+    public CacheConfiguration cacheConfiguration(String igniteInstanceName);
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariationsFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariationsFactory.java b/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariationsFactory.java
index f5e7d57..bc8e9dd 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariationsFactory.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariationsFactory.java
@@ -62,7 +62,7 @@ public class ConfigVariationsFactory implements ConfigFactory {
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public IgniteConfiguration getConfiguration(String gridName, IgniteConfiguration srcCfg) {
+    @Override public IgniteConfiguration getConfiguration(String igniteInstanceName, IgniteConfiguration srcCfg) {
         IgniteConfiguration cfg = new IgniteConfiguration();
 
         if (srcCfg != null)
@@ -88,7 +88,7 @@ public class ConfigVariationsFactory implements ConfigFactory {
      * @param srcCfg Source config.
      */
     private static void copyDefaultsFromSource(IgniteConfiguration cfg, IgniteConfiguration srcCfg) {
-        cfg.setGridName(srcCfg.getGridName());
+        cfg.setIgniteInstanceName(srcCfg.getIgniteInstanceName());
         cfg.setGridLogger(srcCfg.getGridLogger());
         cfg.setNodeId(srcCfg.getNodeId());
         cfg.setIgniteHome(srcCfg.getIgniteHome());
@@ -136,7 +136,7 @@ public class ConfigVariationsFactory implements ConfigFactory {
     }
 
     /** {@inheritDoc} */
-    @Override public CacheConfiguration cacheConfiguration(String gridName) {
+    @Override public CacheConfiguration cacheConfiguration(String igniteInstanceName) {
         if (cacheParams == null || cacheCfgVariation == null)
             throw new IllegalStateException("Failed to configure cache [cacheParams=" + Arrays.deepToString(cacheParams)
                 + ", cacheCfgVariation=" + Arrays.toString(cacheCfgVariation) + "]");

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index a37a3eb..5a76ddd 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -154,8 +154,8 @@ public abstract class GridAbstractTest extends TestCase {
     /** Timestamp for tests. */
     private static long ts = System.currentTimeMillis();
 
-    /** Starting grid name. */
-    protected static final ThreadLocal<String> startingGrid = new ThreadLocal<>();
+    /** Starting Ignite instance name. */
+    protected static final ThreadLocal<String> startingIgniteInstanceName = new ThreadLocal<>();
 
     /** Force failure flag. */
     private boolean forceFailure;
@@ -361,7 +361,7 @@ public abstract class GridAbstractTest extends TestCase {
      * @throws Exception If failed.
      */
     protected void multithreaded(Runnable r, int threadNum) throws Exception {
-        multithreaded(r, threadNum, getTestGridName());
+        multithreaded(r, threadNum, getTestIgniteInstanceName());
     }
 
     /**
@@ -389,7 +389,7 @@ public abstract class GridAbstractTest extends TestCase {
      * @return Future.
      */
     protected IgniteInternalFuture<?> multithreadedAsync(Runnable r, int threadNum) throws Exception {
-        return multithreadedAsync(r, threadNum, getTestGridName());
+        return multithreadedAsync(r, threadNum, getTestIgniteInstanceName());
     }
 
     /**
@@ -416,7 +416,7 @@ public abstract class GridAbstractTest extends TestCase {
      * @throws Exception If failed.
      */
     protected void multithreaded(Callable<?> c, int threadNum) throws Exception {
-        multithreaded(c, threadNum, getTestGridName());
+        multithreaded(c, threadNum, getTestIgniteInstanceName());
     }
 
     /**
@@ -442,7 +442,7 @@ public abstract class GridAbstractTest extends TestCase {
      * @return Future.
      */
     protected IgniteInternalFuture<?> multithreadedAsync(Callable<?> c, int threadNum) throws Exception {
-        return multithreadedAsync(c, threadNum, getTestGridName());
+        return multithreadedAsync(c, threadNum, getTestIgniteInstanceName());
     }
 
     /**
@@ -625,7 +625,7 @@ public abstract class GridAbstractTest extends TestCase {
      * @throws Exception If anything failed.
      */
     protected Ignite startGrid() throws Exception {
-        return startGrid(getTestGridName());
+        return startGrid(getTestIgniteInstanceName());
     }
 
     /**
@@ -732,7 +732,7 @@ public abstract class GridAbstractTest extends TestCase {
 
     /** */
     protected void stopGrid() {
-        stopGrid(getTestGridName());
+        stopGrid(getTestIgniteInstanceName());
     }
 
     /**
@@ -743,7 +743,7 @@ public abstract class GridAbstractTest extends TestCase {
      * @throws Exception If anything failed.
      */
     protected IgniteEx startGrid(int idx) throws Exception {
-        return (IgniteEx)startGrid(getTestGridName(idx));
+        return (IgniteEx)startGrid(getTestIgniteInstanceName(idx));
     }
 
     /**
@@ -755,43 +755,43 @@ public abstract class GridAbstractTest extends TestCase {
      * @throws Exception If anything failed.
      */
     protected Ignite startGrid(int idx, GridSpringResourceContext ctx) throws Exception {
-        return startGrid(getTestGridName(idx), ctx);
+        return startGrid(getTestIgniteInstanceName(idx), ctx);
     }
 
     /**
      * Starts new grid with given name.
      *
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @return Started grid.
      * @throws Exception If failed.
      */
-    protected Ignite startGrid(String gridName) throws Exception {
-        return startGrid(gridName, (GridSpringResourceContext)null);
+    protected Ignite startGrid(String igniteInstanceName) throws Exception {
+        return startGrid(igniteInstanceName, (GridSpringResourceContext)null);
     }
 
     /**
      * Starts new grid with given name.
      *
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @param ctx Spring context.
      * @return Started grid.
      * @throws Exception If failed.
      */
-    protected Ignite startGrid(String gridName, GridSpringResourceContext ctx) throws Exception {
-        return startGrid(gridName, optimize(getConfiguration(gridName)), ctx);
+    protected Ignite startGrid(String igniteInstanceName, GridSpringResourceContext ctx) throws Exception {
+        return startGrid(igniteInstanceName, optimize(getConfiguration(igniteInstanceName)), ctx);
     }
     /**
      * Starts new grid with given name.
      *
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @param ctx Spring context.
      * @return Started grid.
      * @throws Exception If failed.
      */
-    protected Ignite startGrid(String gridName, IgniteConfiguration cfg, GridSpringResourceContext ctx)
+    protected Ignite startGrid(String igniteInstanceName, IgniteConfiguration cfg, GridSpringResourceContext ctx)
         throws Exception {
-        if (!isRemoteJvm(gridName)) {
-            startingGrid.set(gridName);
+        if (!isRemoteJvm(igniteInstanceName)) {
+            startingIgniteInstanceName.set(igniteInstanceName);
 
             try {
                 Ignite node = IgnitionEx.start(cfg, ctx);
@@ -806,31 +806,31 @@ public abstract class GridAbstractTest extends TestCase {
                 return node;
             }
             finally {
-                startingGrid.set(null);
+                startingIgniteInstanceName.set(null);
             }
         }
         else
-            return startRemoteGrid(gridName, null, ctx);
+            return startRemoteGrid(igniteInstanceName, null, ctx);
     }
 
     /**
      * Starts new grid at another JVM with given name.
      *
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @param cfg Ignite configuration.
      * @param ctx Spring context.
      * @return Started grid.
      * @throws Exception If failed.
      */
-    protected Ignite startRemoteGrid(String gridName, IgniteConfiguration cfg, GridSpringResourceContext ctx)
+    protected Ignite startRemoteGrid(String igniteInstanceName, IgniteConfiguration cfg, GridSpringResourceContext ctx)
         throws Exception {
-        return startRemoteGrid(gridName, cfg, ctx, grid(0), true);
+        return startRemoteGrid(igniteInstanceName, cfg, ctx, grid(0), true);
     }
 
     /**
      * Starts new grid at another JVM with given name.
      *
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @param cfg Ignite configuration.
      * @param ctx Spring context.
      * @param locNode Local node.
@@ -838,14 +838,14 @@ public abstract class GridAbstractTest extends TestCase {
      * @return Started grid.
      * @throws Exception If failed.
      */
-    protected Ignite startRemoteGrid(String gridName, IgniteConfiguration cfg, GridSpringResourceContext ctx,
+    protected Ignite startRemoteGrid(String igniteInstanceName, IgniteConfiguration cfg, GridSpringResourceContext ctx,
         IgniteEx locNode, boolean resetDiscovery)
         throws Exception {
         if (ctx != null)
             throw new UnsupportedOperationException("Starting of grid at another jvm by context doesn't supported.");
 
         if (cfg == null)
-            cfg = optimize(getConfiguration(gridName));
+            cfg = optimize(getConfiguration(igniteInstanceName));
 
         return new IgniteProcessProxy(cfg, log, locNode, resetDiscovery);
     }
@@ -878,36 +878,36 @@ public abstract class GridAbstractTest extends TestCase {
     }
 
     /**
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      */
-    protected void stopGrid(@Nullable String gridName) {
-        stopGrid(gridName, true);
+    protected void stopGrid(@Nullable String igniteInstanceName) {
+        stopGrid(igniteInstanceName, true);
     }
 
     /**
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @param cancel Cancel flag.
      */
     @SuppressWarnings({"deprecation"})
-    protected void stopGrid(@Nullable String gridName, boolean cancel) {
+    protected void stopGrid(@Nullable String igniteInstanceName, boolean cancel) {
         try {
-            Ignite ignite = grid(gridName);
+            Ignite ignite = grid(igniteInstanceName);
 
-            assert ignite != null : "Ignite returned null grid for name: " + gridName;
+            assert ignite != null : "Ignite returned null grid for name: " + igniteInstanceName;
 
             info(">>> Stopping grid [name=" + ignite.name() + ", id=" +
                 ((IgniteKernal)ignite).context().localNodeId() + ']');
 
-            if (!isRemoteJvm(gridName))
-                G.stop(gridName, cancel);
+            if (!isRemoteJvm(igniteInstanceName))
+                G.stop(igniteInstanceName, cancel);
             else
-                IgniteProcessProxy.stop(gridName, cancel);
+                IgniteProcessProxy.stop(igniteInstanceName, cancel);
         }
         catch (IllegalStateException ignored) {
             // Ignore error if grid already stopped.
         }
         catch (Throwable e) {
-            error("Failed to stop grid [gridName=" + gridName + ", cancel=" + cancel + ']', e);
+            error("Failed to stop grid [igniteInstanceName=" + igniteInstanceName + ", cancel=" + cancel + ']', e);
 
             stopGridErr = true;
         }
@@ -989,8 +989,8 @@ public abstract class GridAbstractTest extends TestCase {
                 Thread.sleep(100);
             }
             catch (InterruptedException ignored) {
-                throw new IgniteCheckedException("Interrupted while waiting for remote nodes [gridName=" + ignite.name() +
-                    ", count=" + cnt + ']');
+                throw new IgniteCheckedException("Interrupted while waiting for remote nodes [igniteInstanceName=" +
+                    ignite.name() + ", count=" + cnt + ']');
             }
         }
     }
@@ -1031,7 +1031,7 @@ public abstract class GridAbstractTest extends TestCase {
      * @return Grid instance.
      */
     protected IgniteEx grid(int idx) {
-        return grid(getTestGridName(idx));
+        return grid(getTestIgniteInstanceName(idx));
     }
 
     /**
@@ -1049,7 +1049,7 @@ public abstract class GridAbstractTest extends TestCase {
      */
     protected IgniteEx grid() {
         if (!isMultiJvm())
-            return (IgniteEx)G.ignite(getTestGridName());
+            return (IgniteEx)G.ignite(getTestIgniteInstanceName());
         else
             throw new UnsupportedOperationException("Operation doesn't supported yet.");
     }
@@ -1073,36 +1073,36 @@ public abstract class GridAbstractTest extends TestCase {
     }
 
     /**
-     * Starts grid using provided grid name and spring config location.
+     * Starts grid using provided Ignite instance name and spring config location.
      * <p>
      * Note that grids started this way should be stopped with {@code G.stop(..)} methods.
      *
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @param springCfgPath Path to config file.
      * @return Grid Started grid.
      * @throws Exception If failed.
      */
-    protected Ignite startGrid(String gridName, String springCfgPath) throws Exception {
-        return startGrid(gridName, loadConfiguration(springCfgPath));
+    protected Ignite startGrid(String igniteInstanceName, String springCfgPath) throws Exception {
+        return startGrid(igniteInstanceName, loadConfiguration(springCfgPath));
     }
 
     /**
-     * Starts grid using provided grid name and config.
+     * Starts grid using provided Ignite instance name and config.
      * <p>
      * Note that grids started this way should be stopped with {@code G.stop(..)} methods.
      *
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @param cfg Config.
      * @return Grid Started grid.
      * @throws Exception If failed.
      */
-    protected Ignite startGrid(String gridName, IgniteConfiguration cfg) throws Exception {
-        cfg.setGridName(gridName);
+    protected Ignite startGrid(String igniteInstanceName, IgniteConfiguration cfg) throws Exception {
+        cfg.setIgniteInstanceName(igniteInstanceName);
 
-        if (!isRemoteJvm(gridName))
+        if (!isRemoteJvm(igniteInstanceName))
             return G.start(cfg);
         else
-            return startRemoteGrid(gridName, cfg, null);
+            return startRemoteGrid(igniteInstanceName, cfg, null);
     }
 
     /**
@@ -1160,7 +1160,7 @@ public abstract class GridAbstractTest extends TestCase {
      * @param idx Index of the grid to stop.
      */
     protected void stopGrid(int idx) {
-        stopGrid(getTestGridName(idx), false);
+        stopGrid(getTestIgniteInstanceName(idx), false);
     }
 
     /**
@@ -1169,22 +1169,22 @@ public abstract class GridAbstractTest extends TestCase {
      */
     @SuppressWarnings("deprecation")
     protected void stopGrid(int idx, boolean cancel) {
-        String gridName = getTestGridName(idx);
+        String igniteInstanceName = getTestIgniteInstanceName(idx);
 
         try {
-            Ignite ignite = G.ignite(gridName);
+            Ignite ignite = G.ignite(igniteInstanceName);
 
-            assert ignite != null : "Ignite returned null grid for name: " + gridName;
+            assert ignite != null : "Ignite returned null grid for name: " + igniteInstanceName;
 
             info(">>> Stopping grid [name=" + ignite.name() + ", id=" + ignite.cluster().localNode().id() + ']');
 
-            G.stop(gridName, cancel);
+            G.stop(igniteInstanceName, cancel);
         }
         catch (IllegalStateException ignored) {
             // Ignore error if grid already stopped.
         }
         catch (Throwable e) {
-            error("Failed to stop grid [gridName=" + gridName + ", cancel=" + cancel + ']', e);
+            error("Failed to stop grid [igniteInstanceName=" + igniteInstanceName + ", cancel=" + cancel + ']', e);
 
             stopGridErr = true;
         }
@@ -1194,7 +1194,7 @@ public abstract class GridAbstractTest extends TestCase {
      * @param idx Index of the grid to stop.
      */
     protected void stopAndCancelGrid(int idx) {
-        stopGrid(getTestGridName(idx), true);
+        stopGrid(getTestIgniteInstanceName(idx), true);
     }
 
     /**
@@ -1202,20 +1202,20 @@ public abstract class GridAbstractTest extends TestCase {
      * @throws Exception If failed.
      */
     protected IgniteConfiguration getConfiguration() throws Exception {
-        // Generate unique grid name.
-        return getConfiguration(getTestGridName());
+        // Generate unique Ignite instance name.
+        return getConfiguration(getTestIgniteInstanceName());
     }
 
     /**
      * This method should be overridden by subclasses to change configuration parameters.
      *
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @return Grid configuration used for starting of grid.
      * @throws Exception If failed.
      */
     @SuppressWarnings("deprecation")
-    protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = getConfiguration(gridName, getTestResources());
+    protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = getConfiguration(igniteInstanceName, getTestResources());
 
         cfg.setNodeId(null);
 
@@ -1245,11 +1245,11 @@ public abstract class GridAbstractTest extends TestCase {
             bCfg.setNameMapper(new BinaryBasicNameMapper(true));
         }
 
-        if (gridName != null && gridName.matches(".*\\d")) {
+        if (igniteInstanceName != null && igniteInstanceName.matches(".*\\d")) {
             String idStr = UUID.randomUUID().toString();
 
-            if (gridName.startsWith(getTestGridName())) {
-                String idxStr = String.valueOf(getTestGridIndex(gridName));
+            if (igniteInstanceName.startsWith(getTestIgniteInstanceName())) {
+                String idxStr = String.valueOf(getTestIgniteInstanceIndex(igniteInstanceName));
 
                 while (idxStr.length() < 5)
                     idxStr = '0' + idxStr;
@@ -1264,12 +1264,12 @@ public abstract class GridAbstractTest extends TestCase {
             else {
                 char[] chars = idStr.toCharArray();
 
-                chars[0] = gridName.charAt(gridName.length() - 1);
+                chars[0] = igniteInstanceName.charAt(igniteInstanceName.length() - 1);
                 chars[1] = '0';
 
                 chars[chars.length - 3] = '0';
                 chars[chars.length - 2] = '0';
-                chars[chars.length - 1] = gridName.charAt(gridName.length() - 1);
+                chars[chars.length - 1] = igniteInstanceName.charAt(igniteInstanceName.length() - 1);
 
                 cfg.setNodeId(UUID.fromString(new String(chars)));
             }
@@ -1282,30 +1282,30 @@ public abstract class GridAbstractTest extends TestCase {
     }
 
     /**
-     * @return Generated unique test grid name.
+     * @return Generated unique test Ignite instance name.
      */
-    public String getTestGridName() {
+    public String getTestIgniteInstanceName() {
         String[] parts = getClass().getName().split("\\.");
 
         return parts[parts.length - 2] + '.' + parts[parts.length - 1];
     }
 
     /**
-     * @param idx Index of the grid.
-     * @return Indexed grid name.
+     * @param idx Index of the Ignite instance.
+     * @return Indexed Ignite instance name.
      */
-    public String getTestGridName(int idx) {
-        return getTestGridName() + idx;
+    public String getTestIgniteInstanceName(int idx) {
+        return getTestIgniteInstanceName() + idx;
     }
 
     /**
-     * Parses test grid index from test grid name.
+     * Parses test Ignite instance index from test Ignite instance name.
      *
-     * @param testGridName Test grid name, returned by {@link #getTestGridName(int)}.
-     * @return Test grid index.
+     * @param testIgniteInstanceName Test Ignite instance name, returned by {@link #getTestIgniteInstanceName(int)}.
+     * @return Test Ignite instance index.
      */
-    public int getTestGridIndex(String testGridName) {
-        return Integer.parseInt(testGridName.substring(getTestGridName().length()));
+    public int getTestIgniteInstanceIndex(String testIgniteInstanceName) {
+        return Integer.parseInt(testIgniteInstanceName.substring(getTestIgniteInstanceName().length()));
     }
 
     /**
@@ -1346,15 +1346,16 @@ public abstract class GridAbstractTest extends TestCase {
      * This method should be overridden by subclasses to change configuration parameters.
      *
      * @return Grid configuration used for starting of grid.
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @param rsrcs Resources.
      * @throws Exception If failed.
      */
     @SuppressWarnings("deprecation")
-    protected IgniteConfiguration getConfiguration(String gridName, IgniteTestResources rsrcs) throws Exception {
+    protected IgniteConfiguration getConfiguration(String igniteInstanceName, IgniteTestResources rsrcs)
+        throws Exception {
         IgniteConfiguration cfg = new IgniteConfiguration();
 
-        cfg.setGridName(gridName);
+        cfg.setIgniteInstanceName(igniteInstanceName);
         cfg.setGridLogger(rsrcs.getLogger());
         cfg.setMarshaller(rsrcs.getMarshaller());
         cfg.setNodeId(rsrcs.getNodeId());
@@ -1486,7 +1487,7 @@ public abstract class GridAbstractTest extends TestCase {
                 afterTestsStopped();
 
                 if (startGrid)
-                    G.stop(getTestGridName(), true);
+                    G.stop(getTestIgniteInstanceName(), true);
 
                 // Remove counters.
                 tests.remove(getClass());
@@ -1568,19 +1569,19 @@ public abstract class GridAbstractTest extends TestCase {
     }
 
     /**
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @return {@code True} if the name of the grid indicates that it was the first started (on this JVM).
      */
-    protected boolean isFirstGrid(String gridName) {
-        return "0".equals(gridName.substring(getTestGridName().length()));
+    protected boolean isFirstGrid(String igniteInstanceName) {
+        return "0".equals(igniteInstanceName.substring(getTestIgniteInstanceName().length()));
     }
 
     /**
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @return <code>True</code> if test was run in multi-JVM mode and grid with this name was started at another JVM.
      */
-    protected boolean isRemoteJvm(String gridName) {
-        return isMultiJvm() && !isFirstGrid(gridName);
+    protected boolean isRemoteJvm(String igniteInstanceName) {
+        return isMultiJvm() && !isFirstGrid(igniteInstanceName);
     }
 
     /**
@@ -1744,7 +1745,7 @@ public abstract class GridAbstractTest extends TestCase {
     @Override protected void runTest() throws Throwable {
         final AtomicReference<Throwable> ex = new AtomicReference<>();
 
-        Thread runner = new IgniteThread(getTestGridName(), "test-runner", new Runnable() {
+        Thread runner = new IgniteThread(getTestIgniteInstanceName(), "test-runner", new Runnable() {
             @Override public void run() {
                 try {
                     runTestInternal();

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteCacheConfigVariationsAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteCacheConfigVariationsAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteCacheConfigVariationsAbstractTest.java
index 403835a..64dcfd0 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteCacheConfigVariationsAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteCacheConfigVariationsAbstractTest.java
@@ -87,9 +87,9 @@ public abstract class IgniteCacheConfigVariationsAbstractTest extends IgniteConf
                 Ignition.stopAll(true);
 
                 for (int i = 0; i < cnt; i++) {
-                    String gridName = getTestGridName(i);
+                    String igniteInstanceName = getTestIgniteInstanceName(i);
 
-                    IgniteConfiguration cfg = optimize(getConfiguration(gridName));
+                    IgniteConfiguration cfg = optimize(getConfiguration(igniteInstanceName));
 
                     if (i != CLIENT_NODE_IDX && i != CLIENT_NEAR_ONLY_IDX) {
                         CacheConfiguration cc = cacheConfiguration();
@@ -99,7 +99,7 @@ public abstract class IgniteCacheConfigVariationsAbstractTest extends IgniteConf
                         cfg.setCacheConfiguration(cc);
                     }
 
-                    startGrid(gridName, cfg, null);
+                    startGrid(igniteInstanceName, cfg, null);
                 }
 
                 if (testsCfg.withClients() && testsCfg.gridCount() > CLIENT_NEAR_ONLY_IDX)
@@ -174,8 +174,8 @@ public abstract class IgniteCacheConfigVariationsAbstractTest extends IgniteConf
 
     /** {@inheritDoc} */
     @Override protected boolean expectedClient(String testGridName) {
-        return getTestGridName(CLIENT_NODE_IDX).equals(testGridName)
-            || getTestGridName(CLIENT_NEAR_ONLY_IDX).equals(testGridName);
+        return getTestIgniteInstanceName(CLIENT_NODE_IDX).equals(testGridName)
+            || getTestIgniteInstanceName(CLIENT_NEAR_ONLY_IDX).equals(testGridName);
     }
 
     /** {@inheritDoc} */
@@ -447,7 +447,7 @@ public abstract class IgniteCacheConfigVariationsAbstractTest extends IgniteConf
      * @return Cache configuration.
      */
     protected CacheConfiguration cacheConfiguration() {
-        return testsCfg.configurationFactory().cacheConfiguration(getTestGridName(testedNodeIdx));
+        return testsCfg.configurationFactory().cacheConfiguration(getTestIgniteInstanceName(testedNodeIdx));
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java
index 572a80e..c0353b6 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java
@@ -96,7 +96,7 @@ public abstract class IgniteConfigVariationsAbstractTest extends GridCommonAbstr
 
         if (testsCfg.withClients()) {
             for (int i = 0; i < gridCount(); i++)
-                assertEquals("i: " + i, expectedClient(getTestGridName(i)),
+                assertEquals("i: " + i, expectedClient(getTestIgniteInstanceName(i)),
                     (boolean)grid(i).configuration().isClientMode());
         }
     }
@@ -106,7 +106,7 @@ public abstract class IgniteConfigVariationsAbstractTest extends GridCommonAbstr
      * @return {@code True} if node is client should be client.
      */
     protected boolean expectedClient(String testGridName) {
-        return getTestGridName(CLIENT_NODE_IDX).equals(testGridName);
+        return getTestIgniteInstanceName(CLIENT_NODE_IDX).equals(testGridName);
     }
 
     /** {@inheritDoc} */
@@ -156,15 +156,15 @@ public abstract class IgniteConfigVariationsAbstractTest extends GridCommonAbstr
     }
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        IgniteConfiguration resCfg = testsCfg.configurationFactory().getConfiguration(gridName, cfg);
+        IgniteConfiguration resCfg = testsCfg.configurationFactory().getConfiguration(igniteInstanceName, cfg);
 
         resCfg.setWorkDirectory(workDir.getAbsolutePath());
 
         if (testsCfg.withClients())
-            resCfg.setClientMode(expectedClient(gridName));
+            resCfg.setClientMode(expectedClient(igniteInstanceName));
 
         return resCfg;
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractExamplesTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractExamplesTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractExamplesTest.java
index 6ffe4d3..1e6c84e 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractExamplesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractExamplesTest.java
@@ -66,7 +66,7 @@ public abstract class GridAbstractExamplesTest extends GridCommonAbstractTest {
         info("Config for remote nodes [name=" + name + ", cfg=" + cfg + ", dflt=" + defaultConfig() + "]");
 
         for (int i = 0; i < RMT_NODES_CNT; i++)
-            startGrid(getTestGridName(i), cfg);
+            startGrid(getTestIgniteInstanceName(i), cfg);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 3bdf0bd..7b41b6c 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -458,7 +458,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
 
             IgniteKernal g0 = (IgniteKernal)g;
 
-            names.add(g0.configuration().getGridName());
+            names.add(g0.configuration().getIgniteInstanceName());
 
             if (startTime != -1) {
                 if (startTime != g0.context().discovery().gridStartTime())
@@ -510,7 +510,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
                                 if (affNodes.size() != owners.size() || !affNodes.containsAll(owners) ||
                                     (waitEvicts && loc != null && loc.state() != GridDhtPartitionState.OWNING)) {
                                     LT.warn(log(), "Waiting for topology map update [" +
-                                        "grid=" + g.name() +
+                                        "igniteInstanceName=" + g.name() +
                                         ", cache=" + cfg.getName() +
                                         ", cacheId=" + dht.context().cacheId() +
                                         ", topVer=" + top.topologyVersion() +
@@ -527,7 +527,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
                             }
                             else {
                                 LT.warn(log(), "Waiting for topology map update [" +
-                                    "grid=" + g.name() +
+                                    "igniteInstanceName=" + g.name() +
                                     ", cache=" + cfg.getName() +
                                     ", cacheId=" + dht.context().cacheId() +
                                     ", topVer=" + top.topologyVersion() +
@@ -545,7 +545,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
                                     U.dumpThreads(log);
 
                                     throw new IgniteException("Timeout of waiting for topology map update [" +
-                                        "grid=" + g.name() +
+                                        "igniteInstanceName=" + g.name() +
                                         ", cache=" + cfg.getName() +
                                         ", cacheId=" + dht.context().cacheId() +
                                         ", topVer=" + top.topologyVersion() +
@@ -560,8 +560,9 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
                             }
 
                             if (i > 0)
-                                log().warning("Finished waiting for topology map update [grid=" + g.name() +
-                                    ", p=" + p + ", duration=" + (System.currentTimeMillis() - start) + "ms]");
+                                log().warning("Finished waiting for topology map update [igniteInstanceName=" +
+                                    g.name() + ", p=" + p + ", duration=" + (System.currentTimeMillis() - start) +
+                                    "ms]");
 
                             break;
                         }
@@ -584,7 +585,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
                                         U.dumpThreads(log);
 
                                         throw new IgniteException("Timeout of waiting for partition state update [" +
-                                            "grid=" + g.name() +
+                                            "igniteInstanceName=" + g.name() +
                                             ", cache=" + cfg.getName() +
                                             ", cacheId=" + dht.context().cacheId() +
                                             ", topVer=" + top.topologyVersion() +

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridRollingRestartAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridRollingRestartAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridRollingRestartAbstractTest.java
index 6a7973c..859eb3c 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridRollingRestartAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridRollingRestartAbstractTest.java
@@ -82,10 +82,10 @@ public abstract class GridRollingRestartAbstractTest extends GridCommonAbstractT
     public abstract int serverCount();
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        if (isFirstGrid(gridName)) {
+        if (isFirstGrid(igniteInstanceName)) {
             cfg.setClientMode(true);
 
             assert cfg.getDiscoverySpi() instanceof TcpDiscoverySpi;

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
index 8135c6f..4180151 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
@@ -173,12 +173,12 @@ public class IgniteProcessProxy implements IgniteEx {
         if (locJvmGrid != null)
             assert rmtNodeStartedLatch.await(30, TimeUnit.SECONDS): "Remote node has not joined [id=" + id + ']';
 
-        IgniteProcessProxy prevVal = gridProxies.putIfAbsent(cfg.getGridName(), this);
+        IgniteProcessProxy prevVal = gridProxies.putIfAbsent(cfg.getIgniteInstanceName(), this);
 
         if (prevVal != null) {
-            remoteCompute().run(new StopGridTask(cfg.getGridName(), true));
+            remoteCompute().run(new StopGridTask(cfg.getIgniteInstanceName(), true));
 
-            throw new IllegalStateException("There was found instance assotiated with " + cfg.getGridName() +
+            throw new IllegalStateException("There was found instance assotiated with " + cfg.getIgniteInstanceName() +
                 ", instance= " + prevVal + ". New started node was stopped.");
         }
     }
@@ -214,15 +214,16 @@ public class IgniteProcessProxy implements IgniteEx {
     }
 
     /**
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @return Instance by name or exception wiil be thrown.
      */
-    public static IgniteProcessProxy ignite(String gridName) {
-        IgniteProcessProxy res = gridProxies.get(gridName);
+    public static IgniteProcessProxy ignite(String igniteInstanceName) {
+        IgniteProcessProxy res = gridProxies.get(igniteInstanceName);
 
         if (res == null)
             throw new IgniteIllegalStateException("Grid instance was not properly started " +
-                "or was already stopped: " + gridName + ". All known grid instances: " + gridProxies.keySet());
+                "or was already stopped: " + igniteInstanceName + ". All known grid instances: " +
+                gridProxies.keySet());
 
         return res;
     }
@@ -230,28 +231,28 @@ public class IgniteProcessProxy implements IgniteEx {
     /**
      * Gracefully shut down the Grid.
      *
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @param cancel If {@code true} then all jobs currently will be cancelled.
      */
-    public static void stop(String gridName, boolean cancel) {
-        IgniteProcessProxy proxy = gridProxies.get(gridName);
+    public static void stop(String igniteInstanceName, boolean cancel) {
+        IgniteProcessProxy proxy = gridProxies.get(igniteInstanceName);
 
         if (proxy != null) {
-            proxy.remoteCompute().run(new StopGridTask(gridName, cancel));
+            proxy.remoteCompute().run(new StopGridTask(igniteInstanceName, cancel));
 
-            gridProxies.remove(gridName, proxy);
+            gridProxies.remove(igniteInstanceName, proxy);
         }
     }
 
     /**
      * Forcefully shut down the Grid.
      *
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      */
-    public static void kill(String gridName) {
-        A.notNull(gridName, "gridName");
+    public static void kill(String igniteInstanceName) {
+        A.notNull(igniteInstanceName, "igniteInstanceName");
 
-        IgniteProcessProxy proxy = gridProxies.get(gridName);
+        IgniteProcessProxy proxy = gridProxies.get(igniteInstanceName);
 
         if (proxy == null)
             return;
@@ -260,10 +261,10 @@ public class IgniteProcessProxy implements IgniteEx {
             proxy.getProcess().kill();
         }
         catch (Exception e) {
-            U.error(proxy.log, "Exception while killing " + gridName, e);
+            U.error(proxy.log, "Exception while killing " + igniteInstanceName, e);
         }
 
-        gridProxies.remove(gridName, proxy);
+        gridProxies.remove(igniteInstanceName, proxy);
     }
 
     /**
@@ -316,7 +317,7 @@ public class IgniteProcessProxy implements IgniteEx {
 
     /** {@inheritDoc} */
     @Override public String name() {
-        return cfg.getGridName();
+        return cfg.getIgniteInstanceName();
     }
 
     /** {@inheritDoc} */
@@ -693,24 +694,24 @@ public class IgniteProcessProxy implements IgniteEx {
      *
      */
     private static class StopGridTask implements IgniteRunnable {
-        /** Grid name. */
-        private final String gridName;
+        /** Ignite instance name. */
+        private final String igniteInstanceName;
 
         /** Cancel. */
         private final boolean cancel;
 
         /**
-         * @param gridName Grid name.
+         * @param igniteInstanceName Ignite instance name.
          * @param cancel Cancel.
          */
-        public StopGridTask(String gridName, boolean cancel) {
-            this.gridName = gridName;
+        public StopGridTask(String igniteInstanceName, boolean cancel) {
+            this.igniteInstanceName = igniteInstanceName;
             this.cancel = cancel;
         }
 
         /** {@inheritDoc} */
         @Override public void run() {
-            G.stop(gridName, cancel);
+            G.stop(igniteInstanceName, cancel);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractConfigTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractConfigTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractConfigTest.java
index ec6ddac..ec28d8b 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractConfigTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractConfigTest.java
@@ -94,7 +94,7 @@ public abstract class GridSpiAbstractConfigTest<T extends IgniteSpi> extends Gri
                 if (!(spi instanceof DiscoverySpi))
                     spi.getNodeAttributes();
 
-                spi.spiStart(getTestGridName());
+                spi.spiStart(getTestIgniteInstanceName());
             }
             catch (IgniteSpiException e) {
                 info("SPI start thrown exception: " + e);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
index c74117c..091abd7 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
@@ -432,8 +432,8 @@ public abstract class GridSpiAbstractTest<T extends IgniteSpi> extends GridAbstr
      * @throws Exception If failed.
      */
     protected void spiStart(IgniteSpi spi) throws Exception {
-        // Start SPI with unique grid name.
-        spi.spiStart(getTestGridName());
+        // Start SPI with unique Ignite instance name.
+        spi.spiStart(getTestIgniteInstanceName());
 
         info("SPI started [spi=" + spi.getClass() + ']');
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/util/AttributeNodeFilterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/util/AttributeNodeFilterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/util/AttributeNodeFilterSelfTest.java
index ac3800f..2463d9a 100644
--- a/modules/core/src/test/java/org/apache/ignite/util/AttributeNodeFilterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/util/AttributeNodeFilterSelfTest.java
@@ -44,8 +44,8 @@ public class AttributeNodeFilterSelfTest extends GridCommonAbstractTest {
     private Map<String, ?> attrs;
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(IP_FINDER));
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/util/GridTopologyHeapSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridTopologyHeapSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridTopologyHeapSizeSelfTest.java
index 64b3c61..8279ee4 100644
--- a/modules/core/src/test/java/org/apache/ignite/util/GridTopologyHeapSizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/util/GridTopologyHeapSizeSelfTest.java
@@ -40,8 +40,8 @@ public class GridTopologyHeapSizeSelfTest extends GridCommonAbstractTest {
     private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         TcpDiscoverySpi disco = new TcpDiscoverySpi();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridBinaryH2IndexingGeoSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridBinaryH2IndexingGeoSelfTest.java b/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridBinaryH2IndexingGeoSelfTest.java
index 01071f9..e271712 100644
--- a/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridBinaryH2IndexingGeoSelfTest.java
+++ b/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridBinaryH2IndexingGeoSelfTest.java
@@ -25,8 +25,8 @@ import org.apache.ignite.internal.binary.BinaryMarshaller;
  */
 public class GridBinaryH2IndexingGeoSelfTest extends GridH2IndexingGeoSelfTest {
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         cfg.setMarshaller(new BinaryMarshaller());
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsInProc.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsInProc.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsInProc.java
index ed882c7..0ca2e56 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsInProc.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsInProc.java
@@ -139,7 +139,7 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
 
         cfg.setClientMode(true);
 
-        String nodeName = cfg.getGridName();
+        String nodeName = cfg.getIgniteInstanceName();
 
         synchronized (REF_CTR_MUX) {
             T2<Ignite, Boolean> startRes = IgnitionEx.getOrStart(cfg);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffle.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffle.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffle.java
index 7575ff4..3296993 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffle.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffle.java
@@ -187,7 +187,7 @@ public class HadoopShuffle extends HadoopComponent {
      * @param shuffleJob Job to start sending for.
      */
     private void startSending(HadoopShuffleJob<UUID> shuffleJob) {
-        shuffleJob.startSending(ctx.kernalContext().gridName(),
+        shuffleJob.startSending(ctx.kernalContext().igniteInstanceName(),
             new IgniteInClosure2X<UUID, HadoopMessage>() {
                 @Override public void applyx(UUID dest, HadoopMessage msg) throws IgniteCheckedException {
                     send0(dest, msg);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java
index 338532e..226d3e3 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java
@@ -246,11 +246,11 @@ public class HadoopShuffleJob<T> implements AutoCloseable {
     }
 
     /**
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @param io IO Closure for sending messages.
      */
     @SuppressWarnings("BusyWait")
-    public void startSending(String gridName, IgniteInClosure2X<T, HadoopMessage> io) {
+    public void startSending(String igniteInstanceName, IgniteInClosure2X<T, HadoopMessage> io) {
         assert snd == null;
         assert io != null;
 
@@ -258,7 +258,7 @@ public class HadoopShuffleJob<T> implements AutoCloseable {
 
         if (!stripeMappers) {
             if (!flushed) {
-                snd = new GridWorker(gridName, "hadoop-shuffle-" + job.id(), log) {
+                snd = new GridWorker(igniteInstanceName, "hadoop-shuffle-" + job.id(), log) {
                     @Override protected void body() throws InterruptedException {
                         try {
                             while (!isCancelled()) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopEmbeddedTaskExecutor.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopEmbeddedTaskExecutor.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopEmbeddedTaskExecutor.java
index 96893b1..c030313 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopEmbeddedTaskExecutor.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopEmbeddedTaskExecutor.java
@@ -53,7 +53,7 @@ public class HadoopEmbeddedTaskExecutor extends HadoopTaskExecutorAdapter {
 
         jobTracker = ctx.jobTracker();
 
-        exec = new HadoopExecutorService(log, ctx.kernalContext().gridName(),
+        exec = new HadoopExecutorService(log, ctx.kernalContext().igniteInstanceName(),
             ctx.configuration().getMaxParallelTasks(), ctx.configuration().getMaxTaskQueueSize());
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopExecutorService.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopExecutorService.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopExecutorService.java
index a5f3df9..9ad5bc1 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopExecutorService.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopExecutorService.java
@@ -50,7 +50,7 @@ public class HadoopExecutorService {
     private final int maxTasks;
 
     /** */
-    private final String gridName;
+    private final String igniteInstanceName;
 
     /** */
     private final IgniteLogger log;
@@ -84,17 +84,17 @@ public class HadoopExecutorService {
 
     /**
      * @param log Logger.
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @param maxTasks Max number of tasks.
      * @param maxQueue Max queue length.
      */
-    public HadoopExecutorService(IgniteLogger log, String gridName, int maxTasks, int maxQueue) {
+    public HadoopExecutorService(IgniteLogger log, String igniteInstanceName, int maxTasks, int maxQueue) {
         assert maxTasks > 0 : maxTasks;
         assert maxQueue > 0 : maxQueue;
 
         this.maxTasks = maxTasks;
         this.queue = new LinkedBlockingQueue<>(maxQueue);
-        this.gridName = gridName;
+        this.igniteInstanceName = igniteInstanceName;
         this.log = log.getLogger(HadoopExecutorService.class);
     }
 
@@ -180,7 +180,7 @@ public class HadoopExecutorService {
         else
             workerName = task.toString();
 
-        GridWorker w = new GridWorker(gridName, workerName, log, lsnr) {
+        GridWorker w = new GridWorker(igniteInstanceName, workerName, log, lsnr) {
             @Override protected void body() {
                 try {
                     task.call();

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java
index afa3e25..c8263ff 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java
@@ -118,7 +118,7 @@ public class HadoopExternalTaskExecutor extends HadoopTaskExecutorAdapter {
             ctx.kernalContext().config().getMarshaller(),
             log,
             ctx.kernalContext().getSystemExecutorService(),
-            ctx.kernalContext().gridName(),
+            ctx.kernalContext().igniteInstanceName(),
             ctx.kernalContext().config().getWorkDirectory());
 
         comm.setListener(new MessageListener());

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopExternalCommunication.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopExternalCommunication.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopExternalCommunication.java
index ff58509..9204c97 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopExternalCommunication.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopExternalCommunication.java
@@ -174,8 +174,8 @@ public class HadoopExternalCommunication {
     /** Message notification executor service. */
     private ExecutorService execSvc;
 
-    /** Grid name. */
-    private String gridName;
+    /** Ignite instance name. */
+    private String igniteInstanceName;
 
     /** Work directory. */
     private String workDir;
@@ -256,7 +256,7 @@ public class HadoopExternalCommunication {
      * @param marsh Marshaller to use.
      * @param log Logger.
      * @param execSvc Executor service for message notification.
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @param workDir Work directory.
      */
     public HadoopExternalCommunication(
@@ -265,7 +265,7 @@ public class HadoopExternalCommunication {
         Marshaller marsh,
         IgniteLogger log,
         ExecutorService execSvc,
-        String gridName,
+        String igniteInstanceName,
         String workDir
     ) {
         locProcDesc = new HadoopProcessDescriptor(parentNodeId, procId);
@@ -273,7 +273,7 @@ public class HadoopExternalCommunication {
         this.marsh = marsh;
         this.log = log.getLogger(HadoopExternalCommunication.class);
         this.execSvc = execSvc;
-        this.gridName = gridName;
+        this.igniteInstanceName = igniteInstanceName;
         this.workDir = workDir;
     }
 
@@ -609,7 +609,7 @@ public class HadoopExternalCommunication {
      */
     private GridNioFilter[] filters() {
         return new GridNioFilter[] {
-            new GridNioAsyncNotifyFilter(gridName, execSvc, log),
+            new GridNioAsyncNotifyFilter(igniteInstanceName, execSvc, log),
             new HandshakeAndBackpressureFilter(),
             new HadoopMarshallerFilter(marsh),
             new GridNioCodecFilter(new GridBufferedParser(directBuf, ByteOrder.nativeOrder()), log, false)
@@ -638,7 +638,7 @@ public class HadoopExternalCommunication {
                         .listener(srvLsnr)
                         .logger(log.getLogger(GridNioServer.class))
                         .selectorCount(selectorsCnt)
-                        .gridName(gridName)
+                        .igniteInstanceName(igniteInstanceName)
                         .serverName("hadoop")
                         .tcpNoDelay(tcpNoDelay)
                         .directBuffer(directBuf)
@@ -692,7 +692,7 @@ public class HadoopExternalCommunication {
             try {
                 IpcSharedMemoryServerEndpoint srv = new IpcSharedMemoryServerEndpoint(
                     log.getLogger(IpcSharedMemoryServerEndpoint.class),
-                    locProcDesc.processId(), gridName, workDir);
+                    locProcDesc.processId(), igniteInstanceName, workDir);
 
                 srv.setPort(port);
 
@@ -1130,7 +1130,7 @@ public class HadoopExternalCommunication {
          * @param srv Server.
          */
         ShmemAcceptWorker(IpcSharedMemoryServerEndpoint srv) {
-            super(gridName, "shmem-communication-acceptor", HadoopExternalCommunication.this.log);
+            super(igniteInstanceName, "shmem-communication-acceptor", HadoopExternalCommunication.this.log);
 
             this.srv = srv;
         }
@@ -1177,7 +1177,7 @@ public class HadoopExternalCommunication {
          * @param endpoint Endpoint.
          */
         private ShmemWorker(IpcEndpoint endpoint, boolean accepted) {
-            super(gridName, "shmem-worker", HadoopExternalCommunication.this.log);
+            super(igniteInstanceName, "shmem-worker", HadoopExternalCommunication.this.log);
 
             this.endpoint = endpoint;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java
index 619149c..12e1257 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java
@@ -347,7 +347,7 @@ public class HadoopAbstractMapReduceTest extends HadoopAbstractWordCountTest {
     /**
      * Start grid with IGFS.
      *
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @param igfsName IGFS name
      * @param mode IGFS mode.
      * @param secondaryFs Secondary file system (optional).
@@ -355,7 +355,7 @@ public class HadoopAbstractMapReduceTest extends HadoopAbstractWordCountTest {
      * @return Started grid instance.
      * @throws Exception If failed.
      */
-    protected Ignite startGridWithIgfs(String gridName, String igfsName, IgfsMode mode,
+    protected Ignite startGridWithIgfs(String igniteInstanceName, String igfsName, IgfsMode mode,
         @Nullable IgfsSecondaryFileSystem secondaryFs, @Nullable IgfsIpcEndpointConfiguration restCfg) throws Exception {
         FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
 
@@ -390,7 +390,7 @@ public class HadoopAbstractMapReduceTest extends HadoopAbstractWordCountTest {
 
         IgniteConfiguration cfg = new IgniteConfiguration();
 
-        cfg.setGridName(gridName);
+        cfg.setIgniteInstanceName(igniteInstanceName);
 
         TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java
index 4a810e2..bf17d05 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java
@@ -112,10 +112,10 @@ public abstract class HadoopAbstractSelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        cfg.setHadoopConfiguration(hadoopConfiguration(gridName));
+        cfg.setHadoopConfiguration(hadoopConfiguration(igniteInstanceName));
 
         TcpCommunicationSpi commSpi = new TcpCommunicationSpi();
 
@@ -145,10 +145,10 @@ public abstract class HadoopAbstractSelfTest extends GridCommonAbstractTest {
     }
 
     /**
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @return Hadoop configuration.
      */
-    public HadoopConfiguration hadoopConfiguration(String gridName) {
+    public HadoopConfiguration hadoopConfiguration(String igniteInstanceName) {
         HadoopConfiguration cfg = new HadoopConfiguration();
 
         cfg.setMaxParallelTasks(3);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopGroupingTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopGroupingTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopGroupingTest.java
index 19c71e8..2de2d19 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopGroupingTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopGroupingTest.java
@@ -75,8 +75,8 @@ public class HadoopGroupingTest extends HadoopAbstractSelfTest {
     }
 
     /** {@inheritDoc} */
-    @Override public HadoopConfiguration hadoopConfiguration(String gridName) {
-        HadoopConfiguration cfg = super.hadoopConfiguration(gridName);
+    @Override public HadoopConfiguration hadoopConfiguration(String igniteInstanceName) {
+        HadoopConfiguration cfg = super.hadoopConfiguration(igniteInstanceName);
 
         // TODO: IGNITE-404: Uncomment when fixed.
         //cfg.setExternalExecution(false);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopJobTrackerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopJobTrackerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopJobTrackerSelfTest.java
index 692c2a3..381652e 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopJobTrackerSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopJobTrackerSelfTest.java
@@ -92,8 +92,8 @@ public class HadoopJobTrackerSelfTest extends HadoopAbstractSelfTest {
     }
 
     /** {@inheritDoc} */
-    @Override public HadoopConfiguration hadoopConfiguration(String gridName) {
-        HadoopConfiguration cfg = super.hadoopConfiguration(gridName);
+    @Override public HadoopConfiguration hadoopConfiguration(String igniteInstanceName) {
+        HadoopConfiguration cfg = super.hadoopConfiguration(igniteInstanceName);
 
         cfg.setMapReducePlanner(new HadoopTestRoundRobinMrPlanner());
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopMapReduceEmbeddedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopMapReduceEmbeddedSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopMapReduceEmbeddedSelfTest.java
index bce67f6..6eb16af 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopMapReduceEmbeddedSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopMapReduceEmbeddedSelfTest.java
@@ -46,8 +46,8 @@ import static org.apache.ignite.internal.processors.hadoop.state.HadoopMapReduce
  */
 public class HadoopMapReduceEmbeddedSelfTest extends HadoopMapReduceTest {
     /** {@inheritDoc} */
-    @Override public HadoopConfiguration hadoopConfiguration(String gridName) {
-        HadoopConfiguration cfg = super.hadoopConfiguration(gridName);
+    @Override public HadoopConfiguration hadoopConfiguration(String igniteInstanceName) {
+        HadoopConfiguration cfg = super.hadoopConfiguration(igniteInstanceName);
 
         // TODO: IGNITE-404: Uncomment when fixed.
         //cfg.setExternalExecution(false);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopNoHadoopMapReduceTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopNoHadoopMapReduceTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopNoHadoopMapReduceTest.java
index 3bb8735..382631d 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopNoHadoopMapReduceTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopNoHadoopMapReduceTest.java
@@ -24,8 +24,8 @@ import org.apache.ignite.configuration.IgniteConfiguration;
  */
 public class HadoopNoHadoopMapReduceTest extends HadoopMapReduceTest {
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration c = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
 
         c.setHadoopConfiguration(null);
         c.setPeerClassLoadingEnabled(true);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSortingExternalTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSortingExternalTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSortingExternalTest.java
index eb4a7d4..97283fc 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSortingExternalTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSortingExternalTest.java
@@ -26,8 +26,8 @@ import org.apache.ignite.marshaller.jdk.JdkMarshaller;
  */
 public class HadoopSortingExternalTest extends HadoopSortingTest {
     /** {@inheritDoc} */
-    @Override public HadoopConfiguration hadoopConfiguration(String gridName) {
-        HadoopConfiguration cfg = super.hadoopConfiguration(gridName);
+    @Override public HadoopConfiguration hadoopConfiguration(String igniteInstanceName) {
+        HadoopConfiguration cfg = super.hadoopConfiguration(igniteInstanceName);
 
         // TODO: IGNITE-404: Uncomment when fixed.
         //cfg.setExternalExecution(true);
@@ -36,8 +36,8 @@ public class HadoopSortingExternalTest extends HadoopSortingTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         cfg.setMarshaller(new JdkMarshaller());
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSortingTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSortingTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSortingTest.java
index a4e7368..2e85cce 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSortingTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSortingTest.java
@@ -86,8 +86,8 @@ public class HadoopSortingTest extends HadoopAbstractSelfTest {
     }
 
     /** {@inheritDoc} */
-    @Override public HadoopConfiguration hadoopConfiguration(String gridName) {
-        HadoopConfiguration cfg = super.hadoopConfiguration(gridName);
+    @Override public HadoopConfiguration hadoopConfiguration(String igniteInstanceName) {
+        HadoopConfiguration cfg = super.hadoopConfiguration(igniteInstanceName);
 
         // TODO: IGNITE-404: Uncomment when fixed.
         //cfg.setExternalExecution(false);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTaskExecutionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTaskExecutionSelfTest.java
index 21e2f3d..feb5a1f 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTaskExecutionSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTaskExecutionSelfTest.java
@@ -100,8 +100,8 @@ public class HadoopTaskExecutionSelfTest extends HadoopAbstractSelfTest {
     }
 
     /** {@inheritDoc} */
-    @Override public HadoopConfiguration hadoopConfiguration(String gridName) {
-        HadoopConfiguration cfg = super.hadoopConfiguration(gridName);
+    @Override public HadoopConfiguration hadoopConfiguration(String igniteInstanceName) {
+        HadoopConfiguration cfg = super.hadoopConfiguration(igniteInstanceName);
 
         cfg.setMaxParallelTasks(5);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTeraSortTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTeraSortTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTeraSortTest.java
index d237180..d8b74ce 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTeraSortTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTeraSortTest.java
@@ -384,8 +384,8 @@ public class HadoopTeraSortTest extends HadoopAbstractSelfTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration igc = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration igc = super.getConfiguration(igniteInstanceName);
 
         HadoopConfiguration hc = createHadoopConfiguration();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopValidationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopValidationSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopValidationSelfTest.java
index 2d61016..ef16762 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopValidationSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopValidationSelfTest.java
@@ -34,8 +34,8 @@ public class HadoopValidationSelfTest extends HadoopAbstractSelfTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         cfg.setPeerClassLoadingEnabled(peerClassLoading);
 


Mime
View raw message