http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/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 3904766..09e0e0d 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 @@ -86,7 +86,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest { ggfsCfg.setDataCacheName("partitioned"); ggfsCfg.setMetaCacheName("replicated"); - ggfsCfg.setName("ggfs"); + ggfsCfg.setName("igfs"); ggfsCfg.setBlockSize(512 * 1024); if (setNullMode) @@ -120,7 +120,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setGridName("ggfs-grid"); + cfg.setGridName("igfs-grid"); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); @@ -135,7 +135,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest { grid = (IgniteEx)G.start(cfg); - ggfs = (IgfsImpl)grid.fileSystem("ggfs"); + ggfs = (IgfsImpl)grid.fileSystem("igfs"); } /** @@ -148,7 +148,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest { ggfsCfg.setDataCacheName("partitioned"); ggfsCfg.setMetaCacheName("replicated"); - ggfsCfg.setName("ggfs-secondary"); + ggfsCfg.setName("igfs-secondary"); ggfsCfg.setBlockSize(512 * 1024); ggfsCfg.setDefaultMode(PRIMARY); ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{ @@ -177,7 +177,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setGridName("ggfs-grid-secondary"); + cfg.setGridName("igfs-grid-secondary"); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); @@ -190,7 +190,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest { cfg.setLocalHost("127.0.0.1"); cfg.setConnectorConfiguration(null); - ggfsSecondary = (IgfsImpl)G.start(cfg).fileSystem("ggfs-secondary"); + ggfsSecondary = (IgfsImpl)G.start(cfg).fileSystem("igfs-secondary"); } /**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/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 7f3b249..270bc0d 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 @@ -115,7 +115,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest { ggfsCfg.setMetaCacheName(META_CACHE_NAME); ggfsCfg.setDataCacheName(DATA_CACHE_NAME); - ggfsCfg.setName("ggfs"); + ggfsCfg.setName("igfs"); cfg.setGgfsConfiguration(ggfsCfg); @@ -152,7 +152,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest { /** @return FS name. */ public String ggfsName() { - return "ggfs"; + return "igfs"; } /** @throws Exception If failed. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/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 7cd254d..d83e4f8 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 @@ -172,7 +172,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { public void testLocalIfGgfsConfigsHaveDifferentNames() throws Exception { g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class)); - String ggfsCfgName = "ggfs-cfg"; + String ggfsCfgName = "igfs-cfg"; g1GgfsCfg1.setName(ggfsCfgName); g1GgfsCfg2.setName(ggfsCfgName); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/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 e35cced..2267fd9 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 @@ -174,7 +174,7 @@ public abstract class IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest e ggfsConfiguration.setDataCacheName("partitioned"); ggfsConfiguration.setMetaCacheName("replicated"); - ggfsConfiguration.setName("ggfs" + UUID.randomUUID()); + ggfsConfiguration.setName("igfs" + UUID.randomUUID()); ggfsConfiguration.setManagementPort(mgmtPort.getAndIncrement()); if (endPntCfg != null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/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 c71a644..c6ecbe4 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,7 +72,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { private static final String META_CACHE_NAME = "metaCache"; /** GGFS name. */ - private static final String GGFS_NAME = "ggfs"; + private static final String GGFS_NAME = "igfs"; /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -340,7 +340,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { int expSize = expSizes.get(id) != null ? expSizes.get(id) : 0; - assert expSize == cache.ggfsDataSpaceUsed(); + assert expSize == cache.igfsDataSpaceUsed(); } // Perform reads which could potentially be non-local. @@ -378,7 +378,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { int expSize = expSizes.get(id) != null ? expSizes.get(id) : 0; - assert expSize == cache.ggfsDataSpaceUsed(); + assert expSize == cache.igfsDataSpaceUsed(); } } else { @@ -393,7 +393,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { GridCacheAdapter<IgfsBlockKey, byte[]> cache = cache(id); - assertEquals(totalSize, cache.ggfsDataSpaceUsed()); + assertEquals(totalSize, cache.igfsDataSpaceUsed()); } } @@ -413,7 +413,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { for (int i = 0; i < GRID_CNT; i++) { GridCacheAdapter<IgfsBlockKey, byte[]> cache = cache(grid(i).localNode().id()); - assert 0 == cache.ggfsDataSpaceUsed() : "Size counter is not 0: " + cache.ggfsDataSpaceUsed(); + assert 0 == cache.igfsDataSpaceUsed() : "Size counter is not 0: " + cache.igfsDataSpaceUsed(); } } @@ -594,7 +594,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { int expSize = expSizes.get(id) != null ? expSizes.get(id) : 0; - assertEquals(expSize, cache.ggfsDataSpaceUsed()); + assertEquals(expSize, cache.igfsDataSpaceUsed()); } // Start a node. @@ -646,7 +646,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { int expSize = expSizes.get(id) != null ? expSizes.get(id) : 0; - assertEquals("For node: " + id, expSize, cache.ggfsDataSpaceUsed()); + assertEquals("For node: " + id, expSize, cache.igfsDataSpaceUsed()); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/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 3810f41..ddf6214 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 @@ -92,7 +92,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest { return; // Initialize FS. - fs = grid(0).fileSystem("ggfs"); + fs = grid(0).fileSystem("igfs"); // Cleanup FS. fs.format(); @@ -114,7 +114,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest { ggfsCfg.setMetaCacheName(META_CACHE_NAME); ggfsCfg.setDataCacheName(DATA_CACHE_NAME); - ggfsCfg.setName("ggfs"); + ggfsCfg.setName("igfs"); ggfsCfg.setBlockSize(CFG_BLOCK_SIZE); ggfsCfg.setFragmentizerEnabled(true); @@ -220,7 +220,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest { /** @throws Exception If failed. */ public void testCreateFileFragmented() throws Exception { - IgfsEx impl = (IgfsEx)grid(0).fileSystem("ggfs"); + IgfsEx impl = (IgfsEx)grid(0).fileSystem("igfs"); IgfsFragmentizerManager fragmentizer = impl.context().fragmentizer(); @@ -229,9 +229,9 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest { IgfsPath path = new IgfsPath("/file"); try { - IgniteFs fs0 = grid(0).fileSystem("ggfs"); - IgniteFs fs1 = grid(1).fileSystem("ggfs"); - IgniteFs fs2 = grid(2).fileSystem("ggfs"); + IgniteFs fs0 = grid(0).fileSystem("igfs"); + IgniteFs fs1 = grid(1).fileSystem("igfs"); + IgniteFs fs2 = grid(2).fileSystem("igfs"); try (IgfsOutputStream out = fs0.create(path, 128, false, 1, CFG_GRP_SIZE, F.asMap(IgniteFs.PROP_PREFER_LOCAL_WRITES, "true"))) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/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 25400a1..7b00d5d 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 @@ -76,7 +76,7 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest { Ignite g = G.start(config(i)); if (i + 1 == NODE_CNT) - ggfs = g.fileSystem("ggfs"); + ggfs = g.fileSystem("igfs"); } } @@ -101,7 +101,7 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest { ggfsCfg.setDataCacheName("dataCache"); ggfsCfg.setMetaCacheName("metaCache"); - ggfsCfg.setName("ggfs"); + ggfsCfg.setName("igfs"); ggfsCfg.setBlockSize(BLOCK_SIZE); ggfsCfg.setDefaultMode(PRIMARY); ggfsCfg.setFragmentizerEnabled(false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/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 edf2464..625f167 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 @@ -54,7 +54,7 @@ public class IgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTest { ggfsCfg.setDataCacheName("dataCache"); ggfsCfg.setMetaCacheName("metaCache"); - ggfsCfg.setName("ggfs"); + ggfsCfg.setName("igfs"); ggfsCfg.setBlockSize(512); ggfsCfg.setDefaultMode(PRIMARY); @@ -91,7 +91,7 @@ public class IgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTest { Ignite g = G.start(cfg); - ggfs = g.fileSystem("ggfs"); + ggfs = g.fileSystem("igfs"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/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 d913a50..75c3c59 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 @@ -58,7 +58,7 @@ public class IpcSharedMemoryNodeStartup { ggfsCfg.setDataCacheName("partitioned"); ggfsCfg.setMetaCacheName("partitioned"); - ggfsCfg.setName("ggfs"); + ggfsCfg.setName("igfs"); cfg.setGgfsConfiguration(ggfsCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/IgfsHadoopParameters.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/IgfsHadoopParameters.java b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/IgfsHadoopParameters.java index b9bd44f..c4cd4af 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/IgfsHadoopParameters.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/IgfsHadoopParameters.java @@ -23,72 +23,72 @@ package org.apache.ignite.igfs.hadoop; * or passed to map-reduce task directly when using Hadoop driver for GGFS file system: * <ul> * <li> - * {@code fs.ggfs.[name].open.sequential_reads_before_prefetch} - this parameter overrides + * {@code fs.igfs.[name].open.sequential_reads_before_prefetch} - this parameter overrides * the one specified in {@link org.apache.ignite.configuration.IgfsConfiguration#getSequentialReadsBeforePrefetch()} * GGFS data node configuration property. * </li> * <li> - * {@code fs.ggfs.[name].log.enabled} - specifies whether GGFS sampling logger is enabled. If + * {@code fs.igfs.[name].log.enabled} - specifies whether GGFS sampling logger is enabled. If * {@code true}, then all file system operations will be logged to a file. * </li> - * <li>{@code fs.ggfs.[name].log.dir} - specifies log directory where sampling log files should be placed.</li> + * <li>{@code fs.igfs.[name].log.dir} - specifies log directory where sampling log files should be placed.</li> * <li> - * {@code fs.ggfs.[name].log.batch_size} - specifies how many log entries are accumulated in a batch before + * {@code fs.igfs.[name].log.batch_size} - specifies how many log entries are accumulated in a batch before * it gets flushed to log file. Higher values will imply greater performance, but will increase delay * before record appears in the log file. * </li> * <li> - * {@code fs.ggfs.[name].colocated.writes} - specifies whether written files should be colocated on data + * {@code fs.igfs.[name].colocated.writes} - specifies whether written files should be colocated on data * node to which client is connected. If {@code true}, file will not be distributed and will be written * to a single data node. Default value is {@code true}. * </li> * <li> - * {@code fs.ggfs.prefer.local.writes} - specifies whether file preferably should be written to + * {@code fs.igfs.prefer.local.writes} - specifies whether file preferably should be written to * local data node if it has enough free space. After some time it can be redistributed across nodes though. * </li> * </ul> * Where {@code [name]} is file system endpoint which you specify in file system URI authority part. E.g. in - * case your file system URI is {@code ggfs://127.0.0.1:10500} then {@code name} will be {@code 127.0.0.1:10500}. + * case your file system URI is {@code igfs://127.0.0.1:10500} then {@code name} will be {@code 127.0.0.1:10500}. * <p> * Sample configuration that can be placed to {@code core-site.xml} file: * <pre name="code" class="xml"> * <property> - * <name>fs.ggfs.127.0.0.1:10500.log.enabled</name> + * <name>fs.igfs.127.0.0.1:10500.log.enabled</name> * <value>true</value> * </property> * <property> - * <name>fs.ggfs.127.0.0.1:10500.log.dir</name> + * <name>fs.igfs.127.0.0.1:10500.log.dir</name> * <value>/home/apache/ignite/log/sampling</value> * </property> * <property> - * <name>fs.ggfs.127.0.0.1:10500.log.batch_size</name> + * <name>fs.igfs.127.0.0.1:10500.log.batch_size</name> * <value>16</value> * </property> * </pre> * Parameters could also be specified per mapreduce job, e.g. * <pre name="code" class="bash"> - * hadoop jar myjarfile.jar MyMapReduceJob -Dfs.ggfs.open.sequential_reads_before_prefetch=4 + * hadoop jar myjarfile.jar MyMapReduceJob -Dfs.igfs.open.sequential_reads_before_prefetch=4 * </pre> * If you want to use these parameters in code, then you have to substitute you file system name in it. The easiest * way to do that is {@code String.format(PARAM_GGFS_COLOCATED_WRITES, [name])}. */ public class IgfsHadoopParameters { /** Parameter name for control over file colocation write mode. */ - public static final String PARAM_GGFS_COLOCATED_WRITES = "fs.ggfs.%s.colocated.writes"; + public static final String PARAM_GGFS_COLOCATED_WRITES = "fs.igfs.%s.colocated.writes"; /** Parameter name for custom sequential reads before prefetch value. */ public static final String PARAM_GGFS_SEQ_READS_BEFORE_PREFETCH = - "fs.ggfs.%s.open.sequential_reads_before_prefetch"; + "fs.igfs.%s.open.sequential_reads_before_prefetch"; /** Parameter name for client logger directory. */ - public static final String PARAM_GGFS_LOG_DIR = "fs.ggfs.%s.log.dir"; + public static final String PARAM_GGFS_LOG_DIR = "fs.igfs.%s.log.dir"; /** Parameter name for log batch size. */ - public static final String PARAM_GGFS_LOG_BATCH_SIZE = "fs.ggfs.%s.log.batch_size"; + public static final String PARAM_GGFS_LOG_BATCH_SIZE = "fs.igfs.%s.log.batch_size"; /** Parameter name for log enabled flag. */ - public static final String PARAM_GGFS_LOG_ENABLED = "fs.ggfs.%s.log.enabled"; + public static final String PARAM_GGFS_LOG_ENABLED = "fs.igfs.%s.log.enabled"; /** Parameter name for prefer local writes flag. */ - public static final String PARAM_GGFS_PREFER_LOCAL_WRITES = "fs.ggfs.prefer.local.writes"; + public static final String PARAM_GGFS_PREFER_LOCAL_WRITES = "fs.igfs.prefer.local.writes"; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java index ae9b3cf..c5e9b46 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java @@ -51,11 +51,11 @@ import static org.apache.ignite.internal.igfs.hadoop.IgfsHadoopUtils.*; * <pre name="code" class="xml"> * <property> * <name>fs.default.name</name> - * <value>ggfs://ipc</value> + * <value>igfs://ipc</value> * </property> * * <property> - * <name>fs.ggfs.impl</name> + * <name>fs.igfs.impl</name> * <value>org.apache.ignite.ignitefs.hadoop.GridGgfsHadoopFileSystem</value> * </property> * </pre> @@ -82,7 +82,7 @@ import static org.apache.ignite.internal.igfs.hadoop.IgfsHadoopUtils.*; */ public class IgfsHadoopFileSystem extends FileSystem { /** Internal property to indicate management connection. */ - public static final String GGFS_MANAGEMENT = "fs.ggfs.management.connection"; + public static final String GGFS_MANAGEMENT = "fs.igfs.management.connection"; /** Empty array of file block locations. */ private static final BlockLocation[] EMPTY_BLOCK_LOCATIONS = new BlockLocation[0]; @@ -211,8 +211,8 @@ public class IgfsHadoopFileSystem extends FileSystem { mgmt = cfg.getBoolean(GGFS_MANAGEMENT, false); - if (!GGFS_SCHEME.equals(name.getScheme())) - throw new IOException("Illegal file system URI [expected=" + GGFS_SCHEME + + if (!IGFS_SCHEME.equals(name.getScheme())) + throw new IOException("Illegal file system URI [expected=" + IGFS_SCHEME + "://[name]/[optional_path], actual=" + name + ']'); uri = name; @@ -334,8 +334,8 @@ public class IgfsHadoopFileSystem extends FileSystem { URI uri = path.toUri(); if (uri.isAbsolute()) { - if (!F.eq(uri.getScheme(), GGFS_SCHEME)) - throw new InvalidPathException("Wrong path scheme [expected=" + GGFS_SCHEME + ", actual=" + + if (!F.eq(uri.getScheme(), IGFS_SCHEME)) + throw new InvalidPathException("Wrong path scheme [expected=" + IGFS_SCHEME + ", actual=" + uri.getAuthority() + ']'); if (!F.eq(uri.getAuthority(), uriAuthority)) @@ -1142,7 +1142,7 @@ public class IgfsHadoopFileSystem extends FileSystem { * @return Hadoop path. */ private Path convert(IgfsPath path) { - return new Path(GGFS_SCHEME, uriAuthority, path.toString()); + return new Path(IGFS_SCHEME, uriAuthority, path.toString()); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java index 028c975..03d08e5 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java @@ -51,11 +51,11 @@ import static org.apache.ignite.internal.igfs.hadoop.IgfsHadoopUtils.*; * <pre name="code" class="xml"> * <property> * <name>fs.default.name</name> - * <value>ggfs://ipc</value> + * <value>igfs://ipc</value> * </property> * * <property> - * <name>fs.ggfs.impl</name> + * <name>fs.igfs.impl</name> * <value>org.apache.ignite.ignitefs.hadoop.GridGgfsHadoopFileSystem</value> * </property> * </pre> @@ -136,7 +136,7 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl * @throws IOException If initialization failed. */ public IgfsHadoopFileSystem(URI name, Configuration cfg) throws URISyntaxException, IOException { - super(IgfsHadoopEndpoint.normalize(name), GGFS_SCHEME, false, -1); + super(IgfsHadoopEndpoint.normalize(name), IGFS_SCHEME, false, -1); uri = name; @@ -159,8 +159,8 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl URI uri = path.toUri(); if (uri.isAbsolute()) { - if (!F.eq(uri.getScheme(), GGFS_SCHEME)) - throw new InvalidPathException("Wrong path scheme [expected=" + GGFS_SCHEME + ", actual=" + + if (!F.eq(uri.getScheme(), IGFS_SCHEME)) + throw new InvalidPathException("Wrong path scheme [expected=" + IGFS_SCHEME + ", actual=" + uri.getAuthority() + ']'); if (!F.eq(uri.getAuthority(), uriAuthority)) @@ -211,8 +211,8 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl A.notNull(name, "name"); A.notNull(cfg, "cfg"); - if (!GGFS_SCHEME.equals(name.getScheme())) - throw new IOException("Illegal file system URI [expected=" + GGFS_SCHEME + + if (!IGFS_SCHEME.equals(name.getScheme())) + throw new IOException("Illegal file system URI [expected=" + IGFS_SCHEME + "://[name]/[optional_path], actual=" + name + ']'); uriAuthority = name.getAuthority(); @@ -891,7 +891,7 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl * @return Hadoop path. */ private Path convert(IgfsPath path) { - return new Path(GGFS_SCHEME, uriAuthority, path.toString()); + return new Path(IGFS_SCHEME, uriAuthority, path.toString()); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopEndpoint.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopEndpoint.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopEndpoint.java index 42feaae..5117ab3 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopEndpoint.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopEndpoint.java @@ -56,7 +56,7 @@ public class IgfsHadoopEndpoint { */ public static URI normalize(URI uri) throws IOException { try { - if (!F.eq(IgniteFs.GGFS_SCHEME, uri.getScheme())) + if (!F.eq(IgniteFs.IGFS_SCHEME, uri.getScheme())) throw new IOException("Failed to normalize UIR because it has non GGFS scheme: " + uri); IgfsHadoopEndpoint endpoint = new IgfsHadoopEndpoint(uri.getAuthority()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java index dcfaf4d..2a0a84c 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java @@ -31,13 +31,13 @@ import java.io.*; */ public class IgfsHadoopUtils { /** Parameter name for endpoint no embed mode flag. */ - public static final String PARAM_GGFS_ENDPOINT_NO_EMBED = "fs.ggfs.%s.endpoint.no_embed"; + public static final String PARAM_GGFS_ENDPOINT_NO_EMBED = "fs.igfs.%s.endpoint.no_embed"; /** Parameter name for endpoint no shared memory flag. */ - public static final String PARAM_GGFS_ENDPOINT_NO_LOCAL_SHMEM = "fs.ggfs.%s.endpoint.no_local_shmem"; + public static final String PARAM_GGFS_ENDPOINT_NO_LOCAL_SHMEM = "fs.igfs.%s.endpoint.no_local_shmem"; /** Parameter name for endpoint no local TCP flag. */ - public static final String PARAM_GGFS_ENDPOINT_NO_LOCAL_TCP = "fs.ggfs.%s.endpoint.no_local_tcp"; + public static final String PARAM_GGFS_ENDPOINT_NO_LOCAL_TCP = "fs.igfs.%s.endpoint.no_local_tcp"; /** * Get string parameter. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java index 5c8a465..868945d 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java @@ -152,7 +152,7 @@ public class GridHadoopDefaultMapReducePlanner implements GridHadoopMapReducePla if (split instanceof GridHadoopFileBlock) { GridHadoopFileBlock split0 = (GridHadoopFileBlock)split; - if (GGFS_SCHEME.equalsIgnoreCase(split0.file().getScheme())) { + if (IGFS_SCHEME.equalsIgnoreCase(split0.file().getScheme())) { IgfsHadoopEndpoint endpoint = new IgfsHadoopEndpoint(split0.file().getAuthority()); IgfsEx ggfs = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolSelfTest.java index c25ca5c..7f10214 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolSelfTest.java @@ -454,7 +454,7 @@ public class GridHadoopClientProtocolSelfTest extends GridHadoopAbstractSelfTest conf.set(MRConfig.FRAMEWORK_NAME, GridHadoopClientProtocol.FRAMEWORK_NAME); conf.set(MRConfig.MASTER_ADDRESS, "127.0.0.1:" + port); - conf.set("fs.defaultFS", "ggfs://:" + getTestGridName(0) + "@/"); + conf.set("fs.defaultFS", "igfs://:" + getTestGridName(0) + "@/"); return conf; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsEventsTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsEventsTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsEventsTestSuite.java index 8f140ff..0735c1f 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsEventsTestSuite.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsEventsTestSuite.java @@ -117,7 +117,7 @@ public class IgfsEventsTestSuite extends TestSuite { IgfsConfiguration ggfsCfg = super.getGgfsConfiguration(); ggfsCfg.setSecondaryFileSystem(new IgfsHadoopFileSystemWrapper( - "ggfs://ggfs-secondary:[email protected]:11500/", + "igfs://igfs-secondary:[email protected]:11500/", "modules/core/src/test/config/hadoop/core-site-secondary.xml")); return ggfsCfg; @@ -129,7 +129,7 @@ public class IgfsEventsTestSuite extends TestSuite { protected IgfsConfiguration getSecondaryGgfsConfiguration() throws IgniteCheckedException { IgfsConfiguration ggfsCfg = super.getGgfsConfiguration(); - ggfsCfg.setName("ggfs-secondary"); + ggfsCfg.setName("igfs-secondary"); ggfsCfg.setDefaultMode(PRIMARY); ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>(){{ put("type", "tcp"); @@ -175,7 +175,7 @@ public class IgfsEventsTestSuite extends TestSuite { Ignite secG = G.start(cfg); - return secG.fileSystem("ggfs-secondary"); + return secG.fileSystem("igfs-secondary"); } } @@ -216,7 +216,7 @@ public class IgfsEventsTestSuite extends TestSuite { IgfsConfiguration ggfsCfg = super.getGgfsConfiguration(); ggfsCfg.setSecondaryFileSystem(new IgfsHadoopFileSystemWrapper( - "ggfs://ggfs-secondary:[email protected]:11500/", + "igfs://igfs-secondary:[email protected]:11500/", "modules/core/src/test/config/hadoop/core-site-loopback-secondary.xml")); return ggfsCfg; @@ -226,7 +226,7 @@ public class IgfsEventsTestSuite extends TestSuite { @Override protected IgfsConfiguration getSecondaryGgfsConfiguration() throws IgniteCheckedException { IgfsConfiguration ggfsCfg = super.getSecondaryGgfsConfiguration(); - ggfsCfg.setName("ggfs-secondary"); + ggfsCfg.setName("igfs-secondary"); ggfsCfg.setDefaultMode(PRIMARY); ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{ put("type", "tcp"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemAbstractSelfTest.java index 52d35bf..4671e43 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemAbstractSelfTest.java @@ -256,7 +256,7 @@ public abstract class IgfsHadoop20FileSystemAbstractSelfTest extends IgfsCommonA cfg.setDataCacheName("partitioned"); cfg.setMetaCacheName("replicated"); - cfg.setName("ggfs"); + cfg.setName("igfs"); cfg.setPrefetchBlocks(1); cfg.setMaxSpaceSize(64 * 1024 * 1024); cfg.setDefaultMode(mode); @@ -327,7 +327,7 @@ public abstract class IgfsHadoop20FileSystemAbstractSelfTest extends IgfsCommonA long used = 0, max = 0; for (int i = 0; i < 4; i++) { - IgniteFs ggfs = grid(i).fileSystem("ggfs"); + IgniteFs ggfs = grid(i).fileSystem("igfs"); IgfsMetrics metrics = ggfs.metrics(); @@ -1298,7 +1298,7 @@ public abstract class IgfsHadoop20FileSystemAbstractSelfTest extends IgfsCommonA out.write(new byte[1024 * 1024]); } - IgniteFs igniteFs = grid(0).fileSystem("ggfs"); + IgniteFs igniteFs = grid(0).fileSystem("igfs"); IgfsPath filePath = new IgfsPath("/someFile"); @@ -1543,7 +1543,7 @@ public abstract class IgfsHadoop20FileSystemAbstractSelfTest extends IgfsCommonA * @throws Exception If failed. */ public void testMultithreadedMkdirs() throws Exception { - final Path dir = new Path(new Path("ggfs:///"), "/dir"); + final Path dir = new Path(new Path("igfs:///"), "/dir"); fs.mkdir(dir, FsPermission.getDefault(), true); @@ -1734,7 +1734,7 @@ public abstract class IgfsHadoop20FileSystemAbstractSelfTest extends IgfsCommonA startNodes(); // Start server again. // Check that client is again operational. - fs.mkdir(new Path("ggfs:///dir1/dir2"), FsPermission.getDefault(), true); + fs.mkdir(new Path("igfs:///dir1/dir2"), FsPermission.getDefault(), true); // However, the streams, opened before disconnect, should not be valid. GridTestUtils.assertThrows(log, new Callable<Object>() { @@ -1773,7 +1773,7 @@ public abstract class IgfsHadoop20FileSystemAbstractSelfTest extends IgfsCommonA for (Map.Entry<String, String> entry : primaryFsCfg) cfg.set(entry.getKey(), entry.getValue()); - cfg.setBoolean("fs.ggfs.impl.disable.cache", true); + cfg.setBoolean("fs.igfs.impl.disable.cache", true); final int nClients = 16; @@ -1791,7 +1791,7 @@ public abstract class IgfsHadoop20FileSystemAbstractSelfTest extends IgfsCommonA try { // Check that client is again operational. - assertTrue(fs.mkdirs(new Path("ggfs:///" + Thread.currentThread().getName()))); + assertTrue(fs.mkdirs(new Path("igfs:///" + Thread.currentThread().getName()))); return true; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemLoopbackPrimarySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemLoopbackPrimarySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemLoopbackPrimarySelfTest.java index d39595f..47e1c86 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemLoopbackPrimarySelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemLoopbackPrimarySelfTest.java @@ -35,7 +35,7 @@ public class IgfsHadoop20FileSystemLoopbackPrimarySelfTest extends IgfsHadoop20F /** {@inheritDoc} */ @Override protected String primaryFileSystemUriPath() { - return "ggfs://ggfs:" + getTestGridName(0) + "@/"; + return "igfs://igfs:" + getTestGridName(0) + "@/"; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemShmemPrimarySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemShmemPrimarySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemShmemPrimarySelfTest.java index 59ea54d..631f188 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemShmemPrimarySelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemShmemPrimarySelfTest.java @@ -35,7 +35,7 @@ public class IgfsHadoop20FileSystemShmemPrimarySelfTest extends IgfsHadoop20File /** {@inheritDoc} */ @Override protected String primaryFileSystemUriPath() { - return "ggfs://ggfs:" + getTestGridName(0) + "@/"; + return "igfs://igfs:" + getTestGridName(0) + "@/"; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopDualAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopDualAbstractSelfTest.java index 20822ef..54fad39 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopDualAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopDualAbstractSelfTest.java @@ -57,13 +57,13 @@ public abstract class IgfsHadoopDualAbstractSelfTest extends IgfsCommonAbstractT protected static final int SEQ_READS_BEFORE_PREFETCH = 2; /** Secondary file system URI. */ - protected static final String SECONDARY_URI = "ggfs://ggfs-secondary:[email protected]:11500/"; + protected static final String SECONDARY_URI = "igfs://igfs-secondary:[email protected]:11500/"; /** Secondary file system configuration path. */ protected static final String SECONDARY_CFG = "modules/core/src/test/config/hadoop/core-site-loopback-secondary.xml"; /** Primary file system URI. */ - protected static final String PRIMARY_URI = "ggfs://ggfs:grid@/"; + protected static final String PRIMARY_URI = "igfs://igfs:grid@/"; /** Primary file system configuration path. */ protected static final String PRIMARY_CFG = "modules/core/src/test/config/hadoop/core-site-loopback.xml"; @@ -181,14 +181,14 @@ public abstract class IgfsHadoopDualAbstractSelfTest extends IgfsCommonAbstractT for (int i = 0; i < chunk.length; i++) chunk[i] = (byte)i; - Ignite igniteSecondary = startGridWithGgfs("grid-secondary", "ggfs-secondary", PRIMARY, null, SECONDARY_REST_CFG); + Ignite igniteSecondary = startGridWithGgfs("grid-secondary", "igfs-secondary", PRIMARY, null, SECONDARY_REST_CFG); Igfs hadoopFs = new IgfsHadoopFileSystemWrapper(SECONDARY_URI, SECONDARY_CFG); - Ignite ignite = startGridWithGgfs("grid", "ggfs", mode, hadoopFs, PRIMARY_REST_CFG); + Ignite ignite = startGridWithGgfs("grid", "igfs", mode, hadoopFs, PRIMARY_REST_CFG); - ggfsSecondary = (IgfsImpl) igniteSecondary.fileSystem("ggfs-secondary"); - ggfs = (IgfsImpl) ignite.fileSystem("ggfs"); + ggfsSecondary = (IgfsImpl) igniteSecondary.fileSystem("igfs-secondary"); + ggfs = (IgfsImpl) ignite.fileSystem("igfs"); } /** {@inheritDoc} */ @@ -244,7 +244,7 @@ public abstract class IgfsHadoopDualAbstractSelfTest extends IgfsCommonAbstractT int seqReads = SEQ_READS_BEFORE_PREFETCH + 1; - cfg.setInt(String.format(PARAM_GGFS_SEQ_READS_BEFORE_PREFETCH, "ggfs:grid@"), seqReads); + cfg.setInt(String.format(PARAM_GGFS_SEQ_READS_BEFORE_PREFETCH, "igfs:grid@"), seqReads); FileSystem fs = FileSystem.get(new URI(PRIMARY_URI), cfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemAbstractSelfTest.java index d1363cc..d0c6e8f 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemAbstractSelfTest.java @@ -59,16 +59,16 @@ import static org.apache.ignite.igfs.IgfsMode.*; @SuppressWarnings("all") public abstract class IgfsHadoopFileSystemAbstractSelfTest extends IgfsCommonAbstractTest { /** Primary file system authority. */ - private static final String PRIMARY_AUTHORITY = "ggfs:grid0@"; + private static final String PRIMARY_AUTHORITY = "igfs:grid0@"; /** Primary file systme URI. */ - private static final String PRIMARY_URI = "ggfs://" + PRIMARY_AUTHORITY + "/"; + private static final String PRIMARY_URI = "igfs://" + PRIMARY_AUTHORITY + "/"; /** Secondary file system authority. */ private static final String SECONDARY_AUTHORITY = "ggfs_secondary:[email protected]:11500"; /** Secondary file systme URI. */ - private static final String SECONDARY_URI = "ggfs://" + SECONDARY_AUTHORITY + "/"; + private static final String SECONDARY_URI = "igfs://" + SECONDARY_AUTHORITY + "/"; /** Secondary file system configuration path. */ private static final String SECONDARY_CFG_PATH = "/work/core-site-test.xml"; @@ -146,7 +146,7 @@ public abstract class IgfsHadoopFileSystemAbstractSelfTest extends IgfsCommonAbs @Override protected void beforeTestsStarted() throws Exception { Configuration secondaryConf = configuration(SECONDARY_AUTHORITY, true, true); - secondaryConf.setInt("fs.ggfs.block.size", 1024); + secondaryConf.setInt("fs.igfs.block.size", 1024); String path = U.getIgniteHome() + SECONDARY_CFG_PATH; @@ -323,7 +323,7 @@ public abstract class IgfsHadoopFileSystemAbstractSelfTest extends IgfsCommonAbs cfg.setDataCacheName("partitioned"); cfg.setMetaCacheName("replicated"); - cfg.setName("ggfs"); + cfg.setName("igfs"); cfg.setPrefetchBlocks(1); cfg.setDefaultMode(mode); @@ -424,7 +424,7 @@ public abstract class IgfsHadoopFileSystemAbstractSelfTest extends IgfsCommonAbs Configuration cfg = configuration(PRIMARY_AUTHORITY, skipEmbed, skipLocShmem); // we disable caching in order to obtain new FileSystem instance. - cfg.setBoolean("fs.ggfs.impl.disable.cache", true); + cfg.setBoolean("fs.igfs.impl.disable.cache", true); // Initial cache size. int initSize = cache.size(); @@ -1536,7 +1536,7 @@ public abstract class IgfsHadoopFileSystemAbstractSelfTest extends IgfsCommonAbs out.write(new byte[1024 * 1024]); } - IgniteFs igniteFs = grid(0).fileSystem("ggfs"); + IgniteFs igniteFs = grid(0).fileSystem("igfs"); IgfsPath filePath = new IgfsPath("/someFile"); @@ -2017,7 +2017,7 @@ public abstract class IgfsHadoopFileSystemAbstractSelfTest extends IgfsCommonAbs for (Map.Entry<String, String> entry : primaryFsCfg) cfg.set(entry.getKey(), entry.getValue()); - cfg.setBoolean("fs.ggfs.impl.disable.cache", true); + cfg.setBoolean("fs.igfs.impl.disable.cache", true); final int nClients = 1; @@ -2347,12 +2347,12 @@ public abstract class IgfsHadoopFileSystemAbstractSelfTest extends IgfsCommonAbs private static Configuration configuration(String authority, boolean skipEmbed, boolean skipLocShmem) { Configuration cfg = new Configuration(); - cfg.set("fs.defaultFS", "ggfs://" + authority + "/"); - cfg.set("fs.ggfs.impl", IgfsHadoopFileSystem.class.getName()); - cfg.set("fs.AbstractFileSystem.ggfs.impl", + cfg.set("fs.defaultFS", "igfs://" + authority + "/"); + cfg.set("fs.igfs.impl", IgfsHadoopFileSystem.class.getName()); + cfg.set("fs.AbstractFileSystem.igfs.impl", org.apache.ignite.igfs.hadoop.v2.IgfsHadoopFileSystem.class.getName()); - cfg.setBoolean("fs.ggfs.impl.disable.cache", true); + cfg.setBoolean("fs.igfs.impl.disable.cache", true); if (skipEmbed) cfg.setBoolean(String.format(IgfsHadoopUtils.PARAM_GGFS_ENDPOINT_NO_EMBED, authority), true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemClientSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemClientSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemClientSelfTest.java index fe22bc2..d671394 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemClientSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemClientSelfTest.java @@ -70,7 +70,7 @@ public class IgfsHadoopFileSystemClientSelfTest extends IgfsCommonAbstractTest { ggfsCfg.setDataCacheName("partitioned"); ggfsCfg.setMetaCacheName("replicated"); - ggfsCfg.setName("ggfs"); + ggfsCfg.setName("igfs"); ggfsCfg.setBlockSize(512 * 1024); ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{ put("type", "tcp"); @@ -125,7 +125,7 @@ public class IgfsHadoopFileSystemClientSelfTest extends IgfsCommonAbstractTest { try { switchHandlerErrorFlag(true); - IgfsHadoop client = new IgfsHadoopOutProc("127.0.0.1", 10500, getTestGridName(0), "ggfs", LOG); + IgfsHadoop client = new IgfsHadoopOutProc("127.0.0.1", 10500, getTestGridName(0), "igfs", LOG); client.handshake(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemHandshakeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemHandshakeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemHandshakeSelfTest.java index f4b3580..6e23809 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemHandshakeSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemHandshakeSelfTest.java @@ -55,7 +55,7 @@ public class IgfsHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractTes private static final String GRID_NAME = "grid"; /** GGFS name. */ - private static final String GGFS_NAME = "ggfs"; + private static final String GGFS_NAME = "igfs"; /** GGFS path. */ private static final IgfsPath PATH = new IgfsPath("/path"); @@ -284,7 +284,7 @@ public class IgfsHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractTes * @throws Exception If failed. */ private static FileSystem fileSystem(String authority) throws Exception { - return FileSystem.get(new URI("ggfs://" + authority + "/"), configuration(authority)); + return FileSystem.get(new URI("igfs://" + authority + "/"), configuration(authority)); } /** @@ -296,12 +296,12 @@ public class IgfsHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractTes private static Configuration configuration(String authority) { Configuration cfg = new Configuration(); - cfg.set("fs.defaultFS", "ggfs://" + authority + "/"); - cfg.set("fs.ggfs.impl", org.apache.ignite.igfs.hadoop.v1.IgfsHadoopFileSystem.class.getName()); - cfg.set("fs.AbstractFileSystem.ggfs.impl", + cfg.set("fs.defaultFS", "igfs://" + authority + "/"); + cfg.set("fs.igfs.impl", org.apache.ignite.igfs.hadoop.v1.IgfsHadoopFileSystem.class.getName()); + cfg.set("fs.AbstractFileSystem.igfs.impl", IgfsHadoopFileSystem.class.getName()); - cfg.setBoolean("fs.ggfs.impl.disable.cache", true); + cfg.setBoolean("fs.igfs.impl.disable.cache", true); cfg.setBoolean(String.format(PARAM_GGFS_ENDPOINT_NO_EMBED, authority), true); cfg.setBoolean(String.format(PARAM_GGFS_ENDPOINT_NO_LOCAL_SHMEM, authority), true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemIpcCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemIpcCacheSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemIpcCacheSelfTest.java index 22213a5..7767b97 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemIpcCacheSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemIpcCacheSelfTest.java @@ -69,7 +69,7 @@ public class IgfsHadoopFileSystemIpcCacheSelfTest extends IgfsCommonAbstractTest ggfsCfg.setDataCacheName("partitioned"); ggfsCfg.setMetaCacheName("replicated"); - ggfsCfg.setName("ggfs"); + ggfsCfg.setName("igfs"); ggfsCfg.setManagementPort(IgfsConfiguration.DFLT_MGMT_PORT + cnt); ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{ @@ -151,16 +151,16 @@ public class IgfsHadoopFileSystemIpcCacheSelfTest extends IgfsCommonAbstractTest Map<String, IgfsHadoopIpcIo> cache = (Map<String, IgfsHadoopIpcIo>)cacheField.get(null); - String name = "ggfs:" + getTestGridName(0) + "@"; + String name = "igfs:" + getTestGridName(0) + "@"; Configuration cfg = new Configuration(); cfg.addResource(U.resolveIgniteUrl(HADOOP_FS_CFG)); - cfg.setBoolean("fs.ggfs.impl.disable.cache", true); + cfg.setBoolean("fs.igfs.impl.disable.cache", true); cfg.setBoolean(String.format(IgfsHadoopUtils.PARAM_GGFS_ENDPOINT_NO_EMBED, name), true); // Ensure that existing IO is reused. - FileSystem fs1 = FileSystem.get(new URI("ggfs://" + name + "/"), cfg); + FileSystem fs1 = FileSystem.get(new URI("igfs://" + name + "/"), cfg); assertEquals(1, cache.size()); @@ -181,7 +181,7 @@ public class IgfsHadoopFileSystemIpcCacheSelfTest extends IgfsCommonAbstractTest assertEquals(1, ((AtomicInteger)activeCntField.get(io)).get()); // Ensure that when IO is used by multiple file systems and one of them is closed, IO is not stopped. - FileSystem fs2 = FileSystem.get(new URI("ggfs://" + name + "/abc"), cfg); + FileSystem fs2 = FileSystem.get(new URI("igfs://" + name + "/abc"), cfg); assertEquals(1, cache.size()); assertEquals(2, ((AtomicInteger)activeCntField.get(io)).get()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerSelfTest.java index 1c59643..ee838a5 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerSelfTest.java @@ -41,7 +41,7 @@ public class IgfsHadoopFileSystemLoggerSelfTest extends IgfsCommonAbstractTest { private static final IgfsPath PATH = new IgfsPath(PATH_STR); /** GGFS name. */ - private static final String GGFS_NAME = "ggfs"; + private static final String GGFS_NAME = "igfs"; /** Log file path. */ private static final String LOG_DIR = U.getIgniteHome(); @@ -50,7 +50,7 @@ public class IgfsHadoopFileSystemLoggerSelfTest extends IgfsCommonAbstractTest { private static final String ENDPOINT = "localhost:10500"; /** Log file name. */ - private static final String LOG_FILE = LOG_DIR + File.separator + "ggfs-log-" + GGFS_NAME + "-" + U.jvmPid() + + private static final String LOG_FILE = LOG_DIR + File.separator + "igfs-log-" + GGFS_NAME + "-" + U.jvmPid() + ".csv"; /** {@inheritDoc} */ @@ -73,7 +73,7 @@ public class IgfsHadoopFileSystemLoggerSelfTest extends IgfsCommonAbstractTest { File[] logs = dir.listFiles(new FilenameFilter() { @Override public boolean accept(File dir, String name) { - return name.startsWith("ggfs-log-"); + return name.startsWith("igfs-log-"); } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerStateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerStateSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerStateSelfTest.java index b80fbe9..ec78c41 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerStateSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerStateSelfTest.java @@ -79,7 +79,7 @@ public class IgfsHadoopFileSystemLoggerStateSelfTest extends IgfsCommonAbstractT ggfsCfg.setDataCacheName("partitioned"); ggfsCfg.setMetaCacheName("replicated"); - ggfsCfg.setName("ggfs"); + ggfsCfg.setName("igfs"); ggfsCfg.setBlockSize(512 * 1024); ggfsCfg.setDefaultMode(PRIMARY); ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{ @@ -108,7 +108,7 @@ public class IgfsHadoopFileSystemLoggerStateSelfTest extends IgfsCommonAbstractT IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setGridName("ggfs-grid"); + cfg.setGridName("igfs-grid"); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); @@ -123,7 +123,7 @@ public class IgfsHadoopFileSystemLoggerStateSelfTest extends IgfsCommonAbstractT Ignite g = G.start(cfg); - ggfs = (IgfsEx)g.fileSystem("ggfs"); + ggfs = (IgfsEx)g.fileSystem("igfs"); ggfs.globalSampling(sampling); @@ -297,14 +297,14 @@ public class IgfsHadoopFileSystemLoggerStateSelfTest extends IgfsCommonAbstractT fsCfg.addResource(U.resolveIgniteUrl("modules/core/src/test/config/hadoop/core-site-loopback.xml")); - fsCfg.setBoolean("fs.ggfs.impl.disable.cache", true); + fsCfg.setBoolean("fs.igfs.impl.disable.cache", true); if (logging) - fsCfg.setBoolean(String.format(PARAM_GGFS_LOG_ENABLED, "ggfs:ggfs-grid@"), logging); + fsCfg.setBoolean(String.format(PARAM_GGFS_LOG_ENABLED, "igfs:igfs-grid@"), logging); - fsCfg.setStrings(String.format(PARAM_GGFS_LOG_DIR, "ggfs:ggfs-grid@"), U.getIgniteHome()); + fsCfg.setStrings(String.format(PARAM_GGFS_LOG_DIR, "igfs:igfs-grid@"), U.getIgniteHome()); - return (IgfsHadoopFileSystem)FileSystem.get(new URI("ggfs://ggfs:ggfs-grid@/"), fsCfg); + return (IgfsHadoopFileSystem)FileSystem.get(new URI("igfs://igfs:igfs-grid@/"), fsCfg); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemSecondaryModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemSecondaryModeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemSecondaryModeSelfTest.java index a426814..6a3eaa5 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemSecondaryModeSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemSecondaryModeSelfTest.java @@ -87,7 +87,7 @@ public class IgfsHadoopFileSystemSecondaryModeSelfTest extends IgfsCommonAbstrac ggfsCfg.setDataCacheName("partitioned"); ggfsCfg.setMetaCacheName("replicated"); - ggfsCfg.setName("ggfs"); + ggfsCfg.setName("igfs"); ggfsCfg.setBlockSize(512 * 1024); ggfsCfg.setDefaultMode(mode); ggfsCfg.setPathModes(pathModes); @@ -98,7 +98,7 @@ public class IgfsHadoopFileSystemSecondaryModeSelfTest extends IgfsCommonAbstrac ggfsCfg.setManagementPort(-1); ggfsCfg.setSecondaryFileSystem(new IgfsHadoopFileSystemWrapper( - "ggfs://ggfs-secondary:[email protected]:11500/", + "igfs://igfs-secondary:[email protected]:11500/", "modules/core/src/test/config/hadoop/core-site-loopback-secondary.xml")); CacheConfiguration cacheCfg = defaultCacheConfiguration(); @@ -122,7 +122,7 @@ public class IgfsHadoopFileSystemSecondaryModeSelfTest extends IgfsCommonAbstrac IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setGridName("ggfs-grid"); + cfg.setGridName("igfs-grid"); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); @@ -140,9 +140,9 @@ public class IgfsHadoopFileSystemSecondaryModeSelfTest extends IgfsCommonAbstrac fsCfg.addResource(U.resolveIgniteUrl("modules/core/src/test/config/hadoop/core-site-loopback.xml")); - fsCfg.setBoolean("fs.ggfs.impl.disable.cache", true); + fsCfg.setBoolean("fs.igfs.impl.disable.cache", true); - fs = (IgfsHadoopFileSystem)FileSystem.get(new URI("ggfs://ggfs:ggfs-grid@/"), fsCfg); + fs = (IgfsHadoopFileSystem)FileSystem.get(new URI("igfs://igfs:igfs-grid@/"), fsCfg); } /** @@ -155,7 +155,7 @@ public class IgfsHadoopFileSystemSecondaryModeSelfTest extends IgfsCommonAbstrac ggfsCfg.setDataCacheName("partitioned"); ggfsCfg.setMetaCacheName("replicated"); - ggfsCfg.setName("ggfs-secondary"); + ggfsCfg.setName("igfs-secondary"); ggfsCfg.setBlockSize(512 * 1024); ggfsCfg.setDefaultMode(PRIMARY); ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{ @@ -184,7 +184,7 @@ public class IgfsHadoopFileSystemSecondaryModeSelfTest extends IgfsCommonAbstrac IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setGridName("ggfs-grid-secondary"); + cfg.setGridName("igfs-grid-secondary"); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsLoad.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsLoad.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsLoad.java index 5c8ef12..01498bc 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsLoad.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsLoad.java @@ -49,13 +49,13 @@ import java.util.concurrent.*; * <li>-primaryOnly {true|false} if 'true' then creates files only in directory named 'primary' </li> * </ul> * Note: GGFS logging is disabled by default, to enable logging it is necessary to set flag - * 'fs.ggfs.<name>.log.enabled' in Hadoop configuration file. By default log files are created in the - * directory 'work/ggfs/log', this path can be changed in Hadoop configuration file using property - * 'fs.ggfs.<name>.log.dir'. + * 'fs.igfs.<name>.log.enabled' in Hadoop configuration file. By default log files are created in the + * directory 'work/igfs/log', this path can be changed in Hadoop configuration file using property + * 'fs.igfs.<name>.log.dir'. */ public class IgfsLoad { /** */ - private static final String DFLT_URL = "ggfs:///"; + private static final String DFLT_URL = "igfs:///"; /** */ private static final int DFLT_MIN_FILE_SIZE = 100 * 1024; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsNearOnlyMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsNearOnlyMultiNodeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsNearOnlyMultiNodeSelfTest.java index 53d79f7..8696f9d 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsNearOnlyMultiNodeSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsNearOnlyMultiNodeSelfTest.java @@ -79,7 +79,7 @@ public class IgfsNearOnlyMultiNodeSelfTest extends GridCommonAbstractTest { ggfsCfg.setDataCacheName("partitioned"); ggfsCfg.setMetaCacheName("partitioned"); - ggfsCfg.setName("ggfs"); + ggfsCfg.setName("igfs"); ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{ put("type", "shmem"); @@ -146,7 +146,7 @@ public class IgfsNearOnlyMultiNodeSelfTest extends GridCommonAbstractTest { */ protected URI getFileSystemURI(int grid) { try { - return new URI("ggfs://127.0.0.1:" + (IpcSharedMemoryServerEndpoint.DFLT_IPC_PORT + grid)); + return new URI("igfs://127.0.0.1:" + (IpcSharedMemoryServerEndpoint.DFLT_IPC_PORT + grid)); } catch (URISyntaxException e) { throw new RuntimeException(e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java index 7a7ccb9..7b18589 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java @@ -196,8 +196,8 @@ public abstract class GridHadoopAbstractSelfTest extends GridCommonAbstractTest */ protected void setupFileSystems(Configuration cfg) { cfg.set("fs.defaultFS", ggfsScheme()); - cfg.set("fs.ggfs.impl", org.apache.ignite.igfs.hadoop.v1.IgfsHadoopFileSystem.class.getName()); - cfg.set("fs.AbstractFileSystem.ggfs.impl", IgfsHadoopFileSystem. + cfg.set("fs.igfs.impl", org.apache.ignite.igfs.hadoop.v1.IgfsHadoopFileSystem.class.getName()); + cfg.set("fs.AbstractFileSystem.igfs.impl", IgfsHadoopFileSystem. class.getName()); GridHadoopFileSystemsUtils.setupFileSystems(cfg); @@ -207,6 +207,6 @@ public abstract class GridHadoopAbstractSelfTest extends GridCommonAbstractTest * @return GGFS scheme for test. */ protected String ggfsScheme() { - return "ggfs://:" + getTestGridName(0) + "@/"; + return "igfs://:" + getTestGridName(0) + "@/"; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopCommandLineTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopCommandLineTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopCommandLineTest.java index dbe2bb1..7665979 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopCommandLineTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopCommandLineTest.java @@ -40,7 +40,7 @@ public class GridHadoopCommandLineTest extends GridCommonAbstractTest { private IgfsEx ggfs; /** */ - private static final String ggfsName = "ggfs"; + private static final String ggfsName = "igfs"; /** */ private static File testWorkDir; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java index a073b21..6e41714 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java @@ -481,7 +481,7 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac * @return Split. */ private static GridHadoopFileBlock split(boolean ggfs, String file, long start, long len, String... hosts) { - URI uri = URI.create((ggfs ? "ggfs://ggfs@" : "hdfs://") + file); + URI uri = URI.create((ggfs ? "igfs://igfs@" : "hdfs://") + file); return new GridHadoopFileBlock(hosts, uri, start, len); } @@ -926,7 +926,7 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac private static class MockIgnite extends IgniteSpringBean implements IgniteEx { /** {@inheritDoc} */ @Override public IgniteFs ggfsx(String name) { - assert F.eq("ggfs", name); + assert F.eq("igfs", name); return GGFS; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopStartup.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopStartup.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopStartup.java index 05c5a2e..ceb5088 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopStartup.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopStartup.java @@ -40,10 +40,10 @@ public class GridHadoopStartup { public static Configuration configuration() { Configuration cfg = new Configuration(); - cfg.set("fs.defaultFS", "ggfs://ggfs@localhost"); + cfg.set("fs.defaultFS", "igfs://igfs@localhost"); - cfg.set("fs.ggfs.impl", org.apache.ignite.igfs.hadoop.v1.IgfsHadoopFileSystem.class.getName()); - cfg.set("fs.AbstractFileSystem.ggfs.impl", IgfsHadoopFileSystem.class.getName()); + cfg.set("fs.igfs.impl", org.apache.ignite.igfs.hadoop.v1.IgfsHadoopFileSystem.class.getName()); + cfg.set("fs.AbstractFileSystem.igfs.impl", IgfsHadoopFileSystem.class.getName()); cfg.set("dfs.client.block.write.replace-datanode-on-failure.policy", "NEVER"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java index 0b4972d..82c0ced 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java @@ -128,7 +128,7 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest Configuration cfg = new Configuration(); - cfg.setStrings("fs.ggfs.impl", IgfsHadoopFileSystem.class.getName()); + cfg.setStrings("fs.igfs.impl", IgfsHadoopFileSystem.class.getName()); Job job = Job.getInstance(cfg); job.setOutputKeyClass(Text.class); @@ -140,8 +140,8 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest job.setInputFormatClass(TextInputFormat.class); - FileInputFormat.setInputPaths(job, new Path("ggfs://:" + getTestGridName(0) + "@/")); - FileOutputFormat.setOutputPath(job, new Path("ggfs://:" + getTestGridName(0) + "@/output/")); + FileInputFormat.setInputPaths(job, new Path("igfs://:" + getTestGridName(0) + "@/")); + FileOutputFormat.setOutputPath(job, new Path("igfs://:" + getTestGridName(0) + "@/output/")); job.setJarByClass(getClass()); @@ -169,7 +169,7 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest Configuration cfg = new Configuration(); - cfg.setStrings("fs.ggfs.impl", IgfsHadoopFileSystem.class.getName()); + cfg.setStrings("fs.igfs.impl", IgfsHadoopFileSystem.class.getName()); cfg.setBoolean(MAP_WRITE, true); Job job = Job.getInstance(cfg); @@ -184,8 +184,8 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest job.setInputFormatClass(TextInputFormat.class); - FileInputFormat.setInputPaths(job, new Path("ggfs://:" + getTestGridName(0) + "@/")); - FileOutputFormat.setOutputPath(job, new Path("ggfs://:" + getTestGridName(0) + "@/output")); + FileInputFormat.setInputPaths(job, new Path("igfs://:" + getTestGridName(0) + "@/")); + FileOutputFormat.setOutputPath(job, new Path("igfs://:" + getTestGridName(0) + "@/output")); job.setJarByClass(getClass()); @@ -211,7 +211,7 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest Configuration cfg = new Configuration(); - cfg.setStrings("fs.ggfs.impl", IgfsHadoopFileSystem.class.getName()); + cfg.setStrings("fs.igfs.impl", IgfsHadoopFileSystem.class.getName()); Job job = Job.getInstance(cfg); job.setOutputKeyClass(Text.class); @@ -223,8 +223,8 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest job.setInputFormatClass(TextInputFormat.class); - FileInputFormat.setInputPaths(job, new Path("ggfs://:" + getTestGridName(0) + "@/")); - FileOutputFormat.setOutputPath(job, new Path("ggfs://:" + getTestGridName(0) + "@/output/")); + FileInputFormat.setInputPaths(job, new Path("igfs://:" + getTestGridName(0) + "@/")); + FileOutputFormat.setOutputPath(job, new Path("igfs://:" + getTestGridName(0) + "@/output/")); job.setJarByClass(getClass()); @@ -285,8 +285,8 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest job.setInputFormatClass(InFormat.class); - FileInputFormat.setInputPaths(job, new Path("ggfs://:" + getTestGridName(0) + "@/")); - FileOutputFormat.setOutputPath(job, new Path("ggfs://:" + getTestGridName(0) + "@/output/")); + FileInputFormat.setInputPaths(job, new Path("igfs://:" + getTestGridName(0) + "@/")); + FileOutputFormat.setOutputPath(job, new Path("igfs://:" + getTestGridName(0) + "@/output/")); job.setJarByClass(getClass()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java index 7ae0167..85de25c 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java @@ -87,8 +87,8 @@ public class GridHadoopExternalTaskExecutionSelfTest extends GridHadoopAbstractS job.setNumReduceTasks(1); - FileInputFormat.setInputPaths(job, new Path("ggfs://:" + getTestGridName(0) + "@/" + testInputFile)); - FileOutputFormat.setOutputPath(job, new Path("ggfs://:" + getTestGridName(0) + "@/output")); + FileInputFormat.setInputPaths(job, new Path("igfs://:" + getTestGridName(0) + "@/" + testInputFile)); + FileOutputFormat.setOutputPath(job, new Path("igfs://:" + getTestGridName(0) + "@/output")); job.setJarByClass(getClass()); @@ -123,8 +123,8 @@ public class GridHadoopExternalTaskExecutionSelfTest extends GridHadoopAbstractS job.setNumReduceTasks(1); - FileInputFormat.setInputPaths(job, new Path("ggfs://:" + getTestGridName(0) + "@/" + testInputFile)); - FileOutputFormat.setOutputPath(job, new Path("ggfs://:" + getTestGridName(0) + "@/output")); + FileInputFormat.setInputPaths(job, new Path("igfs://:" + getTestGridName(0) + "@/" + testInputFile)); + FileOutputFormat.setOutputPath(job, new Path("igfs://:" + getTestGridName(0) + "@/output")); job.setJarByClass(getClass()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/IgfsPerformanceBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/IgfsPerformanceBenchmark.java b/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/IgfsPerformanceBenchmark.java index 0fa6991..a6c9202 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/IgfsPerformanceBenchmark.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/IgfsPerformanceBenchmark.java @@ -37,7 +37,7 @@ public class IgfsPerformanceBenchmark { private static final String HADOOP_FS_CFG = "modules/core/src/test/config/hadoop/core-site.xml"; /** FS prefix. */ - private static final String FS_PREFIX = "ggfs:///"; + private static final String FS_PREFIX = "igfs:///"; /** Test writes. */ private static final int OP_WRITE = 0;
