You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/03/21 09:23:55 UTC
[04/71] [abbrv] ignite git commit: ignite-3207 Rename
IgniteConfiguration.gridName -> igniteInstanceName.
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolEmbeddedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolEmbeddedSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolEmbeddedSelfTest.java
index a65d691..7955a1d 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolEmbeddedSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolEmbeddedSelfTest.java
@@ -24,8 +24,8 @@ import org.apache.ignite.configuration.HadoopConfiguration;
*/
public class HadoopClientProtocolEmbeddedSelfTest extends HadoopClientProtocolSelfTest {
/** {@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/client/HadoopClientProtocolMultipleServersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolMultipleServersSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolMultipleServersSelfTest.java
index a4b5e6a..abc3701 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolMultipleServersSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolMultipleServersSelfTest.java
@@ -83,8 +83,8 @@ public class HadoopClientProtocolMultipleServersSelfTest extends HadoopAbstractS
}
/** {@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.getConnectorConfiguration().setPort(restPort++);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/Hadoop1DualAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/Hadoop1DualAbstractTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/Hadoop1DualAbstractTest.java
index cc9ea92..dd4580b 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/Hadoop1DualAbstractTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/Hadoop1DualAbstractTest.java
@@ -40,8 +40,8 @@ import static org.apache.ignite.igfs.IgfsMode.PRIMARY;
* Abstract test for Hadoop 1.0 file system stack.
*/
public abstract class Hadoop1DualAbstractTest extends IgfsDualAbstractSelfTest {
- /** Secondary grid name */
- private static final String GRID_NAME = "grid_secondary";
+ /** Secondary Ignite instance name */
+ private static final String IGNITE_INSTANCE_NAME = "grid_secondary";
/** Secondary file system name */
private static final String IGFS_NAME = "igfs_secondary";
@@ -115,7 +115,7 @@ public abstract class Hadoop1DualAbstractTest extends IgfsDualAbstractSelfTest {
* @throws IOException On failure.
*/
protected void startUnderlying() throws Exception {
- startGridWithIgfs(GRID_NAME, IGFS_NAME, PRIMARY, null, SECONDARY_REST_CFG, secondaryIpFinder);
+ startGridWithIgfs(IGNITE_INSTANCE_NAME, IGFS_NAME, PRIMARY, null, SECONDARY_REST_CFG, secondaryIpFinder);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java
index ac8f815..2e3a2a3 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java
@@ -248,7 +248,7 @@ public class HadoopFIleSystemFactorySelfTest extends IgfsCommonAbstractTest {
IgniteConfiguration cfg = new IgniteConfiguration();
- cfg.setGridName(name);
+ cfg.setIgniteInstanceName(name);
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/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java
index 201309e..77e6757 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java
@@ -147,10 +147,10 @@ public abstract class HadoopIgfs20FileSystemAbstractSelfTest extends IgfsCommonA
/**
* Get primary IPC endpoint configuration.
*
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @return IPC primary endpoint configuration.
*/
- protected abstract IgfsIpcEndpointConfiguration primaryIpcEndpointConfiguration(String gridName);
+ protected abstract IgfsIpcEndpointConfiguration primaryIpcEndpointConfiguration(String igniteInstanceName);
/**
* Gets secondary file system URI path.
@@ -216,7 +216,7 @@ public abstract class HadoopIgfs20FileSystemAbstractSelfTest extends IgfsCommonA
IgniteConfiguration cfg = new IgniteConfiguration();
- cfg.setGridName("grid_secondary");
+ cfg.setIgniteInstanceName("grid_secondary");
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
@@ -238,20 +238,20 @@ public abstract class HadoopIgfs20FileSystemAbstractSelfTest extends IgfsCommonA
}
/** {@inheritDoc} */
- @Override public String getTestGridName() {
+ @Override public String getTestIgniteInstanceName() {
return "grid";
}
/** {@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 discoSpi = new TcpDiscoverySpi();
discoSpi.setIpFinder(IP_FINDER);
cfg.setDiscoverySpi(discoSpi);
- cfg.setFileSystemConfiguration(igfsConfiguration(gridName));
+ cfg.setFileSystemConfiguration(igfsConfiguration(igniteInstanceName));
cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED);
cfg.setLocalHost("127.0.0.1");
cfg.setCommunicationSpi(communicationSpi());
@@ -262,10 +262,10 @@ public abstract class HadoopIgfs20FileSystemAbstractSelfTest extends IgfsCommonA
/**
* Gets cache configuration.
*
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @return Cache configuration.
*/
- protected CacheConfiguration dataCacheConfiguration(String gridName) {
+ protected CacheConfiguration dataCacheConfiguration(String igniteInstanceName) {
CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
@@ -297,24 +297,24 @@ public abstract class HadoopIgfs20FileSystemAbstractSelfTest extends IgfsCommonA
/**
* Gets IGFS configuration.
*
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @return IGFS configuration.
*/
- protected FileSystemConfiguration igfsConfiguration(String gridName) throws IgniteCheckedException {
+ protected FileSystemConfiguration igfsConfiguration(String igniteInstanceName) throws IgniteCheckedException {
FileSystemConfiguration cfg = new FileSystemConfiguration();
cfg.setName("igfs");
cfg.setPrefetchBlocks(1);
cfg.setMaxSpaceSize(64 * 1024 * 1024);
cfg.setDefaultMode(mode);
- cfg.setMetaCacheConfiguration(metaCacheConfiguration(gridName));
- cfg.setDataCacheConfiguration(dataCacheConfiguration(gridName));
+ cfg.setMetaCacheConfiguration(metaCacheConfiguration(igniteInstanceName));
+ cfg.setDataCacheConfiguration(dataCacheConfiguration(igniteInstanceName));
if (mode != PRIMARY)
cfg.setSecondaryFileSystem(new IgniteHadoopIgfsSecondaryFileSystem(secondaryFileSystemUriPath(),
secondaryFileSystemConfigPath(), SECONDARY_FS_USER));
- cfg.setIpcEndpointConfiguration(primaryIpcEndpointConfiguration(gridName));
+ cfg.setIpcEndpointConfiguration(primaryIpcEndpointConfiguration(igniteInstanceName));
cfg.setManagementPort(-1);
cfg.setBlockSize(512 * 1024); // Together with group blocks mapper will yield 64M per node groups.
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemLoopbackPrimarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemLoopbackPrimarySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemLoopbackPrimarySelfTest.java
index 13996b9..1e72e10 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemLoopbackPrimarySelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemLoopbackPrimarySelfTest.java
@@ -45,11 +45,11 @@ public class HadoopIgfs20FileSystemLoopbackPrimarySelfTest extends HadoopIgfs20F
}
/** {@inheritDoc} */
- @Override protected IgfsIpcEndpointConfiguration primaryIpcEndpointConfiguration(final String gridName) {
+ @Override protected IgfsIpcEndpointConfiguration primaryIpcEndpointConfiguration(final String igniteInstanceName) {
IgfsIpcEndpointConfiguration cfg = new IgfsIpcEndpointConfiguration();
cfg.setType(IgfsIpcEndpointType.TCP);
- cfg.setPort(DFLT_IPC_PORT + getTestGridIndex(gridName));
+ cfg.setPort(DFLT_IPC_PORT + getTestIgniteInstanceIndex(igniteInstanceName));
return cfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemShmemPrimarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemShmemPrimarySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemShmemPrimarySelfTest.java
index 3a4160d..4bdd03a 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemShmemPrimarySelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemShmemPrimarySelfTest.java
@@ -45,11 +45,11 @@ public class HadoopIgfs20FileSystemShmemPrimarySelfTest extends HadoopIgfs20File
}
/** {@inheritDoc} */
- @Override protected IgfsIpcEndpointConfiguration primaryIpcEndpointConfiguration(final String gridName) {
+ @Override protected IgfsIpcEndpointConfiguration primaryIpcEndpointConfiguration(final String igniteInstanceName) {
IgfsIpcEndpointConfiguration cfg = new IgfsIpcEndpointConfiguration();
cfg.setType(IgfsIpcEndpointType.SHMEM);
- cfg.setPort(DFLT_IPC_PORT + getTestGridIndex(gridName));
+ cfg.setPort(DFLT_IPC_PORT + getTestIgniteInstanceIndex(igniteInstanceName));
return cfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java
index 74df5dc..ad6a9f4 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java
@@ -140,7 +140,7 @@ public abstract class HadoopIgfsDualAbstractSelfTest extends IgfsCommonAbstractT
/**
* 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).
@@ -148,7 +148,7 @@ public abstract class HadoopIgfsDualAbstractSelfTest extends IgfsCommonAbstractT
* @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();
@@ -183,7 +183,7 @@ public abstract class HadoopIgfsDualAbstractSelfTest extends IgfsCommonAbstractT
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/igfs/HadoopSecondaryFileSystemConfigurationTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopSecondaryFileSystemConfigurationTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopSecondaryFileSystemConfigurationTest.java
index 8c438d7..04eaf93 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopSecondaryFileSystemConfigurationTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopSecondaryFileSystemConfigurationTest.java
@@ -292,7 +292,7 @@ public class HadoopSecondaryFileSystemConfigurationTest extends IgfsCommonAbstra
IgniteConfiguration cfg = new IgniteConfiguration();
- cfg.setGridName("grid_secondary");
+ cfg.setIgniteInstanceName("grid_secondary");
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
@@ -310,33 +310,33 @@ public class HadoopSecondaryFileSystemConfigurationTest extends IgfsCommonAbstra
/**
* Get primary IPC endpoint configuration.
*
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @return IPC primary endpoint configuration.
*/
- protected IgfsIpcEndpointConfiguration primaryIpcEndpointConfiguration(final String gridName) {
+ protected IgfsIpcEndpointConfiguration primaryIpcEndpointConfiguration(final String igniteInstanceName) {
IgfsIpcEndpointConfiguration cfg = new IgfsIpcEndpointConfiguration();
cfg.setType(IgfsIpcEndpointType.TCP);
- cfg.setPort(DFLT_IPC_PORT + getTestGridIndex(gridName));
+ cfg.setPort(DFLT_IPC_PORT + getTestIgniteInstanceIndex(igniteInstanceName));
return cfg;
}
/** {@inheritDoc} */
- @Override public String getTestGridName() {
+ @Override public String getTestIgniteInstanceName() {
return "grid";
}
/** {@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 discoSpi = new TcpDiscoverySpi();
discoSpi.setIpFinder(IP_FINDER);
cfg.setDiscoverySpi(discoSpi);
- cfg.setFileSystemConfiguration(fsConfiguration(gridName));
+ cfg.setFileSystemConfiguration(fsConfiguration(igniteInstanceName));
cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED);
cfg.setCommunicationSpi(communicationSpi());
@@ -381,10 +381,10 @@ public class HadoopSecondaryFileSystemConfigurationTest extends IgfsCommonAbstra
/**
* Gets IGFS configuration.
*
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @return IGFS configuration.
*/
- protected FileSystemConfiguration fsConfiguration(String gridName) throws IgniteCheckedException {
+ protected FileSystemConfiguration fsConfiguration(String igniteInstanceName) throws IgniteCheckedException {
FileSystemConfiguration cfg = new FileSystemConfiguration();
cfg.setName("igfs");
@@ -395,7 +395,7 @@ public class HadoopSecondaryFileSystemConfigurationTest extends IgfsCommonAbstra
cfg.setSecondaryFileSystem(
new IgniteHadoopIgfsSecondaryFileSystem(secondaryFsUriStr, secondaryConfFullPath));
- cfg.setIpcEndpointConfiguration(primaryIpcEndpointConfiguration(gridName));
+ cfg.setIpcEndpointConfiguration(primaryIpcEndpointConfiguration(igniteInstanceName));
cfg.setManagementPort(-1);
cfg.setBlockSize(512 * 1024); // Together with group blocks mapper will yield 64M per node groups.
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsNearOnlyMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsNearOnlyMultiNodeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsNearOnlyMultiNodeSelfTest.java
index 2e03718..7a5690c 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsNearOnlyMultiNodeSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsNearOnlyMultiNodeSelfTest.java
@@ -81,16 +81,16 @@ public class IgfsNearOnlyMultiNodeSelfTest 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.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(IP_FINDER).setForceServerMode(true));
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
igfsCfg.setName("igfs");
- igfsCfg.setDataCacheConfiguration(cacheConfiguration(gridName, "data"));
- igfsCfg.setMetaCacheConfiguration(cacheConfiguration(gridName, "meta"));
+ igfsCfg.setDataCacheConfiguration(cacheConfiguration(igniteInstanceName, "data"));
+ igfsCfg.setMetaCacheConfiguration(cacheConfiguration(igniteInstanceName, "meta"));
IgfsIpcEndpointConfiguration endpointCfg = new IgfsIpcEndpointConfiguration();
@@ -121,10 +121,10 @@ public class IgfsNearOnlyMultiNodeSelfTest extends GridCommonAbstractTest {
/**
* Gets cache configuration.
*
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @return Cache configuration.
*/
- protected CacheConfiguration cacheConfiguration(String gridName, String cacheName) {
+ protected CacheConfiguration cacheConfiguration(String igniteInstanceName, String cacheName) {
CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setName(cacheName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
index 2d58d2d..ff4ccea 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
@@ -273,7 +273,7 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
IgniteConfiguration cfg = new IgniteConfiguration();
- cfg.setGridName("grid_secondary");
+ cfg.setIgniteInstanceName("grid_secondary");
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
discoSpi.setLocalPort(47510);
@@ -339,28 +339,28 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
/**
* Get primary IPC endpoint configuration.
*
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @return IPC primary endpoint configuration.
*/
- protected abstract IgfsIpcEndpointConfiguration primaryIpcEndpointConfiguration(String gridName);
+ protected abstract IgfsIpcEndpointConfiguration primaryIpcEndpointConfiguration(String igniteInstanceName);
/** {@inheritDoc} */
- @Override public String getTestGridName() {
+ @Override public String getTestIgniteInstanceName() {
return "grid";
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = new IgniteConfiguration();
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
discoSpi.setIpFinder(IP_FINDER);
- cfg.setGridName(gridName);
+ cfg.setIgniteInstanceName(igniteInstanceName);
cfg.setMarshaller(new OptimizedMarshaller());
cfg.setDiscoverySpi(discoSpi);
- cfg.setFileSystemConfiguration(igfsConfiguration(gridName));
+ cfg.setFileSystemConfiguration(igfsConfiguration(igniteInstanceName));
cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED);
return cfg;
@@ -369,10 +369,10 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
/**
* Gets cache configuration.
*
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @return Cache configuration.
*/
- protected CacheConfiguration dataCacheConfiguration(String gridName) {
+ protected CacheConfiguration dataCacheConfiguration(String igniteInstanceName) {
CacheConfiguration ccfg = defaultCacheConfiguration();
ccfg.setName("partitioned");
@@ -389,10 +389,10 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
/**
* Gets cache configuration.
*
- * @param gridName Grid name.
+ * igniteInstanceName Ignite instance name.
* @return Cache configuration.
*/
- protected CacheConfiguration metaCacheConfiguration(String gridName) {
+ protected CacheConfiguration metaCacheConfiguration(String igniteInstanceName) {
CacheConfiguration ccfg = defaultCacheConfiguration();
ccfg.setName("replicated");
@@ -406,14 +406,14 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
/**
* Gets IGFS configuration.
*
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @return IGFS configuration.
*/
- protected FileSystemConfiguration igfsConfiguration(String gridName) throws IgniteCheckedException {
+ protected FileSystemConfiguration igfsConfiguration(String igniteInstanceName) throws IgniteCheckedException {
FileSystemConfiguration cfg = new FileSystemConfiguration();
- cfg.setDataCacheConfiguration(dataCacheConfiguration(gridName));
- cfg.setMetaCacheConfiguration(metaCacheConfiguration(gridName));
+ cfg.setDataCacheConfiguration(dataCacheConfiguration(igniteInstanceName));
+ cfg.setMetaCacheConfiguration(metaCacheConfiguration(igniteInstanceName));
cfg.setName("igfs");
cfg.setPrefetchBlocks(1);
cfg.setDefaultMode(mode);
@@ -433,7 +433,7 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA
cfg.setSecondaryFileSystem(sec);
}
- cfg.setIpcEndpointConfiguration(primaryIpcEndpointConfiguration(gridName));
+ cfg.setIpcEndpointConfiguration(primaryIpcEndpointConfiguration(igniteInstanceName));
cfg.setManagementPort(-1);
cfg.setBlockSize(512 * 1024); // Together with group blocks mapper will yield 64M per node groups.
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedOpenTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedOpenTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedOpenTest.java
index 657ee6e..e2b94e4 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedOpenTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedOpenTest.java
@@ -93,11 +93,11 @@ public class IgniteHadoopFileSystemClientBasedOpenTest extends GridCommonAbstrac
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteBiTuple<IgniteConfiguration, GridSpringResourceContext> cfgPair =
- IgnitionEx.loadConfiguration(cfgPath(getTestGridIndex(gridName)));
+ IgnitionEx.loadConfiguration(cfgPath(getTestIgniteInstanceIndex(gridName)));
IgniteConfiguration cfg = cfgPair.get1();
- cfg.setGridName(gridName);
+ cfg.setIgniteInstanceName(gridName);
return cfg;
}
@@ -239,7 +239,7 @@ public class IgniteHadoopFileSystemClientBasedOpenTest extends GridCommonAbstrac
assert nodeTypes.length == CONFIGS.length;
for (int i = 0; i < CONFIGS.length; i++) {
- String name = getTestGridName(i);
+ String name = getTestIgniteInstanceName(i);
switch (nodeTypes[i]) {
case REMOTE:
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientSelfTest.java
index 16c8fe1..93f1d05 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientSelfTest.java
@@ -70,8 +70,8 @@ public class IgniteHadoopFileSystemClientSelfTest extends IgfsCommonAbstractTest
}
/** {@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 discoSpi = new TcpDiscoverySpi();
discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true));
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java
index 3457c45..9839ad5 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java
@@ -58,8 +58,8 @@ public class IgniteHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractT
/** IP finder. */
private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
- /** Grid name. */
- private static final String GRID_NAME = "grid";
+ /** Ignite instance name. */
+ private static final String IGNITE_INSTANCE_NAME = "grid";
/** IGFS name. */
private static final String IGFS_NAME = "igfs";
@@ -88,17 +88,17 @@ public class IgniteHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractT
tcp = true;
- checkValid(IGFS_NAME + ":" + GRID_NAME + "@");
- checkValid(IGFS_NAME + ":" + GRID_NAME + "@127.0.0.1");
- checkValid(IGFS_NAME + ":" + GRID_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
+ checkValid(IGFS_NAME + ":" + IGNITE_INSTANCE_NAME + "@");
+ checkValid(IGFS_NAME + ":" + IGNITE_INSTANCE_NAME + "@127.0.0.1");
+ checkValid(IGFS_NAME + ":" + IGNITE_INSTANCE_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
checkValid(IGFS_NAME + "@");
checkValid(IGFS_NAME + "@127.0.0.1");
checkValid(IGFS_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
- checkValid(":" + GRID_NAME + "@");
- checkValid(":" + GRID_NAME + "@127.0.0.1");
- checkValid(":" + GRID_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
+ checkValid(":" + IGNITE_INSTANCE_NAME + "@");
+ checkValid(":" + IGNITE_INSTANCE_NAME + "@127.0.0.1");
+ checkValid(":" + IGNITE_INSTANCE_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
checkValid("");
checkValid("127.0.0.1");
@@ -106,14 +106,14 @@ public class IgniteHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractT
tcp = false; // Embedded mode:
- checkValid(IGFS_NAME + ":" + GRID_NAME + "@");
- checkValid(IGFS_NAME + ":" + GRID_NAME + "@" + HOST_PORT_UNUSED);
+ checkValid(IGFS_NAME + ":" + IGNITE_INSTANCE_NAME + "@");
+ checkValid(IGFS_NAME + ":" + IGNITE_INSTANCE_NAME + "@" + HOST_PORT_UNUSED);
checkValid(IGFS_NAME + "@"); // Embedded mode fails, but remote tcp succeeds.
checkValid(IGFS_NAME + "@" + HOST_PORT_UNUSED);
- checkValid(":" + GRID_NAME + "@"); // Embedded mode fails, but remote tcp succeeds.
- checkInvalid(":" + GRID_NAME + "@" + HOST_PORT_UNUSED);
+ checkValid(":" + IGNITE_INSTANCE_NAME + "@"); // Embedded mode fails, but remote tcp succeeds.
+ checkInvalid(":" + IGNITE_INSTANCE_NAME + "@" + HOST_PORT_UNUSED);
checkValid("@"); // Embedded mode fails, but remote tcp succeeds.
checkInvalid("@" + HOST_PORT_UNUSED);
@@ -129,17 +129,17 @@ public class IgniteHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractT
tcp = true;
- checkValid(IGFS_NAME + ":" + GRID_NAME + "@");
- checkValid(IGFS_NAME + ":" + GRID_NAME + "@127.0.0.1");
- checkValid(IGFS_NAME + ":" + GRID_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
+ checkValid(IGFS_NAME + ":" + IGNITE_INSTANCE_NAME + "@");
+ checkValid(IGFS_NAME + ":" + IGNITE_INSTANCE_NAME + "@127.0.0.1");
+ checkValid(IGFS_NAME + ":" + IGNITE_INSTANCE_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
checkValid(IGFS_NAME + "@");
checkValid(IGFS_NAME + "@127.0.0.1");
checkValid(IGFS_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
- checkValid(":" + GRID_NAME + "@");
- checkValid(":" + GRID_NAME + "@127.0.0.1");
- checkValid(":" + GRID_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
+ checkValid(":" + IGNITE_INSTANCE_NAME + "@");
+ checkValid(":" + IGNITE_INSTANCE_NAME + "@127.0.0.1");
+ checkValid(":" + IGNITE_INSTANCE_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
checkValid("");
checkValid("127.0.0.1");
@@ -147,14 +147,14 @@ public class IgniteHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractT
tcp = false; // Embedded mode:
- checkValid(IGFS_NAME + ":" + GRID_NAME + "@");
- checkValid(IGFS_NAME + ":" + GRID_NAME + "@" + HOST_PORT_UNUSED);
+ checkValid(IGFS_NAME + ":" + IGNITE_INSTANCE_NAME + "@");
+ checkValid(IGFS_NAME + ":" + IGNITE_INSTANCE_NAME + "@" + HOST_PORT_UNUSED);
checkValid(IGFS_NAME + "@");
checkValid(IGFS_NAME + "@" + HOST_PORT_UNUSED);
- checkValid(":" + GRID_NAME + "@");
- checkInvalid(":" + GRID_NAME + "@" + HOST_PORT_UNUSED);
+ checkValid(":" + IGNITE_INSTANCE_NAME + "@");
+ checkInvalid(":" + IGNITE_INSTANCE_NAME + "@" + HOST_PORT_UNUSED);
checkValid("@"); // Embedded mode fails, but remote tcp succeeds.
checkInvalid("@" + HOST_PORT_UNUSED);
@@ -166,21 +166,21 @@ public class IgniteHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractT
* @throws Exception If failed.
*/
public void testHandshakeDefaultIgfs() throws Exception {
- startUp(false/*grid name*/, true/*default igfs*/);
+ startUp(false/*Ignite instance name*/, true/*default igfs*/);
tcp = true;
- checkInvalid(IGFS_NAME + ":" + GRID_NAME + "@");
- checkInvalid(IGFS_NAME + ":" + GRID_NAME + "@127.0.0.1");
- checkInvalid(IGFS_NAME + ":" + GRID_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
+ checkInvalid(IGFS_NAME + ":" + IGNITE_INSTANCE_NAME + "@");
+ checkInvalid(IGFS_NAME + ":" + IGNITE_INSTANCE_NAME + "@127.0.0.1");
+ checkInvalid(IGFS_NAME + ":" + IGNITE_INSTANCE_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
checkInvalid(IGFS_NAME + "@");
checkInvalid(IGFS_NAME + "@127.0.0.1");
checkInvalid(IGFS_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
- checkValid(":" + GRID_NAME + "@");
- checkValid(":" + GRID_NAME + "@127.0.0.1");
- checkValid(":" + GRID_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
+ checkValid(":" + IGNITE_INSTANCE_NAME + "@");
+ checkValid(":" + IGNITE_INSTANCE_NAME + "@127.0.0.1");
+ checkValid(":" + IGNITE_INSTANCE_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
checkValid("");
checkValid("127.0.0.1");
@@ -188,14 +188,14 @@ public class IgniteHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractT
tcp = false; // Embedded mode:
- checkInvalid(IGFS_NAME + ":" + GRID_NAME + "@");
- checkInvalid(IGFS_NAME + ":" + GRID_NAME + "@" + HOST_PORT_UNUSED);
+ checkInvalid(IGFS_NAME + ":" + IGNITE_INSTANCE_NAME + "@");
+ checkInvalid(IGFS_NAME + ":" + IGNITE_INSTANCE_NAME + "@" + HOST_PORT_UNUSED);
checkInvalid(IGFS_NAME + "@");
checkInvalid(IGFS_NAME + "@" + HOST_PORT_UNUSED);
- checkValid(":" + GRID_NAME + "@");
- checkValid(":" + GRID_NAME + "@" + HOST_PORT_UNUSED);
+ checkValid(":" + IGNITE_INSTANCE_NAME + "@");
+ checkValid(":" + IGNITE_INSTANCE_NAME + "@" + HOST_PORT_UNUSED);
checkValid("@"); // NB: in embedded mode this fails, but remote TCP still succeeds.
checkValid("@" + HOST_PORT_UNUSED);
@@ -211,17 +211,17 @@ public class IgniteHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractT
tcp = true;
- checkInvalid(IGFS_NAME + ":" + GRID_NAME + "@");
- checkInvalid(IGFS_NAME + ":" + GRID_NAME + "@127.0.0.1");
- checkInvalid(IGFS_NAME + ":" + GRID_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
+ checkInvalid(IGFS_NAME + ":" + IGNITE_INSTANCE_NAME + "@");
+ checkInvalid(IGFS_NAME + ":" + IGNITE_INSTANCE_NAME + "@127.0.0.1");
+ checkInvalid(IGFS_NAME + ":" + IGNITE_INSTANCE_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
checkInvalid(IGFS_NAME + "@");
checkInvalid(IGFS_NAME + "@127.0.0.1");
checkInvalid(IGFS_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
- checkValid(":" + GRID_NAME + "@");
- checkValid(":" + GRID_NAME + "@127.0.0.1");
- checkValid(":" + GRID_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
+ checkValid(":" + IGNITE_INSTANCE_NAME + "@");
+ checkValid(":" + IGNITE_INSTANCE_NAME + "@127.0.0.1");
+ checkValid(":" + IGNITE_INSTANCE_NAME + "@127.0.0.1:" + DFLT_IPC_PORT);
checkValid("");
checkValid("127.0.0.1");
@@ -229,14 +229,14 @@ public class IgniteHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractT
tcp = false; // Embedded mode:
- checkInvalid(IGFS_NAME + ":" + GRID_NAME + "@");
- checkInvalid(IGFS_NAME + ":" + GRID_NAME + "@" + HOST_PORT_UNUSED);
+ checkInvalid(IGFS_NAME + ":" + IGNITE_INSTANCE_NAME + "@");
+ checkInvalid(IGFS_NAME + ":" + IGNITE_INSTANCE_NAME + "@" + HOST_PORT_UNUSED);
checkInvalid(IGFS_NAME + "@");
checkInvalid(IGFS_NAME + "@" + HOST_PORT_UNUSED);
- checkValid(":" + GRID_NAME + "@");
- checkValid(":" + GRID_NAME + "@" + HOST_PORT_UNUSED);
+ checkValid(":" + IGNITE_INSTANCE_NAME + "@");
+ checkValid(":" + IGNITE_INSTANCE_NAME + "@" + HOST_PORT_UNUSED);
checkValid("@");
checkValid("@" + HOST_PORT_UNUSED);
@@ -245,12 +245,12 @@ public class IgniteHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractT
/**
* Perform startup.
*
- * @param dfltGridName Default Grid name.
+ * @param dfltIgniteInstanceName Default Ignite instance name.
* @param dfltIgfsName Default IGFS name.
* @throws Exception If failed.
*/
- private void startUp(boolean dfltGridName, boolean dfltIgfsName) throws Exception {
- Ignite ignite = G.start(gridConfiguration(dfltGridName, dfltIgfsName));
+ private void startUp(boolean dfltIgniteInstanceName, boolean dfltIgfsName) throws Exception {
+ Ignite ignite = G.start(gridConfiguration(dfltIgniteInstanceName, dfltIgfsName));
IgniteFileSystem igfs = ignite.fileSystem(dfltIgfsName ? null : IGFS_NAME);
@@ -260,13 +260,14 @@ public class IgniteHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractT
/**
* Create Grid configuration.
*
- * @param dfltGridName Default Grid name.
+ * @param dfltIgniteInstanceName Default Ignite instance name.
* @param dfltIgfsName Default IGFS name.
* @return Grid configuration.
* @throws Exception If failed.
*/
- private IgniteConfiguration gridConfiguration(boolean dfltGridName, boolean dfltIgfsName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(dfltGridName ? null : GRID_NAME);
+ private IgniteConfiguration gridConfiguration(boolean dfltIgniteInstanceName, boolean dfltIgfsName)
+ throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(dfltIgniteInstanceName ? null : IGNITE_INSTANCE_NAME);
cfg.setLocalHost("127.0.0.1");
cfg.setConnectorConfiguration(null);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java
index ac2ae68..e9de332 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java
@@ -63,8 +63,8 @@ public class IgniteHadoopFileSystemIpcCacheSelfTest extends IgfsCommonAbstractTe
private static int cnt;
/** {@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 discoSpi = new TcpDiscoverySpi();
discoSpi.setIpFinder(IP_FINDER);
@@ -168,7 +168,7 @@ public class IgniteHadoopFileSystemIpcCacheSelfTest extends IgfsCommonAbstractTe
cache.clear(); // avoid influence of previous tests in the same process.
- String name = "igfs:" + getTestGridName(0) + "@";
+ String name = "igfs:" + getTestIgniteInstanceName(0) + "@";
Configuration cfg = new Configuration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoggerStateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoggerStateSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoggerStateSelfTest.java
index fbf9eda..9eeff33 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoggerStateSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoggerStateSelfTest.java
@@ -116,7 +116,7 @@ public class IgniteHadoopFileSystemLoggerStateSelfTest extends IgfsCommonAbstrac
IgniteConfiguration cfg = new IgniteConfiguration();
- cfg.setGridName("igfs-grid");
+ cfg.setIgniteInstanceName("igfs-grid");
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/igfs/IgniteHadoopFileSystemLoopbackAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackAbstractSelfTest.java
index 4f48078..26fb0fc 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackAbstractSelfTest.java
@@ -39,11 +39,11 @@ public abstract class IgniteHadoopFileSystemLoopbackAbstractSelfTest extends
}
/** {@inheritDoc} */
- @Override protected IgfsIpcEndpointConfiguration primaryIpcEndpointConfiguration(final String gridName) {
+ @Override protected IgfsIpcEndpointConfiguration primaryIpcEndpointConfiguration(final String igniteInstanceName) {
IgfsIpcEndpointConfiguration endpointCfg = new IgfsIpcEndpointConfiguration();
endpointCfg.setType(IgfsIpcEndpointType.TCP);
- endpointCfg.setPort(DFLT_IPC_PORT + getTestGridIndex(gridName));
+ endpointCfg.setPort(DFLT_IPC_PORT + getTestIgniteInstanceIndex(igniteInstanceName));
return endpointCfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackExternalToClientAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackExternalToClientAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackExternalToClientAbstractSelfTest.java
index b3c1681..c2f1166 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackExternalToClientAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemLoopbackExternalToClientAbstractSelfTest.java
@@ -44,7 +44,7 @@ public abstract class IgniteHadoopFileSystemLoopbackExternalToClientAbstractSelf
IgfsIpcEndpointConfiguration endpointCfg = new IgfsIpcEndpointConfiguration();
endpointCfg.setType(IgfsIpcEndpointType.TCP);
- endpointCfg.setPort(DFLT_IPC_PORT + getTestGridIndex(gridName));
+ endpointCfg.setPort(DFLT_IPC_PORT + getTestIgniteInstanceIndex(gridName));
return endpointCfg;
}
@@ -53,7 +53,7 @@ public abstract class IgniteHadoopFileSystemLoopbackExternalToClientAbstractSelf
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- if (getTestGridIndex(gridName) == 0)
+ if (getTestIgniteInstanceIndex(gridName) == 0)
cfg.setClientMode(true);
return cfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest.java
index 52bb6cf..e710b97 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest.java
@@ -105,7 +105,7 @@ public class IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest ext
IgniteConfiguration cfg = new IgniteConfiguration();
- cfg.setGridName("igfs-grid");
+ cfg.setIgniteInstanceName("igfs-grid");
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
@@ -167,7 +167,7 @@ public class IgniteHadoopFileSystemSecondaryFileSystemInitializationSelfTest ext
IgniteConfiguration cfg = new IgniteConfiguration();
- cfg.setGridName("igfs-grid-secondary");
+ cfg.setIgniteInstanceName("igfs-grid-secondary");
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/igfs/IgniteHadoopFileSystemShmemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemAbstractSelfTest.java
index 67b5007..b5cf7be 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemAbstractSelfTest.java
@@ -46,11 +46,11 @@ public abstract class IgniteHadoopFileSystemShmemAbstractSelfTest extends Ignite
}
/** {@inheritDoc} */
- @Override protected IgfsIpcEndpointConfiguration primaryIpcEndpointConfiguration(final String gridName) {
+ @Override protected IgfsIpcEndpointConfiguration primaryIpcEndpointConfiguration(final String igniteInstanceName) {
IgfsIpcEndpointConfiguration endpointCfg = new IgfsIpcEndpointConfiguration();
endpointCfg.setType(IgfsIpcEndpointType.SHMEM);
- endpointCfg.setPort(DFLT_IPC_PORT + getTestGridIndex(gridName));
+ endpointCfg.setPort(DFLT_IPC_PORT + getTestIgniteInstanceIndex(igniteInstanceName));
return endpointCfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalToClientAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalToClientAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalToClientAbstractSelfTest.java
index e87807c..fa64ed7 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalToClientAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemShmemExternalToClientAbstractSelfTest.java
@@ -51,7 +51,7 @@ public abstract class IgniteHadoopFileSystemShmemExternalToClientAbstractSelfTes
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- if (getTestGridIndex(gridName) == 0)
+ if (getTestIgniteInstanceIndex(gridName) == 0)
cfg.setClientMode(true);
return cfg;
@@ -62,7 +62,7 @@ public abstract class IgniteHadoopFileSystemShmemExternalToClientAbstractSelfTes
IgfsIpcEndpointConfiguration endpointCfg = new IgfsIpcEndpointConfiguration();
endpointCfg.setType(IgfsIpcEndpointType.SHMEM);
- endpointCfg.setPort(DFLT_IPC_PORT + getTestGridIndex(gridName));
+ endpointCfg.setPort(DFLT_IPC_PORT + getTestIgniteInstanceIndex(gridName));
return endpointCfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/taskexecutor/external/HadoopExternalTaskExecutionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/taskexecutor/external/HadoopExternalTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/taskexecutor/external/HadoopExternalTaskExecutionSelfTest.java
index 5f64ce7..0afd689 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/taskexecutor/external/HadoopExternalTaskExecutionSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/taskexecutor/external/HadoopExternalTaskExecutionSelfTest.java
@@ -68,8 +68,8 @@ public class HadoopExternalTaskExecutionSelfTest 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(true);
@@ -78,8 +78,8 @@ public class HadoopExternalTaskExecutionSelfTest 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.setMarshaller(new JdkMarshaller());
@@ -111,8 +111,8 @@ public class HadoopExternalTaskExecutionSelfTest extends HadoopAbstractSelfTest
job.setNumReduceTasks(1);
- FileInputFormat.setInputPaths(job, new Path("igfs://:" + getTestGridName(0) + "@/" + testInputFile));
- FileOutputFormat.setOutputPath(job, new Path("igfs://:" + getTestGridName(0) + "@/output"));
+ FileInputFormat.setInputPaths(job, new Path("igfs://:" + getTestIgniteInstanceName(0) + "@/" + testInputFile));
+ FileOutputFormat.setOutputPath(job, new Path("igfs://:" + getTestIgniteInstanceName(0) + "@/output"));
job.setJarByClass(getClass());
@@ -147,8 +147,8 @@ public class HadoopExternalTaskExecutionSelfTest extends HadoopAbstractSelfTest
job.setNumReduceTasks(1);
- FileInputFormat.setInputPaths(job, new Path("igfs://:" + getTestGridName(0) + "@/" + testInputFile));
- FileOutputFormat.setOutputPath(job, new Path("igfs://:" + getTestGridName(0) + "@/output"));
+ FileInputFormat.setInputPaths(job, new Path("igfs://:" + getTestIgniteInstanceName(0) + "@/" + testInputFile));
+ FileOutputFormat.setOutputPath(job, new Path("igfs://:" + getTestIgniteInstanceName(0) + "@/output"));
job.setJarByClass(getClass());
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegionFactory.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegionFactory.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegionFactory.java
index 825abee..1ae357e 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegionFactory.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegionFactory.java
@@ -26,6 +26,7 @@ import org.apache.ignite.IgniteLogger;
import org.apache.ignite.Ignition;
import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
+import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.G;
import org.hibernate.cache.CacheException;
import org.hibernate.cache.spi.CacheDataDescription;
@@ -52,9 +53,9 @@ import static org.hibernate.cache.spi.access.AccessType.NONSTRICT_READ_WRITE;
* Note that before region factory is started you need to start properly configured Ignite node in the same JVM.
* For example to start Ignite node one of loader provided in {@code org.apache.ignite.grid.startup} package can be used.
* <p>
- * Name of grid to be used for region factory must be specified as following Hibernate property:
+ * Name of Ignite instance to be used for region factory must be specified as following Hibernate property:
* <pre name="code" class="brush: xml; gutter: false;">
- * org.apache.ignite.hibernate.grid_name=<grid name>
+ * org.apache.ignite.hibernate.ignite_instance_name=<Ignite instance name>
* </pre>
* Each Hibernate cache region must be associated with some {@link IgniteInternalCache}, by default it is assumed that
* for each cache region there is a {@link IgniteInternalCache} with the same name. Also it is possible to define
@@ -69,9 +70,18 @@ public class HibernateRegionFactory implements RegionFactory {
/** */
private static final long serialVersionUID = 0L;
- /** Hibernate L2 cache grid name property name. */
+ /**
+ * Hibernate L2 cache grid name property name.
+ *
+ * @deprecated Use {@link #IGNITE_INSTANCE_NAME_PROPERTY}.
+ * If {@link #IGNITE_INSTANCE_NAME_PROPERTY} is specified it takes precedence.
+ */
+ @Deprecated
public static final String GRID_NAME_PROPERTY = "org.apache.ignite.hibernate.grid_name";
+ /** Hibernate L2 cache Ignite instance name property name. */
+ public static final String IGNITE_INSTANCE_NAME_PROPERTY = "org.apache.ignite.hibernate.ignite_instance_name";
+
/** Default cache property name. */
public static final String DFLT_CACHE_NAME_PROPERTY = "org.apache.ignite.hibernate.default_cache";
@@ -102,7 +112,10 @@ public class HibernateRegionFactory implements RegionFactory {
/** {@inheritDoc} */
@Override public void start(Settings settings, Properties props) throws CacheException {
String gridCfg = props.getProperty(GRID_CONFIG_PROPERTY);
- String gridName = props.getProperty(GRID_NAME_PROPERTY);
+ String igniteInstanceName = props.getProperty(IGNITE_INSTANCE_NAME_PROPERTY);
+
+ if (igniteInstanceName == null)
+ igniteInstanceName = props.getProperty(GRID_NAME_PROPERTY);
if (gridCfg != null) {
try {
@@ -113,7 +126,7 @@ public class HibernateRegionFactory implements RegionFactory {
}
}
else
- ignite = Ignition.ignite(gridName);
+ ignite = Ignition.ignite(igniteInstanceName);
String accessType = props.getProperty(DFLT_ACCESS_TYPE_PROPERTY, NONSTRICT_READ_WRITE.name());
@@ -147,7 +160,7 @@ public class HibernateRegionFactory implements RegionFactory {
IgniteLogger log = ignite.log().getLogger(HibernateRegionFactory.class);
if (log.isDebugEnabled())
- log.debug("HibernateRegionFactory started [grid=" + gridName + ']');
+ log.debug("HibernateRegionFactory started [igniteInstanceName=" + igniteInstanceName + ']');
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hibernate/src/test/config/factory-cache1.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/test/config/factory-cache1.xml b/modules/hibernate/src/test/config/factory-cache1.xml
index 7f751fb..7a53b1f 100644
--- a/modules/hibernate/src/test/config/factory-cache1.xml
+++ b/modules/hibernate/src/test/config/factory-cache1.xml
@@ -26,7 +26,7 @@
class="org.apache.ignite.cache.store.hibernate.CacheHibernateStoreFactorySelfTest$DummySessionFactory"/>
<bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
- <property name="gridName" value="ignite1"/>
+ <property name="igniteInstanceName" value="ignite1"/>
<property name="cacheConfiguration">
<list>
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java
index 7717c7b..b018d0b 100644
--- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java
+++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java
@@ -45,7 +45,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.hibernate.HibernateRegionFactory.DFLT_ACCESS_TYPE_PROPERTY;
import static org.apache.ignite.cache.hibernate.HibernateRegionFactory.DFLT_CACHE_NAME_PROPERTY;
-import static org.apache.ignite.cache.hibernate.HibernateRegionFactory.GRID_NAME_PROPERTY;
+import static org.apache.ignite.cache.hibernate.HibernateRegionFactory.IGNITE_INSTANCE_NAME_PROPERTY;
import static org.apache.ignite.cache.hibernate.HibernateRegionFactory.REGION_CACHE_PROPERTY;
import static org.hibernate.cfg.AvailableSettings.CACHE_REGION_FACTORY;
import static org.hibernate.cfg.AvailableSettings.GENERATE_STATISTICS;
@@ -99,8 +99,8 @@ public class HibernateL2CacheConfigurationSelfTest extends GridCommonAbstractTes
}
/** {@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 discoSpi = new TcpDiscoverySpi();
@@ -131,10 +131,10 @@ public class HibernateL2CacheConfigurationSelfTest extends GridCommonAbstractTes
return cfg;
}
/**
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @return Hibernate configuration.
*/
- protected Configuration hibernateConfiguration(String gridName) {
+ protected Configuration hibernateConfiguration(String igniteInstanceName) {
Configuration cfg = new Configuration();
cfg.addAnnotatedClass(Entity1.class);
@@ -156,7 +156,7 @@ public class HibernateL2CacheConfigurationSelfTest extends GridCommonAbstractTes
cfg.setProperty(RELEASE_CONNECTIONS, "on_close");
- cfg.setProperty(GRID_NAME_PROPERTY, gridName);
+ cfg.setProperty(IGNITE_INSTANCE_NAME_PROPERTY, igniteInstanceName);
cfg.setProperty(REGION_CACHE_PROPERTY + ENTITY1_NAME, "cache1");
cfg.setProperty(REGION_CACHE_PROPERTY + ENTITY2_NAME, "cache2");
@@ -194,7 +194,7 @@ public class HibernateL2CacheConfigurationSelfTest extends GridCommonAbstractTes
*/
@SuppressWarnings("unchecked")
private void testCacheUsage(int expCache1, int expCache2, int expCache3, int expCacheE3, int expCacheE4) {
- SessionFactory sesFactory = startHibernate(getTestGridName(0));
+ SessionFactory sesFactory = startHibernate(getTestIgniteInstanceName(0));
try {
Session ses = sesFactory.openSession();
@@ -280,11 +280,11 @@ public class HibernateL2CacheConfigurationSelfTest extends GridCommonAbstractTes
}
/**
- * @param gridName Name of the grid providing caches.
+ * @param igniteInstanceName Name of the grid providing caches.
* @return Session factory.
*/
- private SessionFactory startHibernate(String gridName) {
- Configuration cfg = hibernateConfiguration(gridName);
+ private SessionFactory startHibernate(String igniteInstanceName) {
+ Configuration cfg = hibernateConfiguration(igniteInstanceName);
ServiceRegistryBuilder builder = new ServiceRegistryBuilder();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
index 06da1ca..a36a823 100644
--- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
+++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
@@ -61,7 +61,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
import static org.apache.ignite.cache.hibernate.HibernateRegionFactory.DFLT_ACCESS_TYPE_PROPERTY;
-import static org.apache.ignite.cache.hibernate.HibernateRegionFactory.GRID_NAME_PROPERTY;
+import static org.apache.ignite.cache.hibernate.HibernateRegionFactory.IGNITE_INSTANCE_NAME_PROPERTY;
import static org.apache.ignite.cache.hibernate.HibernateRegionFactory.REGION_CACHE_PROPERTY;
import static org.hibernate.cfg.Environment.CACHE_REGION_FACTORY;
import static org.hibernate.cfg.Environment.GENERATE_STATISTICS;
@@ -408,8 +408,8 @@ public class HibernateL2CacheSelfTest 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 discoSpi = new TcpDiscoverySpi();
@@ -476,11 +476,11 @@ public class HibernateL2CacheSelfTest extends GridCommonAbstractTest {
/**
* @param accessType Hibernate L2 cache access type.
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @return Hibernate configuration.
*/
- protected Configuration hibernateConfiguration(org.hibernate.cache.spi.access.AccessType accessType,
- String gridName) {
+ protected Configuration hibernateConfiguration(AccessType accessType,
+ String igniteInstanceName) {
Configuration cfg = new Configuration();
cfg.addAnnotatedClass(Entity.class);
@@ -507,7 +507,7 @@ public class HibernateL2CacheSelfTest extends GridCommonAbstractTest {
cfg.setProperty(RELEASE_CONNECTIONS, "on_close");
- cfg.setProperty(GRID_NAME_PROPERTY, gridName);
+ cfg.setProperty(IGNITE_INSTANCE_NAME_PROPERTY, igniteInstanceName);
// Use the same cache for Entity and Entity2.
cfg.setProperty(REGION_CACHE_PROPERTY + ENTITY2_NAME, ENTITY_NAME);
@@ -1905,20 +1905,20 @@ public class HibernateL2CacheSelfTest extends GridCommonAbstractTest {
* @param accessType Cache access type.
*/
private void createSessionFactories(AccessType accessType) {
- sesFactory1 = startHibernate(accessType, getTestGridName(0));
+ sesFactory1 = startHibernate(accessType, getTestIgniteInstanceName(0));
- sesFactory2 = startHibernate(accessType, getTestGridName(1));
+ sesFactory2 = startHibernate(accessType, getTestIgniteInstanceName(1));
}
/**
* Starts Hibernate.
*
* @param accessType Cache access type.
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @return Session factory.
*/
- private SessionFactory startHibernate(org.hibernate.cache.spi.access.AccessType accessType, String gridName) {
- Configuration cfg = hibernateConfiguration(accessType, gridName);
+ private SessionFactory startHibernate(AccessType accessType, String igniteInstanceName) {
+ Configuration cfg = hibernateConfiguration(accessType, igniteInstanceName);
ServiceRegistryBuilder builder = registryBuilder();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java
index e6117c0..deca893 100644
--- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java
+++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java
@@ -91,8 +91,8 @@ public class HibernateL2CacheTransactionalSelfTest extends HibernateL2CacheSelfT
}
/** {@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.getTransactionConfiguration().setTxManagerFactory(new TestTmFactory());
cfg.getTransactionConfiguration().setUseJtaSynchronization(useJtaSynchronization());
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 4438343..6e75fd2 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -2027,7 +2027,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
}
// TODO https://issues.apache.org/jira/browse/IGNITE-2139
- // registerMBean(gridName, this, GridH2IndexingSpiMBean.class);
+ // registerMBean(igniteInstanceName, this, GridH2IndexingSpiMBean.class);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheAbstractQueryDetailMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheAbstractQueryDetailMetricsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheAbstractQueryDetailMetricsSelfTest.java
index 1b870e4..837de65 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheAbstractQueryDetailMetricsSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheAbstractQueryDetailMetricsSelfTest.java
@@ -91,8 +91,8 @@ public abstract class CacheAbstractQueryDetailMetricsSelfTest extends GridCommon
}
/** {@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/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheAbstractQueryMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheAbstractQueryMetricsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheAbstractQueryMetricsSelfTest.java
index e5845d3..eb3c8d6 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheAbstractQueryMetricsSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheAbstractQueryMetricsSelfTest.java
@@ -71,8 +71,8 @@ public abstract class CacheAbstractQueryMetricsSelfTest extends GridCommonAbstra
}
/** {@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/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheBinaryKeyConcurrentQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheBinaryKeyConcurrentQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheBinaryKeyConcurrentQueryTest.java
index e2de281..4c75140 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheBinaryKeyConcurrentQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheBinaryKeyConcurrentQueryTest.java
@@ -64,8 +64,8 @@ public class CacheBinaryKeyConcurrentQueryTest extends GridCommonAbstractTest {
private static final int KEYS = 1000;
/** {@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)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java
index e6bf22b..b749a13 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java
@@ -48,8 +48,8 @@ public class CacheIndexStreamerTest extends GridCommonAbstractTest {
private final TcpDiscoveryIpFinder ipFinder = 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)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java
index b550b1e..1012f34 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java
@@ -58,8 +58,8 @@ public abstract class CacheOffheapBatchIndexingBaseTest extends GridCommonAbstra
}
/** {@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(false);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryBuildValueTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryBuildValueTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryBuildValueTest.java
index cb574bb..ae80721 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryBuildValueTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryBuildValueTest.java
@@ -47,8 +47,8 @@ public class CacheQueryBuildValueTest 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);
cfg.setMarshaller(null);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryNewClientSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryNewClientSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryNewClientSelfTest.java
index a9f5b51..d330840 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryNewClientSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryNewClientSelfTest.java
@@ -37,8 +37,8 @@ public class CacheQueryNewClientSelfTest 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);
cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(IP_FINDER));
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
index c1e94f0..2c2cf65 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
@@ -73,8 +73,8 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe
private boolean client;
/** {@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)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
index efa9ce5..6989314 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java
@@ -94,8 +94,8 @@ public class CacheScanPartitionQueryFallbackSelfTest extends GridCommonAbstractT
private boolean syncRebalance;
/** {@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.setClientMode(clientMode);
@@ -216,7 +216,7 @@ public class CacheScanPartitionQueryFallbackSelfTest extends GridCommonAbstractT
Thread.sleep(3000);
- info("Will stop grid: " + getTestGridName(id));
+ info("Will stop grid: " + getTestIgniteInstanceName(id));
stopGrid(id);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheSqlQueryValueCopySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheSqlQueryValueCopySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheSqlQueryValueCopySelfTest.java
index 66e7e4a..a067770 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheSqlQueryValueCopySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheSqlQueryValueCopySelfTest.java
@@ -50,10 +50,10 @@ public class CacheSqlQueryValueCopySelfTest extends GridCommonAbstractTest {
private static final int KEYS = 100;
/** {@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 ("client".equals(cfg.getGridName()))
+ if ("client".equals(cfg.getIgniteInstanceName()))
cfg.setClientMode(true);
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java
index ec94b0c..20b947b 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java
@@ -50,13 +50,13 @@ public class ClientReconnectAfterClusterRestartTest extends GridCommonAbstractTe
public static final String CACHE_PARAMS = "PPRB_PARAMS";
/** {@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());
cfg.setIncludeEventTypes(EventType.EVTS_CACHE);
- if (getTestGridName(CLIENT_ID).equals(gridName))
+ if (getTestIgniteInstanceName(CLIENT_ID).equals(igniteInstanceName))
cfg.setClientMode(true);
else {
CacheConfiguration ccfg = getCacheConfiguration();