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/02 11:31:24 UTC
[47/50] [abbrv] ignite git commit: IGNITE-3625: IGFS: "meta" and
"data" caches are now configured inside IGFS bean. This closes #923. This
closes #972.
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
index a98c3a1..9636c7d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
@@ -57,12 +57,6 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
/** Test IP finder. */
private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
- /** Meta-information cache name. */
- private static final String META_CACHE_NAME = "meta";
-
- /** Data cache name. */
- private static final String DATA_CACHE_NAME = "partitioned";
-
/** Groups count for data blocks. */
private static final int DATA_BLOCK_GROUP_CNT = 2;
@@ -95,8 +89,6 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- cfg.setCacheConfiguration(cacheConfiguration(META_CACHE_NAME), cacheConfiguration(DATA_CACHE_NAME));
-
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
discoSpi.setIpFinder(IP_FINDER);
@@ -105,8 +97,8 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setMetaCacheName(META_CACHE_NAME);
- igfsCfg.setDataCacheName(DATA_CACHE_NAME);
+ igfsCfg.setMetaCacheConfiguration(cacheConfiguration("meta"));
+ igfsCfg.setDataCacheConfiguration(cacheConfiguration("data"));
igfsCfg.setBlockSize(IGFS_BLOCK_SIZE);
igfsCfg.setName("igfs");
igfsCfg.setBlockSize(BLOCK_SIZE);
@@ -122,7 +114,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
cacheCfg.setName(cacheName);
- if (META_CACHE_NAME.equals(cacheName))
+ if ("meta".equals(cacheName))
cacheCfg.setCacheMode(REPLICATED);
else {
cacheCfg.setCacheMode(PARTITIONED);
@@ -141,9 +133,9 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
for (int i = 0; i < NODES_CNT; i++) {
- grid(i).cachex(META_CACHE_NAME).clear();
+ grid(i).cachex(grid(i).igfsx("igfs").configuration().getMetaCacheConfiguration().getName()).clear();
- grid(i).cachex(DATA_CACHE_NAME).clear();
+ grid(i).cachex(grid(i).igfsx("igfs").configuration().getDataCacheConfiguration().getName()).clear();
}
}
@@ -200,7 +192,8 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
fut.get(3000);
for (int j = 0; j < NODES_CNT; j++) {
- GridCacheContext<Object, Object> ctx = GridTestUtils.getFieldValue(grid(j).cachex(DATA_CACHE_NAME),
+ GridCacheContext<Object, Object> ctx = GridTestUtils.getFieldValue(
+ grid(j).cachex(grid(j).igfsx("igfs").configuration().getDataCacheConfiguration().getName()),
"ctx");
Collection<IgniteInternalTx> txs = ctx.tm().txs();
@@ -292,7 +285,8 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
fut.get(3000);
for (int j = 0; j < NODES_CNT; j++) {
- GridCacheContext<Object, Object> ctx = GridTestUtils.getFieldValue(grid(j).cachex(DATA_CACHE_NAME),
+ GridCacheContext<Object, Object> ctx = GridTestUtils.getFieldValue(grid(j).cachex(
+ grid(j).igfsx("igfs").configuration().getDataCacheConfiguration().getName()),
"ctx");
Collection<IgniteInternalTx> txs = ctx.tm().txs();
@@ -376,7 +370,8 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
fut.get(3000);
for (int j = 0; j < NODES_CNT; j++) {
- GridCacheContext<Object, Object> ctx = GridTestUtils.getFieldValue(grid(j).cachex(DATA_CACHE_NAME),
+ GridCacheContext<Object, Object> ctx = GridTestUtils.getFieldValue(
+ grid(j).cachex(grid(j).igfsx("igfs").configuration().getDataCacheConfiguration().getName()),
"ctx");
Collection<IgniteInternalTx> txs = ctx.tm().txs();
@@ -482,7 +477,8 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
do {
IgfsBlockKey key = new IgfsBlockKey(info.id(), null, false, block);
- ClusterNode affNode = grid(0).affinity(DATA_CACHE_NAME).mapKeyToNode(key);
+ ClusterNode affNode = grid(0).affinity(grid(0).igfsx("igfs").configuration()
+ .getDataCacheConfiguration().getName()).mapKeyToNode(key);
assertTrue("Failed to find node in affinity [dataMgr=" + loc.nodeIds() +
", nodeId=" + affNode.id() + ", block=" + block + ']', loc.nodeIds().contains(affNode.id()));
@@ -557,7 +553,8 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
IgfsBlockKey key = new IgfsBlockKey(info.id(),
info.fileMap().affinityKey(block * blockSize, false), false, block);
- ClusterNode affNode = grid(0).affinity(DATA_CACHE_NAME).mapKeyToNode(key);
+ ClusterNode affNode = grid(0).affinity(grid(0).igfsx("igfs").configuration()
+ .getDataCacheConfiguration().getName()).mapKeyToNode(key);
assertTrue("Failed to find node in affinity [dataMgr=" + loc.nodeIds() +
", nodeId=" + affNode.id() + ", block=" + block + ']', loc.nodeIds().contains(affNode.id()));
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java
index c376c52..f3b777c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java
@@ -41,8 +41,6 @@ public class IgfsMaxSizeSelfTest extends IgfsCommonAbstractTest {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("dataCache");
- igfsCfg.setMetaCacheName("metaCache");
igfsCfg.setName("test");
if (maxSize > 0)
@@ -67,7 +65,9 @@ public class IgfsMaxSizeSelfTest extends IgfsCommonAbstractTest {
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCacheCfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
- cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+
cfg.setFileSystemConfiguration(igfsCfg);
cfg.setGridName(gridName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
index 01e1a2e..e8f66ad 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
@@ -76,8 +76,6 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- cfg.setCacheConfiguration(cacheConfiguration(META_CACHE_NAME), cacheConfiguration(DATA_CACHE_NAME));
-
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
discoSpi.setIpFinder(IP_FINDER);
@@ -86,8 +84,8 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setMetaCacheName(META_CACHE_NAME);
- igfsCfg.setDataCacheName(DATA_CACHE_NAME);
+ igfsCfg.setMetaCacheConfiguration(cacheConfiguration(META_CACHE_NAME));
+ igfsCfg.setDataCacheConfiguration(cacheConfiguration(DATA_CACHE_NAME));
igfsCfg.setName("igfs");
cfg.setFileSystemConfiguration(igfsCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java
index 8d742fb..b3061c8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java
@@ -120,8 +120,6 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
private IgniteConfiguration primaryConfiguration(int idx) throws Exception {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("dataCache");
- igfsCfg.setMetaCacheName("metaCache");
igfsCfg.setName(IGFS_PRIMARY);
igfsCfg.setBlockSize(PRIMARY_BLOCK_SIZE);
igfsCfg.setDefaultMode(DUAL_SYNC);
@@ -135,7 +133,6 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
- dataCacheCfg.setName("dataCache");
dataCacheCfg.setCacheMode(PARTITIONED);
dataCacheCfg.setNearConfiguration(null);
dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
@@ -145,12 +142,14 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
- metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setNearConfiguration(null);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setGridName("grid-" + idx);
@@ -160,7 +159,6 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
discoSpi.setIpFinder(IP_FINDER);
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg);
cfg.setFileSystemConfiguration(igfsCfg);
cfg.setLocalHost("127.0.0.1");
@@ -177,8 +175,6 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
private void startSecondary() throws Exception {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("dataCache");
- igfsCfg.setMetaCacheName("metaCache");
igfsCfg.setName(IGFS_SECONDARY);
igfsCfg.setBlockSize(SECONDARY_BLOCK_SIZE);
igfsCfg.setDefaultMode(PRIMARY);
@@ -186,7 +182,6 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
- dataCacheCfg.setName("dataCache");
dataCacheCfg.setCacheMode(PARTITIONED);
dataCacheCfg.setNearConfiguration(null);
dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
@@ -196,12 +191,14 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
- metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setNearConfiguration(null);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setGridName("grid-secondary");
@@ -211,7 +208,6 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true));
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg);
cfg.setFileSystemConfiguration(igfsCfg);
cfg.setLocalHost("127.0.0.1");
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java
index 5fcd8dd..c4d7835 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java
@@ -98,8 +98,6 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("partitioned");
- igfsCfg.setMetaCacheName("replicated");
igfsCfg.setName("igfs");
igfsCfg.setBlockSize(512 * 1024);
igfsCfg.setInitializeDefaultPathModes(true);
@@ -114,23 +112,24 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
if (setSecondaryFs)
igfsCfg.setSecondaryFileSystem(igfsSecondary.asSecondary());
- CacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
- cacheCfg.setName("partitioned");
- cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setNearConfiguration(null);
- cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
- cacheCfg.setBackups(0);
- cacheCfg.setAtomicityMode(TRANSACTIONAL);
+ dataCacheCfg.setCacheMode(PARTITIONED);
+ dataCacheCfg.setNearConfiguration(null);
+ dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
+ dataCacheCfg.setBackups(0);
+ dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
- metaCacheCfg.setName("replicated");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setGridName("igfs-grid");
@@ -140,7 +139,6 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true));
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(metaCacheCfg, cacheCfg);
cfg.setFileSystemConfiguration(igfsCfg);
cfg.setLocalHost("127.0.0.1");
@@ -159,8 +157,6 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
private void startUpSecondary() throws Exception {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("partitioned");
- igfsCfg.setMetaCacheName("replicated");
igfsCfg.setName("igfs-secondary");
igfsCfg.setBlockSize(512 * 1024);
igfsCfg.setDefaultMode(PRIMARY);
@@ -170,23 +166,24 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
endpointCfg.setType(IgfsIpcEndpointType.TCP);
endpointCfg.setPort(11500);
- CacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
- cacheCfg.setName("partitioned");
- cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setNearConfiguration(null);
- cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
- cacheCfg.setBackups(0);
- cacheCfg.setAtomicityMode(TRANSACTIONAL);
+ dataCacheCfg.setCacheMode(PARTITIONED);
+ dataCacheCfg.setNearConfiguration(null);
+ dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
+ dataCacheCfg.setBackups(0);
+ dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
- metaCacheCfg.setName("replicated");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setGridName("igfs-grid-secondary");
@@ -196,7 +193,6 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true));
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(metaCacheCfg, cacheCfg);
cfg.setFileSystemConfiguration(igfsCfg);
cfg.setLocalHost("127.0.0.1");
@@ -391,7 +387,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
startUp();
}
catch (IgniteException e) {
- errMsg = e.getCause().getCause().getMessage();
+ errMsg = e.getCause().getMessage();
}
assertTrue(errMsg.startsWith(
@@ -457,7 +453,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
startUp();
}
catch (IgniteException e) {
- errMsg = e.getCause().getCause().getMessage();
+ errMsg = e.getCause().getMessage();
}
assertTrue(errMsg.startsWith(
@@ -602,7 +598,8 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
assert !igfsSecondary.exists(file);
}
- int cacheSize = grid.cachex("partitioned").size();
+ int cacheSize = grid.cachex(grid.igfsx("igfs").configuration().getDataCacheConfiguration()
+ .getName()).size();
if (primaryNotUsed)
assert cacheSize == 0;
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsOneClientNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsOneClientNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsOneClientNodeTest.java
index c5f85bc..0cb797a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsOneClientNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsOneClientNodeTest.java
@@ -37,12 +37,6 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
* Test for igfs with one node in client mode.
*/
public class IgfsOneClientNodeTest extends GridCommonAbstractTest {
- /** Meta-information cache name. */
- private static final String META_CACHE_NAME = "meta";
-
- /** Data cache name. */
- private static final String DATA_CACHE_NAME = null;
-
/** Regular cache name. */
private static final String CACHE_NAME = "cache";
@@ -50,8 +44,7 @@ public class IgfsOneClientNodeTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- cfg.setCacheConfiguration(cacheConfiguration(META_CACHE_NAME), cacheConfiguration(DATA_CACHE_NAME),
- cacheConfiguration(CACHE_NAME));
+ cfg.setCacheConfiguration(cacheConfiguration(CACHE_NAME));
cfg.setClientMode(true);
@@ -61,9 +54,9 @@ public class IgfsOneClientNodeTest extends GridCommonAbstractTest {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setMetaCacheName(META_CACHE_NAME);
- igfsCfg.setDataCacheName(DATA_CACHE_NAME);
igfsCfg.setName("igfs");
+ igfsCfg.setMetaCacheConfiguration(cacheConfiguration(null));
+ igfsCfg.setDataCacheConfiguration(cacheConfiguration(null));
cfg.setFileSystemConfiguration(igfsCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
index c854970..3a735ae 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
@@ -70,12 +70,6 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
/** Test IP finder. */
private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
- /** Meta-information cache name. */
- private static final String META_CACHE_NAME = "replicated";
-
- /** Data cache name. */
- public static final String DATA_CACHE_NAME = "data";
-
/** Random numbers generator. */
protected final SecureRandom rnd = new SecureRandom();
@@ -98,7 +92,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
assert cfgs.length == 1;
- metaCacheName = cfgs[0].getMetaCacheName();
+ metaCacheName = cfgs[0].getMetaCacheConfiguration().getName();
metaCache = ((IgniteKernal)grid).internalCache(metaCacheName);
}
@@ -124,7 +118,6 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- cfg.setCacheConfiguration(cacheConfiguration(META_CACHE_NAME), cacheConfiguration(DATA_CACHE_NAME));
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
@@ -134,8 +127,8 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setMetaCacheName(META_CACHE_NAME);
- igfsCfg.setDataCacheName(DATA_CACHE_NAME);
+ igfsCfg.setMetaCacheConfiguration(cacheConfiguration("meta"));
+ igfsCfg.setDataCacheConfiguration(cacheConfiguration("data"));
igfsCfg.setName("igfs");
cfg.setFileSystemConfiguration(igfsCfg);
@@ -149,7 +142,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
cacheCfg.setName(cacheName);
- if (META_CACHE_NAME.equals(cacheName))
+ if ("meta".equals(cacheName))
cacheCfg.setCacheMode(REPLICATED);
else {
cacheCfg.setCacheMode(PARTITIONED);
@@ -690,14 +683,17 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
public void testDeleteCacheConsistency() throws Exception {
IgfsPath path = new IgfsPath("/someFile");
+ String metaCacheName = grid(0).igfsx("igfs").configuration().getMetaCacheConfiguration().getName();
+ String dataCacheName = grid(0).igfsx("igfs").configuration().getDataCacheConfiguration().getName();
+
try (IgfsOutputStream out = igfs.create(path, true)) {
out.write(new byte[10 * 1024 * 1024]);
}
IgniteUuid fileId = U.field(igfs.info(path), "fileId");
- GridCacheAdapter<IgniteUuid, IgfsEntryInfo> metaCache = ((IgniteKernal)grid(0)).internalCache(META_CACHE_NAME);
- GridCacheAdapter<IgfsBlockKey, byte[]> dataCache = ((IgniteKernal)grid(0)).internalCache(DATA_CACHE_NAME);
+ GridCacheAdapter<IgniteUuid, IgfsEntryInfo> metaCache = ((IgniteKernal)grid(0)).internalCache(metaCacheName);
+ GridCacheAdapter<IgfsBlockKey, byte[]> dataCache = ((IgniteKernal)grid(0)).internalCache(dataCacheName);
IgfsEntryInfo info = metaCache.get(fileId);
@@ -785,7 +781,8 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
@Override public boolean apply() {
int metaSize = 0;
- for (Object metaId : grid(0).cachex(igfs.configuration().getMetaCacheName()).keySet()) {
+ for (Object metaId : grid(0).cachex(igfs.configuration().getMetaCacheConfiguration().getName())
+ .keySet()) {
if (!IgfsUtils.isRootOrTrashId((IgniteUuid)metaId))
metaSize++;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
index 28ec1da..a31a81a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
@@ -24,8 +24,8 @@ import org.apache.ignite.configuration.FileSystemConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper;
import org.apache.ignite.igfs.IgfsIpcEndpointConfiguration;
+import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper;
-import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.G;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
@@ -46,7 +46,7 @@ import static org.apache.ignite.igfs.IgfsMode.PROXY;
* Tests for node validation logic in {@link IgfsProcessor}.
* <p>
* Tests starting with "testLocal" are checking
- * {@link IgfsProcessor#validateLocalIgfsConfigurations(org.apache.ignite.configuration.FileSystemConfiguration[])}.
+ * {@link IgfsUtils#validateLocalIgfsConfigurations(org.apache.ignite.configuration.IgniteConfiguration)}.
* <p>
* Tests starting with "testRemote" are checking {@link IgfsProcessor#checkIgfsOnRemoteNode(org.apache.ignite.cluster.ClusterNode)}.
*/
@@ -57,18 +57,6 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
/** Grid #1 config. */
private IgniteConfiguration g1Cfg;
- /** Data cache 1 name. */
- private static final String dataCache1Name = "dataCache1";
-
- /** Data cache 2 name. */
- private static final String dataCache2Name = "dataCache2";
-
- /** Meta cache 1 name. */
- private static final String metaCache1Name = "metaCache1";
-
- /** Meta cache 2 name. */
- private static final String metaCache2Name = "metaCache2";
-
/** First IGFS config in grid #1. */
private FileSystemConfiguration g1IgfsCfg1 = new FileSystemConfiguration();
@@ -91,12 +79,8 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
cfg.setDiscoverySpi(discoSpi);
g1IgfsCfg1.setName("g1IgfsCfg1");
- g1IgfsCfg1.setDataCacheName(dataCache1Name);
- g1IgfsCfg1.setMetaCacheName(metaCache1Name);
g1IgfsCfg2.setName("g1IgfsCfg2");
- g1IgfsCfg2.setDataCacheName(dataCache2Name);
- g1IgfsCfg2.setMetaCacheName(metaCache2Name);
cfg.setFileSystemConfiguration(g1IgfsCfg1, g1IgfsCfg2);
@@ -115,7 +99,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
*
* @param first the first array of elements to concatenate.
* @param second the second array of elements to concatenate.
- * @param cls
+ * @param cls Class of elements.
* @return Concatenated array.
*/
private <T> T[] concat(T[] first, T[] second, Class<?> cls) {
@@ -127,48 +111,18 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
return res.toArray((T[]) Array.newInstance(cls, res.size()));
}
-
- /**
- * @throws Exception If failed.
- */
- public void testLocalIfNoCacheIsConfigured() throws Exception {
- checkGridStartFails(g1Cfg, "Data cache is not configured locally for IGFS", true);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testLocalIfNoDataCacheIsConfigured() throws Exception {
- CacheConfiguration cc = defaultCacheConfiguration();
-
- cc.setName("someName");
-
- g1Cfg.setCacheConfiguration(cc);
-
- checkGridStartFails(g1Cfg, "Data cache is not configured locally for IGFS", true);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testLocalIfNoMetadataCacheIsConfigured() throws Exception {
- CacheConfiguration cc = defaultCacheConfiguration();
-
- cc.setName(dataCache1Name);
-
- g1Cfg.setCacheConfiguration(cc);
-
- checkGridStartFails(g1Cfg, "Metadata cache is not configured locally for IGFS", true);
- }
-
/**
* @throws Exception If failed.
*/
public void testLocalIfAffinityMapperIsWrongClass() throws Exception {
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
- for (CacheConfiguration cc : g1Cfg.getCacheConfiguration())
- cc.setAffinityMapper(new GridCacheDefaultAffinityKeyMapper());
+ for (FileSystemConfiguration igfsCfg : g1Cfg.getFileSystemConfiguration()) {
+ igfsCfg.setDataCacheConfiguration(dataCache(1024));
+ igfsCfg.setMetaCacheConfiguration(metaCache());
+
+ igfsCfg.getMetaCacheConfiguration().setAffinityMapper(new GridCacheDefaultAffinityKeyMapper());
+ igfsCfg.getDataCacheConfiguration().setAffinityMapper(new GridCacheDefaultAffinityKeyMapper());
+ }
checkGridStartFails(g1Cfg, "Invalid IGFS data cache configuration (key affinity mapper class should be", true);
}
@@ -176,9 +130,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testLocalIfIgfsConfigsHaveDifferentNames() throws Exception {
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
-
+ public void testLocalIfIgfsConfigsHaveDuplicatedNames() throws Exception {
String igfsCfgName = "igfs-cfg";
g1IgfsCfg1.setName(igfsCfgName);
@@ -191,11 +143,8 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
* @throws Exception If failed.
*/
public void testLocalIfQueryIndexingEnabledForDataCache() throws Exception {
- CacheConfiguration[] dataCaches = dataCaches(1024);
-
- dataCaches[0].setIndexedTypes(Integer.class, String.class);
-
- g1Cfg.setCacheConfiguration(concat(dataCaches, metaCaches(), CacheConfiguration.class));
+ g1IgfsCfg1.setDataCacheConfiguration(dataCache(1024));
+ g1IgfsCfg1.getDataCacheConfiguration().setIndexedTypes(Integer.class, String.class);
checkGridStartFails(g1Cfg, "IGFS data cache cannot start with enabled query indexing", true);
}
@@ -204,11 +153,9 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
* @throws Exception If failed.
*/
public void testLocalIfQueryIndexingEnabledForMetaCache() throws Exception {
- CacheConfiguration[] metaCaches = metaCaches();
-
- metaCaches[0].setIndexedTypes(Integer.class, String.class);
+ g1IgfsCfg1.setMetaCacheConfiguration(metaCache());
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches, CacheConfiguration.class));
+ g1IgfsCfg1.getMetaCacheConfiguration().setIndexedTypes(Integer.class, String.class);
checkGridStartFails(g1Cfg, "IGFS metadata cache cannot start with enabled query indexing", true);
}
@@ -218,8 +165,6 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
*/
@SuppressWarnings("NullableProblems")
public void testLocalNullIgfsNameIsSupported() throws Exception {
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
-
g1IgfsCfg1.setName(null);
assertFalse(G.start(g1Cfg).cluster().nodes().isEmpty());
@@ -229,8 +174,6 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
* @throws Exception If failed.
*/
public void testLocalIfNonPrimaryModeAndHadoopFileSystemUriIsNull() throws Exception {
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
-
g1IgfsCfg2.setDefaultMode(PROXY);
checkGridStartFails(g1Cfg, "secondaryFileSystem cannot be null when mode is not PRIMARY", true);
@@ -239,42 +182,9 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testLocalIfMetaCacheNameEquals() throws Exception {
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
-
- g1IgfsCfg1.setDataCacheName(dataCache1Name);
- g1IgfsCfg1.setMetaCacheName(metaCache1Name);
-
- g1IgfsCfg2.setDataCacheName(dataCache2Name);
- g1IgfsCfg2.setMetaCacheName(metaCache1Name);
-
- checkGridStartFails(g1Cfg, "Meta cache names should be different for different IGFS instances", true);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testLocalIfDataCacheNameEquals() throws Exception {
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
-
- g1IgfsCfg1.setDataCacheName(dataCache1Name);
- g1IgfsCfg1.setMetaCacheName(metaCache1Name);
-
- g1IgfsCfg2.setDataCacheName(dataCache1Name);
- g1IgfsCfg2.setMetaCacheName(metaCache2Name);
-
- checkGridStartFails(g1Cfg, "Data cache names should be different for different IGFS instances", true);
- }
-
- /**
- * @throws Exception If failed.
- */
public void testRemoteIfDataBlockSizeDiffers() throws Exception {
IgniteConfiguration g2Cfg = getConfiguration("g2");
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
- g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
-
FileSystemConfiguration g2IgfsCfg1 = new FileSystemConfiguration(g1IgfsCfg1);
g2IgfsCfg1.setBlockSize(g2IgfsCfg1.getBlockSize() + 100);
@@ -292,11 +202,11 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
public void testRemoteIfAffinityMapperGroupSizeDiffers() throws Exception {
IgniteConfiguration g2Cfg = getConfiguration("g2");
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
- g2Cfg.setCacheConfiguration(concat(dataCaches(4021), metaCaches(), CacheConfiguration.class));
-
G.start(g1Cfg);
+ for (FileSystemConfiguration igfsCfg : g2Cfg.getFileSystemConfiguration())
+ igfsCfg.setDataCacheConfiguration(dataCache(1000));
+
checkGridStartFails(g2Cfg, "Affinity mapper group size should be the same on all nodes in grid for IGFS",
false);
}
@@ -304,104 +214,6 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testRemoteIfMetaCacheNameDiffers() throws Exception {
- IgniteConfiguration g2Cfg = getConfiguration("g2");
-
- FileSystemConfiguration g2IgfsCfg1 = new FileSystemConfiguration(g1IgfsCfg1);
- FileSystemConfiguration g2IgfsCfg2 = new FileSystemConfiguration(g1IgfsCfg2);
-
- g2IgfsCfg1.setMetaCacheName("g2MetaCache1");
- g2IgfsCfg2.setMetaCacheName("g2MetaCache2");
-
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
- g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches("g2MetaCache1", "g2MetaCache2"),
- CacheConfiguration.class));
-
- g2Cfg.setFileSystemConfiguration(g2IgfsCfg1, g2IgfsCfg2);
-
- G.start(g1Cfg);
-
- checkGridStartFails(g2Cfg, "Meta cache name should be the same on all nodes in grid for IGFS", false);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testRemoteIfMetaCacheNameEquals() throws Exception {
- IgniteConfiguration g2Cfg = getConfiguration("g2");
-
- FileSystemConfiguration g2IgfsCfg1 = new FileSystemConfiguration(g1IgfsCfg1);
- FileSystemConfiguration g2IgfsCfg2 = new FileSystemConfiguration(g1IgfsCfg2);
-
- g2IgfsCfg1.setName("g2IgfsCfg1");
- g2IgfsCfg2.setName("g2IgfsCfg2");
-
- g2IgfsCfg1.setDataCacheName("g2DataCache1");
- g2IgfsCfg2.setDataCacheName("g2DataCache2");
-
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
- g2Cfg.setCacheConfiguration(concat(dataCaches(1024, "g2DataCache1", "g2DataCache2"), metaCaches(),
- CacheConfiguration.class));
-
- g2Cfg.setFileSystemConfiguration(g2IgfsCfg1, g2IgfsCfg2);
-
- G.start(g1Cfg);
-
- checkGridStartFails(g2Cfg, "Meta cache names should be different for different IGFS instances", false);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testRemoteIfDataCacheNameDiffers() throws Exception {
- IgniteConfiguration g2Cfg = getConfiguration("g2");
-
- FileSystemConfiguration g2IgfsCfg1 = new FileSystemConfiguration(g1IgfsCfg1);
- FileSystemConfiguration g2IgfsCfg2 = new FileSystemConfiguration(g1IgfsCfg2);
-
- g2IgfsCfg1.setDataCacheName("g2DataCache1");
- g2IgfsCfg2.setDataCacheName("g2DataCache2");
-
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
- g2Cfg.setCacheConfiguration(concat(dataCaches(1024, "g2DataCache1", "g2DataCache2"), metaCaches(),
- CacheConfiguration.class));
-
- g2Cfg.setFileSystemConfiguration(g2IgfsCfg1, g2IgfsCfg2);
-
- G.start(g1Cfg);
-
- checkGridStartFails(g2Cfg, "Data cache name should be the same on all nodes in grid for IGFS", false);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testRemoteIfDataCacheNameEquals() throws Exception {
- IgniteConfiguration g2Cfg = getConfiguration("g2");
-
- FileSystemConfiguration g2IgfsCfg1 = new FileSystemConfiguration(g1IgfsCfg1);
- FileSystemConfiguration g2IgfsCfg2 = new FileSystemConfiguration(g1IgfsCfg2);
-
- g2IgfsCfg1.setName("g2IgfsCfg1");
- g2IgfsCfg2.setName("g2IgfsCfg2");
-
- g2IgfsCfg1.setMetaCacheName("g2MetaCache1");
- g2IgfsCfg2.setMetaCacheName("g2MetaCache2");
-
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
- g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches("g2MetaCache1", "g2MetaCache2"),
- CacheConfiguration.class));
-
- g2Cfg.setFileSystemConfiguration(g2IgfsCfg1, g2IgfsCfg2);
-
- G.start(g1Cfg);
-
- checkGridStartFails(g2Cfg, "Data cache names should be different for different IGFS instances", false);
- }
-
- /**
- * @throws Exception If failed.
- */
public void testRemoteIfDefaultModeDiffers() throws Exception {
IgniteConfiguration g2Cfg = getConfiguration("g2");
@@ -414,9 +226,6 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
g2IgfsCfg1.setDefaultMode(DUAL_SYNC);
g2IgfsCfg2.setDefaultMode(DUAL_SYNC);
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
- g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
-
g2Cfg.setFileSystemConfiguration(g2IgfsCfg1, g2IgfsCfg2);
G.start(g1Cfg);
@@ -436,9 +245,6 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
g2IgfsCfg1.setPathModes(Collections.singletonMap("/somePath", DUAL_SYNC));
g2IgfsCfg2.setPathModes(Collections.singletonMap("/somePath", DUAL_SYNC));
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
- g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
-
g2Cfg.setFileSystemConfiguration(g2IgfsCfg1, g2IgfsCfg2);
G.start(g1Cfg);
@@ -450,21 +256,49 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
* @throws Exception If failed.
*/
public void testZeroEndpointTcpPort() throws Exception {
- checkIvalidPort(0);
+ checkInvalidPort(0);
}
/**
* @throws Exception If failed.
*/
public void testNegativeEndpointTcpPort() throws Exception {
- checkIvalidPort(-1);
+ checkInvalidPort(-1);
}
/**
* @throws Exception If failed.
*/
public void testTooBigEndpointTcpPort() throws Exception {
- checkIvalidPort(65536);
+ checkInvalidPort(65536);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testPreConfiguredCache() throws Exception {
+ FileSystemConfiguration igfsCfg1 = new FileSystemConfiguration(g1IgfsCfg1);
+ igfsCfg1.setName("igfs");
+
+ g1Cfg.setFileSystemConfiguration(igfsCfg1);
+
+ CacheConfiguration ccfgData = dataCache(1024);
+ ccfgData.setRebalanceTimeout(10001);
+
+ CacheConfiguration ccfgMeta = metaCache();
+ ccfgMeta.setRebalanceTimeout(10002);
+
+ igfsCfg1.setDataCacheConfiguration(ccfgData);
+ igfsCfg1.setMetaCacheConfiguration(ccfgMeta);
+
+ IgniteEx g = (IgniteEx)G.start(g1Cfg);
+
+ assertEquals(10001,
+ g.cachex(g.igfsx("igfs").configuration().getDataCacheConfiguration().getName())
+ .configuration().getRebalanceTimeout());
+ assertEquals(10002,
+ g.cachex(g.igfsx("igfs").configuration().getMetaCacheConfiguration().getName())
+ .configuration().getRebalanceTimeout());
}
/**
@@ -473,9 +307,8 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
* @param port Port.
* @throws Exception If failed.
*/
- private void checkIvalidPort(int port) throws Exception {
+ private void checkInvalidPort(int port) throws Exception {
final String failMsg = "IGFS endpoint TCP port is out of range";
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
final String igfsCfgName = "igfs-cfg";
final IgfsIpcEndpointConfiguration igfsEndpointCfg = new IgfsIpcEndpointConfiguration();
@@ -491,7 +324,6 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
*/
public void testInvalidEndpointThreadCount() throws Exception {
final String failMsg = "IGFS endpoint thread count must be positive";
- g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
final String igfsCfgName = "igfs-cfg";
final IgfsIpcEndpointConfiguration igfsEndpointCfg = new IgfsIpcEndpointConfiguration();
@@ -520,9 +352,10 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
}
catch (IgniteException e) {
if (testLoc) {
- if ("Failed to start processor: GridProcessorAdapter []".equals(e.getMessage()) &&
+ if (e.getMessage().contains(excMsgSnippet)
+ || ("Failed to start processor: GridProcessorAdapter []".equals(e.getMessage()) &&
(e.getCause().getMessage().contains(excMsgSnippet) ||
- e.getCause().getCause().getMessage().contains(excMsgSnippet)))
+ e.getCause().getCause().getMessage().contains(excMsgSnippet))))
return; // Expected exception.
}
else if (e.getMessage().contains(excMsgSnippet))
@@ -536,51 +369,26 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
/**
* @param grpSize Group size to use in {@link org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper}.
- * @param cacheNames 2 Optional caches names.
- * @return 2 preconfigured data caches.
+ * @return 2 preconfigured data cache.
*/
- private CacheConfiguration[] dataCaches(int grpSize, String... cacheNames) {
- assertTrue(F.isEmpty(cacheNames) || cacheNames.length == 2);
-
- if (F.isEmpty(cacheNames))
- cacheNames = new String[] {dataCache1Name, dataCache2Name};
+ private CacheConfiguration dataCache(int grpSize) {
- CacheConfiguration[] res = new CacheConfiguration[cacheNames.length];
+ CacheConfiguration dataCache = defaultCacheConfiguration();
- for (int i = 0; i < cacheNames.length; i++) {
- CacheConfiguration dataCache = defaultCacheConfiguration();
+ dataCache.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(grpSize));
+ dataCache.setAtomicityMode(TRANSACTIONAL);
- dataCache.setName(cacheNames[i]);
- dataCache.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(grpSize));
- dataCache.setAtomicityMode(TRANSACTIONAL);
-
- res[i] = dataCache;
- }
-
- return res;
+ return dataCache;
}
/**
- * @param cacheNames 2 Optional caches names.
- * @return 2 preconfigured meta caches.
+ * @return preconfigured meta cache.
*/
- private CacheConfiguration[] metaCaches(String... cacheNames) {
- assertTrue(F.isEmpty(cacheNames) || cacheNames.length == 2);
-
- if (F.isEmpty(cacheNames))
- cacheNames = new String[] {metaCache1Name, metaCache2Name};
+ private CacheConfiguration metaCache() {
+ CacheConfiguration metaCache = defaultCacheConfiguration();
- CacheConfiguration[] res = new CacheConfiguration[cacheNames.length];
-
- for (int i = 0; i < cacheNames.length; i++) {
- CacheConfiguration metaCache = defaultCacheConfiguration();
-
- metaCache.setName(cacheNames[i]);
- metaCache.setAtomicityMode(TRANSACTIONAL);
-
- res[i] = metaCache;
- }
+ metaCache.setAtomicityMode(TRANSACTIONAL);
- return res;
+ return metaCache;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemInjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemInjectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemInjectionSelfTest.java
index d4187cb..c5df409 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemInjectionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemInjectionSelfTest.java
@@ -66,28 +66,26 @@ public class IgfsSecondaryFileSystemInjectionSelfTest extends GridCommonAbstract
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("dataCache");
- igfsCfg.setMetaCacheName("metaCache");
igfsCfg.setName(IGFS_NAME);
igfsCfg.setDefaultMode(IgfsMode.DUAL_SYNC);
igfsCfg.setSecondaryFileSystem(secondary);
CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
- dataCacheCfg.setName("dataCache");
dataCacheCfg.setCacheMode(PARTITIONED);
dataCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
- metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+
cfg.setFileSystemConfiguration(igfsCfg);
- cfg.setCacheConfiguration(metaCacheCfg, dataCacheCfg);
return cfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
index e58d503..1b74909 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
@@ -240,11 +240,24 @@ public abstract class IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest e
FileSystemConfiguration igfsConfiguration = new FileSystemConfiguration();
- igfsConfiguration.setDataCacheName(dataCacheName);
- igfsConfiguration.setMetaCacheName(metaCacheName);
igfsConfiguration.setName("igfs" + UUID.randomUUID());
igfsConfiguration.setManagementPort(mgmtPort.getAndIncrement());
+ CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
+
+ dataCacheCfg.setCacheMode(CacheMode.PARTITIONED);
+ dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
+ dataCacheCfg.setBackups(0);
+ dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
+
+ CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+
+ metaCacheCfg.setCacheMode(CacheMode.REPLICATED);
+ metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
+
+ igfsConfiguration.setMetaCacheConfiguration(metaCacheCfg);
+ igfsConfiguration.setDataCacheConfiguration(dataCacheCfg);
+
if (endPntCfg != null)
igfsConfiguration.setIpcEndpointConfiguration(endPntCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
index 266945f..7a1ccef 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
@@ -72,14 +72,8 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
/** Block size. */
private static final int BLOCK_SIZE = 384;
- /** Cache name. */
- private static final String DATA_CACHE_NAME = "dataCache";
-
- /** Cache name. */
- private static final String META_CACHE_NAME = "metaCache";
-
/** IGFS name. */
- private static final String IGFS_NAME = "igfs";
+ private static final String IGFS_NAME = "test";
/** IP finder. */
private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
@@ -120,8 +114,6 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName(DATA_CACHE_NAME);
- igfsCfg.setMetaCacheName(META_CACHE_NAME);
igfsCfg.setName(IGFS_NAME);
igfsCfg.setBlockSize(BLOCK_SIZE);
igfsCfg.setFragmentizerEnabled(false);
@@ -131,7 +123,6 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
CacheConfiguration dataCfg = defaultCacheConfiguration();
- dataCfg.setName(DATA_CACHE_NAME);
dataCfg.setCacheMode(cacheMode);
if (cacheMode == PARTITIONED) {
@@ -148,19 +139,20 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
CacheConfiguration metaCfg = defaultCacheConfiguration();
- metaCfg.setName(META_CACHE_NAME);
metaCfg.setCacheMode(REPLICATED);
metaCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
metaCfg.setRebalanceMode(SYNC);
metaCfg.setAtomicityMode(TRANSACTIONAL);
+ igfsCfg.setMetaCacheConfiguration(metaCfg);
+ igfsCfg.setDataCacheConfiguration(dataCfg);
+
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
discoSpi.setIpFinder(IP_FINDER);
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(metaCfg, dataCfg);
cfg.setFileSystemConfiguration(igfsCfg);
return cfg;
@@ -284,7 +276,8 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
for (int i = 0; i < GRID_CNT; i++) {
IgniteEx g = grid(i);
- IgniteInternalCache cache = g.cachex(DATA_CACHE_NAME).cache();
+ IgniteInternalCache cache = g.cachex(g.igfsx(IGFS_NAME).configuration().getDataCacheConfiguration()
+ .getName()).cache();
assert cache.isIgfsDataCache();
}
@@ -547,7 +540,8 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
Collection<UUID> ids = new HashSet<>();
for (ClusterNode node : grid.cluster().nodes()) {
- if (grid.affinity(DATA_CACHE_NAME).isPrimaryOrBackup(node, key))
+ if (grid.affinity(grid.igfsx(IGFS_NAME).configuration().getDataCacheConfiguration().getName())
+ .isPrimaryOrBackup(node, key))
ids.add(node.id());
}
@@ -572,8 +566,9 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
* @return Data cache.
*/
private GridCacheAdapter<IgfsBlockKey, byte[]> cache(UUID nodeId) {
- return (GridCacheAdapter<IgfsBlockKey, byte[]>)((IgniteEx)G.ignite(nodeId)).cachex(DATA_CACHE_NAME)
- .<IgfsBlockKey, byte[]>cache();
+ IgniteEx g = (IgniteEx)G.ignite(nodeId);
+ return (GridCacheAdapter<IgfsBlockKey, byte[]>)g.cachex(g.igfsx(IGFS_NAME).configuration()
+ .getDataCacheConfiguration().getName()).<IgfsBlockKey, byte[]>cache();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java
index eff44f2..9be3814 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStartCacheTest.java
@@ -24,6 +24,7 @@ import org.apache.ignite.configuration.FileSystemConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper;
import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
import org.apache.ignite.internal.util.typedef.G;
@@ -67,15 +68,12 @@ public class IgfsStartCacheTest extends IgfsCommonAbstractTest {
if (igfs) {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("dataCache");
- igfsCfg.setMetaCacheName("metaCache");
igfsCfg.setName("igfs");
igfsCfg.setDefaultMode(PRIMARY);
igfsCfg.setFragmentizerEnabled(false);
CacheConfiguration dataCacheCfg = new CacheConfiguration();
- dataCacheCfg.setName("dataCache");
dataCacheCfg.setCacheMode(PARTITIONED);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
dataCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
@@ -83,12 +81,13 @@ public class IgfsStartCacheTest extends IgfsCommonAbstractTest {
CacheConfiguration metaCacheCfg = new CacheConfiguration();
- metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
metaCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
- cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+
cfg.setFileSystemConfiguration(igfsCfg);
}
@@ -110,11 +109,14 @@ public class IgfsStartCacheTest extends IgfsCommonAbstractTest {
public void testCacheStart() throws Exception {
Ignite g0 = G.start(config(true, 0));
- checkIgfsCaches(g0);
+ String dataCacheName = ((IgniteEx)g0).igfsx("igfs").configuration().getDataCacheConfiguration().getName();
+ String metaCacheName = ((IgniteEx)g0).igfsx("igfs").configuration().getMetaCacheConfiguration().getName();
+
+ checkIgfsCaches(g0, dataCacheName, metaCacheName);
Ignite g1 = G.start(config(false, 1));
- checkIgfsCaches(g1);
+ checkIgfsCaches(g1, dataCacheName, metaCacheName);
IgniteFileSystem igfs = g0.fileSystem("igfs");
@@ -130,11 +132,13 @@ public class IgfsStartCacheTest extends IgfsCommonAbstractTest {
/**
* @param ignite Ignite.
+ * @param dataCacheName Data cache name.
+ * @param metaCacheName Meta cache name.
*/
- private void checkIgfsCaches(final Ignite ignite) {
+ private void checkIgfsCaches(final Ignite ignite, final String dataCacheName, final String metaCacheName) {
GridTestUtils.assertThrows(log(), new Callable<Object>() {
@Override public Object call() throws Exception {
- ignite.cache("dataCache");
+ ignite.cache(dataCacheName);
return null;
}
@@ -142,14 +146,14 @@ public class IgfsStartCacheTest extends IgfsCommonAbstractTest {
GridTestUtils.assertThrows(log(), new Callable<Object>() {
@Override public Object call() throws Exception {
- ignite.cache("metaCache");
+ ignite.cache(metaCacheName);
return null;
}
}, IllegalStateException.class, null);
- checkCache(((IgniteKernal)ignite).internalCache("dataCache"));
- checkCache(((IgniteKernal)ignite).internalCache("metaCache"));
+ checkCache(((IgniteKernal)ignite).internalCache(dataCacheName));
+ checkCache(((IgniteKernal)ignite).internalCache(metaCacheName));
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
index 8c6cf57..9c735f5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.processors.igfs;
-import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteFileSystem;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
@@ -32,7 +31,6 @@ import org.apache.ignite.igfs.IgfsOutputStream;
import org.apache.ignite.igfs.IgfsPath;
import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
-import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
import org.apache.ignite.internal.util.typedef.CAX;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -67,12 +65,6 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
/** Test IP finder. */
private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
- /** Meta-information cache name. */
- private static final String META_CACHE_NAME = "replicated";
-
- /** Data cache name. */
- public static final String DATA_CACHE_NAME = "data";
-
/** Group size. */
public static final int CFG_GRP_SIZE = 128;
@@ -124,7 +116,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
IgniteConfiguration cfg = super.getConfiguration(gridName);
cfg.setLateAffinityAssignment(false);
- cfg.setCacheConfiguration(cacheConfiguration(META_CACHE_NAME), cacheConfiguration(DATA_CACHE_NAME));
+ cfg.setCacheConfiguration();
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
@@ -134,8 +126,8 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setMetaCacheName(META_CACHE_NAME);
- igfsCfg.setDataCacheName(DATA_CACHE_NAME);
+ igfsCfg.setMetaCacheConfiguration(cacheConfiguration("meta"));
+ igfsCfg.setDataCacheConfiguration(cacheConfiguration("data"));
igfsCfg.setName("igfs");
igfsCfg.setBlockSize(CFG_BLOCK_SIZE);
igfsCfg.setFragmentizerEnabled(true);
@@ -151,7 +143,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
cacheCfg.setName(cacheName);
- if (META_CACHE_NAME.equals(cacheName))
+ if ("meta".equals(cacheName))
cacheCfg.setCacheMode(REPLICATED);
else {
cacheCfg.setCacheMode(PARTITIONED);
@@ -168,24 +160,6 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
}
/**
- * Test IGFS construction.
- *
- * @throws IgniteCheckedException In case of exception.
- */
- public void testConfiguration() throws IgniteCheckedException {
- IgniteInternalCache metaCache = getFieldValue(fs, "meta", "metaCache");
- IgniteInternalCache dataCache = getFieldValue(fs, "data", "dataCache");
-
- assertNotNull(metaCache);
- assertEquals(META_CACHE_NAME, metaCache.name());
- assertEquals(REPLICATED, metaCache.configuration().getCacheMode());
-
- assertNotNull(dataCache);
- assertEquals(DATA_CACHE_NAME, dataCache.name());
- assertEquals(PARTITIONED, dataCache.configuration().getCacheMode());
- }
-
- /**
* Test file creation.
*
* @throws Exception In case of exception.
@@ -215,7 +189,8 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
while (true) {
affKey = new IgniteUuid(uuid, idx);
- if (grid(0).affinity(DATA_CACHE_NAME).mapKeyToNode(affKey).id().equals(grid(0).localNode().id()))
+ if (grid(0).affinity(grid(0).igfsx("igfs").configuration().getDataCacheConfiguration()
+ .getName()).mapKeyToNode(affKey).id().equals(grid(0).localNode().id()))
break;
idx++;
@@ -242,6 +217,9 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
/** @throws Exception If failed. */
public void testCreateFileFragmented() throws Exception {
IgfsEx impl = (IgfsEx)grid(0).fileSystem("igfs");
+ String metaCacheName = grid(0).igfsx("igfs").configuration().getMetaCacheConfiguration().getName();
+ final String dataCacheName = grid(0).igfsx("igfs").configuration().getDataCacheConfiguration()
+ .getName();
IgfsFragmentizerManager fragmentizer = impl.context().fragmentizer();
@@ -276,7 +254,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
// After this we should have first two block colocated with grid 0 and last block colocated with grid 1.
IgfsFileImpl fileImpl = (IgfsFileImpl)fs.info(path);
- GridCacheAdapter<Object, Object> metaCache = ((IgniteKernal)grid(0)).internalCache(META_CACHE_NAME);
+ GridCacheAdapter<Object, Object> metaCache = ((IgniteKernal)grid(0)).internalCache(metaCacheName);
IgfsEntryInfo fileInfo = (IgfsEntryInfo)metaCache.get(fileImpl.fileId());
@@ -311,7 +289,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
boolean hasData = false;
for (int i = 0; i < NODES_CNT; i++)
- hasData |= !grid(i).cachex(DATA_CACHE_NAME).isEmpty();
+ hasData |= !grid(i).cachex(dataCacheName).isEmpty();
assertTrue(hasData);
@@ -321,7 +299,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
GridTestUtils.retryAssert(log, ASSERT_RETRIES, ASSERT_RETRY_INTERVAL, new CAX() {
@Override public void applyx() {
for (int i = 0; i < NODES_CNT; i++)
- assertTrue(grid(i).cachex(DATA_CACHE_NAME).isEmpty());
+ assertTrue(grid(i).cachex(dataCacheName).isEmpty());
}
});
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
index 7b972c3..b07c7b8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
@@ -112,8 +112,6 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
private IgniteConfiguration config(int idx) {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("dataCache");
- igfsCfg.setMetaCacheName("metaCache");
igfsCfg.setName("igfs");
igfsCfg.setBlockSize(BLOCK_SIZE);
igfsCfg.setDefaultMode(PRIMARY);
@@ -121,7 +119,6 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
CacheConfiguration dataCacheCfg = new CacheConfiguration();
- dataCacheCfg.setName("dataCache");
dataCacheCfg.setCacheMode(PARTITIONED);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
dataCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
@@ -130,11 +127,13 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
CacheConfiguration metaCacheCfg = new CacheConfiguration();
- metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
metaCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+
IgniteConfiguration cfg = new IgniteConfiguration();
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
@@ -142,7 +141,6 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
discoSpi.setIpFinder(IP_FINDER);
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg);
cfg.setFileSystemConfiguration(igfsCfg);
cfg.setGridName("node-" + idx);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java
index 77b6f44..f2b14a2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java
@@ -58,15 +58,12 @@ public class IgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTest {
@Override protected void beforeTestsStarted() throws Exception {
FileSystemConfiguration igfsCfg = new FileSystemConfiguration();
- igfsCfg.setDataCacheName("dataCache");
- igfsCfg.setMetaCacheName("metaCache");
igfsCfg.setName("igfs");
igfsCfg.setBlockSize(512);
igfsCfg.setDefaultMode(PRIMARY);
CacheConfiguration dataCacheCfg = new CacheConfiguration();
- dataCacheCfg.setName("dataCache");
dataCacheCfg.setCacheMode(PARTITIONED);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
dataCacheCfg.setNearConfiguration(new NearCacheConfiguration());
@@ -76,11 +73,13 @@ public class IgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTest {
CacheConfiguration metaCacheCfg = new CacheConfiguration();
- metaCacheCfg.setName("metaCache");
metaCacheCfg.setCacheMode(REPLICATED);
metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
metaCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setGridName("grid");
@@ -90,7 +89,6 @@ public class IgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTest {
discoSpi.setIpFinder(ipFinder);
cfg.setDiscoverySpi(discoSpi);
- cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg);
cfg.setFileSystemConfiguration(igfsCfg);
Ignite g = G.start(cfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java
index 3314d7a..90dd556 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java
@@ -60,22 +60,30 @@ public class IpcSharedMemoryNodeStartup {
igfsCfg.setIpcEndpointConfiguration(endpointCfg);
- igfsCfg.setDataCacheName("partitioned");
- igfsCfg.setMetaCacheName("partitioned");
igfsCfg.setName("igfs");
- cfg.setFileSystemConfiguration(igfsCfg);
+ CacheConfiguration metaCacheCfg = new CacheConfiguration();
+
+ metaCacheCfg.setName("partitioned");
+ metaCacheCfg.setCacheMode(PARTITIONED);
+ metaCacheCfg.setNearConfiguration(null);
+ metaCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
+ metaCacheCfg.setEvictionPolicy(null);
+ metaCacheCfg.setBackups(0);
- CacheConfiguration cacheCfg = new CacheConfiguration();
+ CacheConfiguration dataCacheCfg = new CacheConfiguration();
- cacheCfg.setName("partitioned");
- cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setNearConfiguration(null);
- cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
- cacheCfg.setEvictionPolicy(null);
- cacheCfg.setBackups(0);
+ dataCacheCfg.setName("partitioned");
+ dataCacheCfg.setCacheMode(PARTITIONED);
+ dataCacheCfg.setNearConfiguration(null);
+ dataCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
+ dataCacheCfg.setEvictionPolicy(null);
+ dataCacheCfg.setBackups(0);
- cfg.setCacheConfiguration(cacheCfg);
+ igfsCfg.setMetaCacheConfiguration(metaCacheCfg);
+ igfsCfg.setDataCacheConfiguration(dataCacheCfg);
+
+ cfg.setFileSystemConfiguration(igfsCfg);
cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-0.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-0.xml b/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-0.xml
index 072c6db..dd3da7c 100644
--- a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-0.xml
+++ b/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-0.xml
@@ -59,39 +59,6 @@
</property>
<!--
- Configure caches where IGFS will store data.
- -->
- <property name="cacheConfiguration">
- <list>
- <!--
- Configure metadata cache where file system structure will be stored. It must be TRANSACTIONAL,
- and must have backups to maintain file system consistency in case of node crash.
- -->
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="replicated"/>
- <property name="cacheMode" value="REPLICATED"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- </bean>
-
- <!--
- Configure data cache where file's data will be stored.
- -->
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="partitioned"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- <property name="cacheMode" value="PARTITIONED"/>
- <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-
- <property name="affinityMapper">
- <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
- <property name="groupSize" value="128"/>
- </bean>
- </property>
- </bean>
- </list>
- </property>
-
- <!--
This port will be used by Apache Hadoop client to connect to Ignite node as if it was a job tracker.
-->
<property name="connectorConfiguration">
@@ -109,9 +76,27 @@
<!-- IGFS name you will use to access IGFS through Hadoop API. -->
<property name="name" value="igfs-0"/>
- <!-- Caches with these names must be configured. -->
- <property name="metaCacheName" value="replicated"/>
- <property name="dataCacheName" value="partitioned"/>
+ <!-- IGFS Caches. -->
+ <property name="metaCacheConfiguration">
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="cacheMode" value="REPLICATED"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ </bean>
+ </property>
+ <property name="dataCacheConfiguration">
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ <property name="cacheMode" value="PARTITIONED"/>
+ <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+ <property name="affinityMapper">
+ <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
+ <property name="groupSize" value="128"/>
+ </bean>
+ </property>
+ </bean>
+ </property>
+
<property name="blockSize" value="524288"/>
<property name="defaultMode" value="PRIMARY"/>
<property name="ipcEndpointEnabled" value="false"/>
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-1.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-1.xml b/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-1.xml
index e52921d..c577d28 100644
--- a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-1.xml
+++ b/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-1.xml
@@ -59,39 +59,6 @@
</property>
<!--
- Configure caches where IGFS will store data.
- -->
- <property name="cacheConfiguration">
- <list>
- <!--
- Configure metadata cache where file system structure will be stored. It must be TRANSACTIONAL,
- and must have backups to maintain file system consistency in case of node crash.
- -->
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="replicated"/>
- <property name="cacheMode" value="REPLICATED"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- </bean>
-
- <!--
- Configure data cache where file's data will be stored.
- -->
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="partitioned"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- <property name="cacheMode" value="PARTITIONED"/>
- <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-
- <property name="affinityMapper">
- <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
- <property name="groupSize" value="128"/>
- </bean>
- </property>
- </bean>
- </list>
- </property>
-
- <!--
This port will be used by Apache Hadoop client to connect to Ignite node as if it was a job tracker.
-->
<property name="connectorConfiguration">
@@ -109,9 +76,27 @@
<!-- IGFS name you will use to access IGFS through Hadoop API. -->
<property name="name" value="igfs-1"/>
- <!-- Caches with these names must be configured. -->
- <property name="metaCacheName" value="replicated"/>
- <property name="dataCacheName" value="partitioned"/>
+ <!-- IGFS Caches. -->
+ <property name="metaCacheConfiguration">
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="cacheMode" value="REPLICATED"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ </bean>
+ </property>
+ <property name="dataCacheConfiguration">
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ <property name="cacheMode" value="PARTITIONED"/>
+ <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+ <property name="affinityMapper">
+ <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
+ <property name="groupSize" value="128"/>
+ </bean>
+ </property>
+ </bean>
+ </property>
+
<property name="blockSize" value="524288"/>
<property name="defaultMode" value="PRIMARY"/>
<property name="ipcEndpointEnabled" value="false"/>
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ca46d1a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-2.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-2.xml b/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-2.xml
index 9344e99..1f7eaa3 100644
--- a/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-2.xml
+++ b/modules/hadoop/src/test/config/hadoop-fs-open-test/grid-2.xml
@@ -59,39 +59,6 @@
</property>
<!--
- Configure caches where IGFS will store data.
- -->
- <property name="cacheConfiguration">
- <list>
- <!--
- Configure metadata cache where file system structure will be stored. It must be TRANSACTIONAL,
- and must have backups to maintain file system consistency in case of node crash.
- -->
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="replicated"/>
- <property name="cacheMode" value="REPLICATED"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- </bean>
-
- <!--
- Configure data cache where file's data will be stored.
- -->
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="partitioned"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- <property name="cacheMode" value="PARTITIONED"/>
- <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-
- <property name="affinityMapper">
- <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
- <property name="groupSize" value="128"/>
- </bean>
- </property>
- </bean>
- </list>
- </property>
-
- <!--
This port will be used by Apache Hadoop client to connect to Ignite node as if it was a job tracker.
-->
<property name="connectorConfiguration">
@@ -109,9 +76,27 @@
<!-- IGFS name you will use to access IGFS through Hadoop API. -->
<property name="name" value="igfs-2"/>
- <!-- Caches with these names must be configured. -->
- <property name="metaCacheName" value="replicated"/>
- <property name="dataCacheName" value="partitioned"/>
+ <!-- IGFS Caches. -->
+ <property name="metaCacheConfiguration">
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="cacheMode" value="REPLICATED"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ </bean>
+ </property>
+ <property name="dataCacheConfiguration">
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ <property name="cacheMode" value="PARTITIONED"/>
+ <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+ <property name="affinityMapper">
+ <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
+ <property name="groupSize" value="128"/>
+ </bean>
+ </property>
+ </bean>
+ </property>
+
<property name="blockSize" value="524288"/>
<property name="defaultMode" value="PRIMARY"/>
<property name="ipcEndpointEnabled" value="false"/>