From 5dad54e8adb79d0ac061a893fccda8ffb8bf31ce Mon Sep 17 00:00:00 2001 From: vozerov-gridgain Date: Fri, 13 Feb 2015 14:34:54 +0300 Subject: [PATCH] # IGNITE-226: WIP. --- .../main/java/org/apache/ignite/IgniteFs.java | 2 +- .../configuration/IgfsConfiguration.java | 2 +- .../java/org/apache/ignite/igfs/IgfsFile.java | 2 +- .../java/org/apache/ignite/igfs/IgfsPath.java | 2 +- .../ignite/internal/IgniteNodeAttributes.java | 2 +- .../apache/ignite/internal/IgnitionEx.java | 4 +- .../internal/igfs/common/IgfsLogger.java | 2 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 2 +- .../cache/GridCacheProjectionEx.java | 2 +- .../cache/GridCacheProjectionImpl.java | 4 +- .../processors/cache/GridCacheProxyImpl.java | 4 +- .../preloader/GridDhtPartitionDemandPool.java | 2 +- .../near/GridNearCacheAdapter.java | 4 +- .../closure/GridClosureProcessor.java | 2 +- .../processors/igfs/IgfsAsyncImpl.java | 102 +++++++++--------- .../internal/processors/igfs/IgfsContext.java | 10 +- .../processors/igfs/IgfsDataManager.java | 36 +++---- .../processors/igfs/IgfsDeleteWorker.java | 4 +- .../igfs/IgfsFragmentizerManager.java | 4 +- .../internal/processors/igfs/IgfsHelper.java | 2 +- .../processors/igfs/IgfsHelperImpl.java | 2 +- .../internal/processors/igfs/IgfsImpl.java | 2 +- .../processors/igfs/IgfsIpcHandler.java | 2 +- .../internal/processors/igfs/IgfsJobImpl.java | 14 +-- .../processors/igfs/IgfsMetaManager.java | 4 +- .../processors/igfs/IgfsNoopHelper.java | 2 +- .../processors/igfs/IgfsProcessor.java | 10 +- .../internal/processors/igfs/IgfsServer.java | 6 +- .../internal/processors/igfs/IgfsThread.java | 2 +- .../ggfs/VisorIgfsProfilerClearTask.java | 2 +- .../visor/ggfs/VisorIgfsProfilerTask.java | 2 +- .../visor/node/VisorGridConfiguration.java | 12 +-- .../visor/node/VisorIgfsConfiguration.java | 6 +- .../visor/node/VisorNodeDataCollectorJob.java | 2 +- .../internal/visor/util/VisorTaskUtils.java | 10 +- .../igfs/IgfsEventsAbstractSelfTest.java | 2 +- .../IgfsFragmentizerAbstractSelfTest.java | 6 +- .../ignite/igfs/IgfsFragmentizerSelfTest.java | 10 +- .../IgfsFragmentizerTopologySelfTest.java | 2 +- .../apache/ignite/igfs/IgfsPathSelfTest.java | 6 +- .../processors/cache/GridCacheLeakTest.java | 2 +- ...IgfsPerBlockLruEvictionPolicySelfTest.java | 4 +- .../processors/igfs/IgfsAbstractSelfTest.java | 16 +-- .../processors/igfs/IgfsCacheSelfTest.java | 2 +- .../igfs/IgfsDataManagerSelfTest.java | 16 +-- .../igfs/IgfsMetaManagerSelfTest.java | 6 +- .../processors/igfs/IgfsMetricsSelfTest.java | 4 +- .../processors/igfs/IgfsModesSelfTest.java | 12 +-- .../igfs/IgfsProcessorSelfTest.java | 4 +- .../igfs/IgfsProcessorValidationSelfTest.java | 2 +- ...cEndpointRegistrationAbstractSelfTest.java | 2 +- .../processors/igfs/IgfsSizeSelfTest.java | 14 +-- .../processors/igfs/IgfsStreamsSelfTest.java | 12 +-- .../processors/igfs/IgfsTaskSelfTest.java | 4 +- .../IgfsAbstractRecordResolverSelfTest.java | 4 +- .../ipc/shmem/IpcSharedMemoryNodeStartup.java | 2 +- .../igfs/hadoop/IgfsHadoopParameters.java | 34 +++--- .../igfs/hadoop/v1/IgfsHadoopFileSystem.java | 16 +-- .../igfs/hadoop/v2/IgfsHadoopFileSystem.java | 16 +-- .../igfs/hadoop/IgfsHadoopEndpoint.java | 2 +- .../internal/igfs/hadoop/IgfsHadoopUtils.java | 6 +- .../GridHadoopDefaultMapReducePlanner.java | 2 +- .../GridHadoopClientProtocolSelfTest.java | 2 +- .../ignite/igfs/IgfsEventsTestSuite.java | 10 +- ...gfsHadoop20FileSystemAbstractSelfTest.java | 14 +-- ...op20FileSystemLoopbackPrimarySelfTest.java | 2 +- ...adoop20FileSystemShmemPrimarySelfTest.java | 2 +- .../igfs/IgfsHadoopDualAbstractSelfTest.java | 14 +-- .../IgfsHadoopFileSystemAbstractSelfTest.java | 24 ++--- .../IgfsHadoopFileSystemClientSelfTest.java | 4 +- ...IgfsHadoopFileSystemHandshakeSelfTest.java | 12 +-- .../IgfsHadoopFileSystemIpcCacheSelfTest.java | 10 +- .../IgfsHadoopFileSystemLoggerSelfTest.java | 6 +- ...fsHadoopFileSystemLoggerStateSelfTest.java | 14 +-- ...HadoopFileSystemSecondaryModeSelfTest.java | 14 +-- .../java/org/apache/ignite/igfs/IgfsLoad.java | 8 +- .../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 4 +- .../hadoop/GridHadoopAbstractSelfTest.java | 6 +- .../hadoop/GridHadoopCommandLineTest.java | 2 +- ...HadoopDefaultMapReducePlannerSelfTest.java | 4 +- .../processors/hadoop/GridHadoopStartup.java | 6 +- .../GridHadoopTaskExecutionSelfTest.java | 22 ++-- ...idHadoopExternalTaskExecutionSelfTest.java | 8 +- .../ggfs/IgfsPerformanceBenchmark.java | 2 +- 85 files changed, 336 insertions(+), 336 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteFs.java b/modules/core/src/main/java/org/apache/ignite/IgniteFs.java index 956b09d34b33c..3ce03e8d348b8 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteFs.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteFs.java @@ -58,7 +58,7 @@ */ public interface IgniteFs extends Igfs, IgniteAsyncSupport { /** GGFS scheme name. */ - public static final String GGFS_SCHEME = "ggfs"; + public static final String IGFS_SCHEME = "igfs"; /** File property: prefer writes to local node. */ public static final String PROP_PREFER_LOCAL_WRITES = "locWrite"; diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgfsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgfsConfiguration.java index 3a8cee664ecae..303803c856c6a 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgfsConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgfsConfiguration.java @@ -58,7 +58,7 @@ public class IgfsConfiguration { public static final int DFLT_GGFS_LOG_BATCH_SIZE = 100; /** Default {@code GGFS} log directory. */ - public static final String DFLT_GGFS_LOG_DIR = "work/ggfs/log"; + public static final String DFLT_GGFS_LOG_DIR = "work/igfs/log"; /** Default per node buffer size. */ public static final int DFLT_PER_NODE_BATCH_SIZE = 100; diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFile.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFile.java index c4a277677015d..d9854cd81fd4b 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFile.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFile.java @@ -28,7 +28,7 @@ * GridGgfsPath filePath = new GridGgfsPath("my/working/dir", "file.txt"); * * // Get metadata about file. - * GridGgfsFile file = ggfs.info(filePath); + * GridGgfsFile file = igfs.info(filePath); * */ public interface IgfsFile { diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java index 48ef047635aa7..2dbf0dbbc6367 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java @@ -34,7 +34,7 @@ * GridGgfsPath filePath = new GridGgfsPath(dirPath, "file.txt"); * * // Get metadata about file. - * GridGgfsFile file = ggfs.info(filePath); + * GridGgfsFile file = igfs.info(filePath); * */ public final class IgfsPath implements Comparable, Externalizable { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java index eab6b37ffccd8..082908aa23846 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java @@ -64,7 +64,7 @@ public final class IgniteNodeAttributes { public static final String ATTR_TX_CONFIG = ATTR_PREFIX + ".tx"; /** Internal attribute name constant. */ - public static final String ATTR_GGFS = ATTR_PREFIX + ".ggfs"; + public static final String ATTR_GGFS = ATTR_PREFIX + ".igfs"; /** Internal attribute name constant. */ public static final String ATTR_MONGO = ATTR_PREFIX + ".mongo"; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index af19ddf92b4cc..59da2bdc68e71 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@ -1501,9 +1501,9 @@ private void start0(GridStartContext startCtx) throws IgniteCheckedException { 0, new LinkedBlockingQueue()); - // Note that we do not pre-start threads here as ggfs pool may not be needed. + // Note that we do not pre-start threads here as igfs pool may not be needed. ggfsExecSvc = new IgniteThreadPoolExecutor( - "ggfs-" + cfg.getGridName(), + "igfs-" + cfg.getGridName(), cfg.getGgfsThreadPoolSize(), cfg.getGgfsThreadPoolSize(), 0, diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java index c94d114ccb9fc..510d480defe35 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java @@ -220,7 +220,7 @@ private IgfsLogger(String endpoint, String ggfsName, String dir, int batchSize) A.ensure(dirFile.isDirectory(), "dir must point to a directory"); A.ensure(dirFile.exists(), "dir must exist"); - file = new File(dirFile, "ggfs-log-" + ggfsName + "-" + pid + ".csv"); + file = new File(dirFile, "igfs-log-" + ggfsName + "-" + pid + ".csv"); entries = new ConcurrentLinkedDeque8<>(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index e12e419663d75..5c4b8a5c6aaf5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -4750,7 +4750,7 @@ protected Object readResolve() throws ObjectStreamException { } /** {@inheritDoc} */ - @Override public long ggfsDataSpaceUsed() { + @Override public long igfsDataSpaceUsed() { assert ggfsDataCache; return ggfsDataCacheSize.longValue(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 0c8fa6628a2ac..3fb8289bd93a5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -195,7 +195,7 @@ protected void value(@Nullable V val, @Nullable byte[] valBytes) { assert Thread.holdsLock(this); // In case we deal with GGFS cache, count updated data - if (cctx.cache().isGgfsDataCache() && cctx.kernalContext().ggfsHelper().isGgfsBlockKey(key())) { + if (cctx.cache().isGgfsDataCache() && cctx.kernalContext().ggfsHelper().isIgfsBlockKey(key())) { int newSize = valueLength((byte[])val, valBytes != null ? GridCacheValueBytes.marshaled(valBytes) : GridCacheValueBytes.nil()); int oldSize = valueLength((byte[])this.val, this.val == null ? valueBytesUnlocked() : diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java index 05f198fc8fadd..8a1a965a72e49 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java @@ -344,7 +344,7 @@ public IgniteInternalFuture removexAsync(K key, @Nullable GridCacheEntr * * @return Amount of used GGFS space in bytes. */ - public long ggfsDataSpaceUsed(); + public long igfsDataSpaceUsed(); /** * Get maximum space available for GGFS. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java index 9986be7ae3af9..6d65b3d14f2e0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java @@ -713,8 +713,8 @@ private IgnitePredicate> visitor(final IgnitePredicate gateProjection() { } /** {@inheritDoc} */ - @Override public long ggfsDataSpaceUsed() { + @Override public long igfsDataSpaceUsed() { GridCacheProjectionImpl prev = gate.enter(prj); try { - return delegate.ggfsDataSpaceUsed(); + return delegate.igfsDataSpaceUsed(); } finally { gate.leave(prev); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java index 43d52cee26973..8322ca1c39a4f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java @@ -493,7 +493,7 @@ private boolean preloadEntry(ClusterNode pick, int p, GridCacheEntryInfo e log.debug("Preloading key [key=" + entry.key() + ", part=" + p + ", node=" + pick.id() + ']'); if (cctx.dht().isGgfsDataCache() && - cctx.dht().ggfsDataSpaceUsed() > cctx.dht().ggfsDataSpaceMax()) { + cctx.dht().igfsDataSpaceUsed() > cctx.dht().ggfsDataSpaceMax()) { LT.error(log, null, "Failed to preload GGFS data cache (GGFS space size exceeded maximum " + "value, will ignore preload entries): " + name()); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java index c5fa33ea43650..ab4a24eb2ac7a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java @@ -633,8 +633,8 @@ public boolean clearLocally0(K key, @Nullable IgnitePredicate> } /** {@inheritDoc} */ - @Override public long ggfsDataSpaceUsed() { - return dht().ggfsDataSpaceUsed(); + @Override public long igfsDataSpaceUsed() { + return dht().igfsDataSpaceUsed(); } /** {@inheritDoc} */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java index ba5d0a531d7af..23b3aa88327ae 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java @@ -712,7 +712,7 @@ private String poolName(GridClosurePolicy plc) { return "system"; case GGFS_POOL: - return "ggfs"; + return "igfs"; default: throw new IllegalArgumentException("Invalid closure execution policy: " + plc); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java index da372797ccb05..c89e3c1d0fc9f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java @@ -34,21 +34,21 @@ */ public class IgfsAsyncImpl extends AsyncSupportAdapter implements IgfsEx { /** */ - private final IgfsImpl ggfs; + private final IgfsImpl igfs; /** - * @param ggfs Ggfs. + * @param igfs Ggfs. */ - public IgfsAsyncImpl(IgfsImpl ggfs) { + public IgfsAsyncImpl(IgfsImpl igfs) { super(true); - this.ggfs = ggfs; + this.igfs = igfs; } /** {@inheritDoc} */ @Override public void format() { try { - saveOrGet(ggfs.formatAsync()); + saveOrGet(igfs.formatAsync()); } catch (IgniteCheckedException e) { throw U.convertException(e); @@ -59,7 +59,7 @@ public IgfsAsyncImpl(IgfsImpl ggfs) { @Override public R execute(IgfsTask task, @Nullable IgfsRecordResolver rslvr, Collection paths, @Nullable T arg) { try { - return saveOrGet(ggfs.executeAsync(task, rslvr, paths, arg)); + return saveOrGet(igfs.executeAsync(task, rslvr, paths, arg)); } catch (IgniteCheckedException e) { throw U.convertException(e); @@ -70,7 +70,7 @@ public IgfsAsyncImpl(IgfsImpl ggfs) { @Override public R execute(IgfsTask task, @Nullable IgfsRecordResolver rslvr, Collection paths, boolean skipNonExistentFiles, long maxRangeLen, @Nullable T arg) { try { - return saveOrGet(ggfs.executeAsync(task, rslvr, paths, skipNonExistentFiles, maxRangeLen, arg)); + return saveOrGet(igfs.executeAsync(task, rslvr, paths, skipNonExistentFiles, maxRangeLen, arg)); } catch (IgniteCheckedException e) { throw U.convertException(e); @@ -81,7 +81,7 @@ public IgfsAsyncImpl(IgfsImpl ggfs) { @Override public R execute(Class> taskCls, @Nullable IgfsRecordResolver rslvr, Collection paths, @Nullable T arg) { try { - return saveOrGet(ggfs.executeAsync(taskCls, rslvr, paths, arg)); + return saveOrGet(igfs.executeAsync(taskCls, rslvr, paths, arg)); } catch (IgniteCheckedException e) { throw U.convertException(e); @@ -93,7 +93,7 @@ public IgfsAsyncImpl(IgfsImpl ggfs) { @Nullable IgfsRecordResolver rslvr, Collection paths, boolean skipNonExistentFiles, long maxRangeLen, @Nullable T arg) { try { - return saveOrGet(ggfs.executeAsync(taskCls, rslvr, paths, skipNonExistentFiles, maxRangeLen, arg)); + return saveOrGet(igfs.executeAsync(taskCls, rslvr, paths, skipNonExistentFiles, maxRangeLen, arg)); } catch (IgniteCheckedException e) { throw U.convertException(e); @@ -102,215 +102,215 @@ public IgfsAsyncImpl(IgfsImpl ggfs) { /** {@inheritDoc} */ @Override public void stop() { - ggfs.stop(); + igfs.stop(); } /** {@inheritDoc} */ @Override public IgfsContext context() { - return ggfs.context(); + return igfs.context(); } /** {@inheritDoc} */ @Override public IgfsPaths proxyPaths() { - return ggfs.proxyPaths(); + return igfs.proxyPaths(); } /** {@inheritDoc} */ @Override public IgfsInputStreamAdapter open(IgfsPath path, int bufSize, int seqReadsBeforePrefetch) { - return ggfs.open(path, bufSize, seqReadsBeforePrefetch); + return igfs.open(path, bufSize, seqReadsBeforePrefetch); } /** {@inheritDoc} */ @Override public IgfsInputStreamAdapter open(IgfsPath path) { - return ggfs.open(path); + return igfs.open(path); } /** {@inheritDoc} */ @Override public IgfsInputStreamAdapter open(IgfsPath path, int bufSize) { - return ggfs.open(path, bufSize); + return igfs.open(path, bufSize); } /** {@inheritDoc} */ @Override public IgfsStatus globalSpace() throws IgniteCheckedException { - return ggfs.globalSpace(); + return igfs.globalSpace(); } /** {@inheritDoc} */ @Override public void globalSampling(@Nullable Boolean val) throws IgniteCheckedException { - ggfs.globalSampling(val); + igfs.globalSampling(val); } /** {@inheritDoc} */ @Nullable @Override public Boolean globalSampling() { - return ggfs.globalSampling(); + return igfs.globalSampling(); } /** {@inheritDoc} */ @Override public IgfsLocalMetrics localMetrics() { - return ggfs.localMetrics(); + return igfs.localMetrics(); } /** {@inheritDoc} */ @Override public long groupBlockSize() { - return ggfs.groupBlockSize(); + return igfs.groupBlockSize(); } /** {@inheritDoc} */ @Override public IgniteInternalFuture awaitDeletesAsync() throws IgniteCheckedException { - return ggfs.awaitDeletesAsync(); + return igfs.awaitDeletesAsync(); } /** {@inheritDoc} */ @Nullable @Override public String clientLogDirectory() { - return ggfs.clientLogDirectory(); + return igfs.clientLogDirectory(); } /** {@inheritDoc} */ @Override public void clientLogDirectory(String logDir) { - ggfs.clientLogDirectory(logDir); + igfs.clientLogDirectory(logDir); } /** {@inheritDoc} */ @Override public boolean evictExclude(IgfsPath path, boolean primary) { - return ggfs.evictExclude(path, primary); + return igfs.evictExclude(path, primary); } /** {@inheritDoc} */ @Override public IgniteUuid nextAffinityKey() { - return ggfs.nextAffinityKey(); + return igfs.nextAffinityKey(); } /** {@inheritDoc} */ @Override public boolean isProxy(URI path) { - return ggfs.isProxy(path); + return igfs.isProxy(path); } /** {@inheritDoc} */ @Nullable @Override public String name() { - return ggfs.name(); + return igfs.name(); } /** {@inheritDoc} */ @Override public IgfsConfiguration configuration() { - return ggfs.configuration(); + return igfs.configuration(); } /** {@inheritDoc} */ @Override public IgfsPathSummary summary(IgfsPath path) { - return ggfs.summary(path); + return igfs.summary(path); } /** {@inheritDoc} */ @Override public IgfsOutputStream create(IgfsPath path, boolean overwrite) { - return ggfs.create(path, overwrite); + return igfs.create(path, overwrite); } /** {@inheritDoc} */ @Override public IgfsOutputStream create(IgfsPath path, int bufSize, boolean overwrite, int replication, long blockSize, @Nullable Map props) { - return ggfs.create(path, bufSize, overwrite, replication, blockSize, props); + return igfs.create(path, bufSize, overwrite, replication, blockSize, props); } /** {@inheritDoc} */ @Override public IgfsOutputStream create(IgfsPath path, int bufSize, boolean overwrite, @Nullable IgniteUuid affKey, int replication, long blockSize, @Nullable Map props) { - return ggfs.create(path, bufSize, overwrite, affKey, replication, blockSize, props); + return igfs.create(path, bufSize, overwrite, affKey, replication, blockSize, props); } /** {@inheritDoc} */ @Override public IgfsOutputStream append(IgfsPath path, boolean create) { - return ggfs.append(path, create); + return igfs.append(path, create); } /** {@inheritDoc} */ @Override public IgfsOutputStream append(IgfsPath path, int bufSize, boolean create, @Nullable Map props) { - return ggfs.append(path, bufSize, create, props); + return igfs.append(path, bufSize, create, props); } /** {@inheritDoc} */ @Override public void setTimes(IgfsPath path, long accessTime, long modificationTime) { - ggfs.setTimes(path, accessTime, modificationTime); + igfs.setTimes(path, accessTime, modificationTime); } /** {@inheritDoc} */ @Override public Collection affinity(IgfsPath path, long start, long len) { - return ggfs.affinity(path, start, len); + return igfs.affinity(path, start, len); } /** {@inheritDoc} */ @Override public Collection affinity(IgfsPath path, long start, long len, long maxLen) { - return ggfs.affinity(path, start, len, maxLen); + return igfs.affinity(path, start, len, maxLen); } /** {@inheritDoc} */ @Override public IgfsMetrics metrics() { - return ggfs.metrics(); + return igfs.metrics(); } /** {@inheritDoc} */ @Override public void resetMetrics() { - ggfs.resetMetrics(); + igfs.resetMetrics(); } /** {@inheritDoc} */ @Override public long size(IgfsPath path) { - return ggfs.size(path); + return igfs.size(path); } /** {@inheritDoc} */ @Override public boolean exists(IgfsPath path) { - return ggfs.exists(path); + return igfs.exists(path); } /** {@inheritDoc} */ @Nullable @Override public IgfsFile update(IgfsPath path, Map props) { - return ggfs.update(path, props); + return igfs.update(path, props); } /** {@inheritDoc} */ @Override public void rename(IgfsPath src, IgfsPath dest) { - ggfs.rename(src, dest); + igfs.rename(src, dest); } /** {@inheritDoc} */ @Override public boolean delete(IgfsPath path, boolean recursive) { - return ggfs.delete(path, recursive); + return igfs.delete(path, recursive); } /** {@inheritDoc} */ @Override public void mkdirs(IgfsPath path) { - ggfs.mkdirs(path); + igfs.mkdirs(path); } /** {@inheritDoc} */ @Override public void mkdirs(IgfsPath path, @Nullable Map props) { - ggfs.mkdirs(path, props); + igfs.mkdirs(path, props); } /** {@inheritDoc} */ @Override public Collection listPaths(IgfsPath path) { - return ggfs.listPaths(path); + return igfs.listPaths(path); } /** {@inheritDoc} */ @Override public Collection listFiles(IgfsPath path) { - return ggfs.listFiles(path); + return igfs.listFiles(path); } /** {@inheritDoc} */ @Nullable @Override public IgfsFile info(IgfsPath path) { - return ggfs.info(path); + return igfs.info(path); } /** {@inheritDoc} */ @Override public long usedSpaceSize() { - return ggfs.usedSpaceSize(); + return igfs.usedSpaceSize(); } /** {@inheritDoc} */ @Override public Map properties() { - return ggfs.properties(); + return igfs.properties(); } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java index 89680d9f1a707..2304069a2e9c6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java @@ -55,7 +55,7 @@ public class IgfsContext { private final IgfsFragmentizerManager fragmentizerMgr; /** GGFS instance. */ - private final IgfsEx ggfs; + private final IgfsEx igfs; /** * @param ctx Kernal context. @@ -82,14 +82,14 @@ public IgfsContext( this.srvMgr = add(srvMgr); this.fragmentizerMgr = add(fragmentizerMgr); - ggfs = new IgfsImpl(this); + igfs = new IgfsImpl(this); } /** * @return GGFS instance. */ - public IgfsEx ggfs() { - return ggfs; + public IgfsEx igfs() { + return igfs; } /** @@ -177,7 +177,7 @@ public void send(ClusterNode node, Object topic, IgfsCommunicationMessage msg, G * @param node Node to check. * @return {@code True} if node has GGFS with this name, {@code false} otherwise. */ - public boolean ggfsNode(ClusterNode node) { + public boolean igfsNode(ClusterNode node) { assert node != null; IgfsAttributes[] ggfs = node.attribute(ATTR_GGFS); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java index 14fb6c5e77bc6..089ab41c27c12 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java @@ -64,7 +64,7 @@ */ public class IgfsDataManager extends IgfsManager { /** GGFS. */ - private IgfsEx ggfs; + private IgfsEx igfs; /** Data cache projection. */ private GridCacheProjectionEx dataCachePrj; @@ -149,7 +149,7 @@ void awaitInit() { /** {@inheritDoc} */ @Override protected void start0() throws IgniteCheckedException { - ggfs = igfsCtx.ggfs(); + igfs = igfsCtx.igfs(); dataCachePrj = igfsCtx.kernalContext().cache().internalCache(igfsCtx.configuration().getDataCacheName()); dataCache = igfsCtx.kernalContext().cache().internalCache(igfsCtx.configuration().getDataCacheName()); @@ -161,7 +161,7 @@ void awaitInit() { throw new IgniteCheckedException("Data cache should be transactional: " + igfsCtx.configuration().getDataCacheName()); - metrics = igfsCtx.ggfs().localMetrics(); + metrics = igfsCtx.igfs().localMetrics(); assert dataCachePrj != null; @@ -192,7 +192,7 @@ else if (msg instanceof IgfsAckMessage) DiscoveryEvent discoEvt = (DiscoveryEvent)evt; - if (igfsCtx.ggfsNode(discoEvt.eventNode())) { + if (igfsCtx.igfsNode(discoEvt.eventNode())) { for (WriteCompletionFuture future : pendingWrites.values()) { future.onError(discoEvt.eventNode().id(), new ClusterTopologyCheckedException("Node left grid before write completed: " + evt.node().id())); @@ -221,7 +221,7 @@ else if (msg instanceof IgfsAckMessage) maxPendingPuts = igfsCtx.configuration().getDualModeMaxPendingPutsSize(); delWorker = new AsyncDeleteWorker(igfsCtx.kernalContext().gridName(), - "ggfs-" + ggfsName + "-delete-worker", log); + "igfs-" + ggfsName + "-delete-worker", log); } /** {@inheritDoc} */ @@ -252,7 +252,7 @@ else if (msg instanceof IgfsAckMessage) * @return Number of bytes used to store files. */ public long spaceSize() { - return dataCachePrj.ggfsDataSpaceUsed(); + return dataCachePrj.igfsDataSpaceUsed(); } /** @@ -484,7 +484,7 @@ public List listLocalDataBlocks(IgfsFileInfo fileInfo) } /** - * Registers write future in ggfs data manager. + * Registers write future in igfs data manager. * * @param fileInfo File info of file opened to write. * @return Future that will be completed when all ack messages are received or when write failed. @@ -1077,16 +1077,16 @@ private void processBatch(IgniteUuid fileId, final ClusterNode node, */ private void processPartialBlockWrite(IgniteUuid fileId, IgfsBlockKey colocatedKey, int startOff, byte[] data) throws IgniteCheckedException { - if (dataCachePrj.ggfsDataSpaceUsed() >= dataCachePrj.ggfsDataSpaceMax()) { + if (dataCachePrj.igfsDataSpaceUsed() >= dataCachePrj.ggfsDataSpaceMax()) { try { - ggfs.awaitDeletesAsync().get(trashPurgeTimeout); + igfs.awaitDeletesAsync().get(trashPurgeTimeout); } catch (IgniteFutureTimeoutCheckedException ignore) { // Ignore. } // Additional size check. - if (dataCachePrj.ggfsDataSpaceUsed() >= dataCachePrj.ggfsDataSpaceMax()) { + if (dataCachePrj.igfsDataSpaceUsed() >= dataCachePrj.ggfsDataSpaceMax()) { final WriteCompletionFuture completionFut = pendingWrites.get(fileId); if (completionFut == null) { @@ -1098,7 +1098,7 @@ private void processPartialBlockWrite(IgniteUuid fileId, IgfsBlockKey colocatedK } IgfsOutOfSpaceException e = new IgfsOutOfSpaceException("Failed to write data block " + - "(GGFS maximum data size exceeded) [used=" + dataCachePrj.ggfsDataSpaceUsed() + + "(GGFS maximum data size exceeded) [used=" + dataCachePrj.igfsDataSpaceUsed() + ", allowed=" + dataCachePrj.ggfsDataSpaceMax() + ']'); completionFut.onDone(new IgniteCheckedException("Failed to write data (not enough space on node): " + @@ -1246,20 +1246,20 @@ private void putSafe(final IgfsBlockKey key, final byte[] data) throws IgniteChe private IgniteInternalFuture storeBlocksAsync(Map blocks) { assert !blocks.isEmpty(); - if (dataCachePrj.ggfsDataSpaceUsed() >= dataCachePrj.ggfsDataSpaceMax()) { + if (dataCachePrj.igfsDataSpaceUsed() >= dataCachePrj.ggfsDataSpaceMax()) { try { try { - ggfs.awaitDeletesAsync().get(trashPurgeTimeout); + igfs.awaitDeletesAsync().get(trashPurgeTimeout); } catch (IgniteFutureTimeoutCheckedException ignore) { // Ignore. } // Additional size check. - if (dataCachePrj.ggfsDataSpaceUsed() >= dataCachePrj.ggfsDataSpaceMax()) + if (dataCachePrj.igfsDataSpaceUsed() >= dataCachePrj.ggfsDataSpaceMax()) return new GridFinishedFuture(igfsCtx.kernalContext(), new IgfsOutOfSpaceException("Failed to write data block (GGFS maximum data size " + - "exceeded) [used=" + dataCachePrj.ggfsDataSpaceUsed() + + "exceeded) [used=" + dataCachePrj.igfsDataSpaceUsed() + ", allowed=" + dataCachePrj.ggfsDataSpaceMax() + ']')); } @@ -1363,7 +1363,7 @@ private IgfsBlockKey createBlockKey( } // Check if we have enough free space to do colocated writes. - if (dataCachePrj.ggfsDataSpaceUsed() > dataCachePrj.ggfsDataSpaceMax() * + if (dataCachePrj.igfsDataSpaceUsed() > dataCachePrj.ggfsDataSpaceMax() * igfsCtx.configuration().getFragmentizerLocalWritesRatio()) { // Forbid further co-location. locRange.markDone(); @@ -1744,7 +1744,7 @@ private IgniteInternalFuture deleteAsync(IgfsFileInfo info) { ldr.close(isCancelled()); } catch (IgniteException e) { - log.error("Failed to stop data loader while shutting down ggfs async delete thread.", e); + log.error("Failed to stop data loader while shutting down igfs async delete thread.", e); } finally { fut.onDone(); // Complete future. @@ -1755,7 +1755,7 @@ private IgniteInternalFuture deleteAsync(IgfsFileInfo info) { } finally { if (log.isDebugEnabled()) - log.debug("Stopping asynchronous ggfs file delete thread: " + name()); + log.debug("Stopping asynchronous igfs file delete thread: " + name()); IgniteBiTuple, IgfsFileInfo> req = delReqs.poll(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java index 02e44e4702b56..14f87adf7a6f2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java @@ -82,7 +82,7 @@ public class IgfsDeleteWorker extends IgfsThread { * @param ggfsCtx GGFS context. */ IgfsDeleteWorker(IgfsContext ggfsCtx) { - super("ggfs-delete-worker%" + ggfsCtx.ggfs().name() + "%" + ggfsCtx.kernalContext().localNodeId() + "%"); + super("igfs-delete-worker%" + ggfsCtx.igfs().name() + "%" + ggfsCtx.kernalContext().localNodeId() + "%"); this.ggfsCtx = ggfsCtx; @@ -91,7 +91,7 @@ public class IgfsDeleteWorker extends IgfsThread { evts = ggfsCtx.kernalContext().event(); - String ggfsName = ggfsCtx.ggfs().name(); + String ggfsName = ggfsCtx.igfs().name(); topic = F.isEmpty(ggfsName) ? TOPIC_GGFS : TOPIC_GGFS.topic(ggfsName); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java index c260f1f972226..65b309cb66bb2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java @@ -200,7 +200,7 @@ private void checkLaunchCoordinator(DiscoveryEvent discoEvt) { Collection nodes = discoEvt.topologyNodes(); for (ClusterNode node : nodes) { - if (node.order() < minNodeOrder && igfsCtx.ggfsNode(node)) + if (node.order() < minNodeOrder && igfsCtx.igfsNode(node)) minNodeOrder = node.order(); } @@ -556,7 +556,7 @@ private void syncStart() throws InterruptedException { F.node2id(), new P1() { @Override public boolean apply(ClusterNode n) { - return igfsCtx.ggfsNode(n); + return igfsCtx.igfsNode(n); } })); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelper.java index d9be1107660aa..84ab0bae0355f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelper.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelper.java @@ -45,5 +45,5 @@ public interface IgfsHelper { * @param key Key. * @return {@code True} if GGFS block key. */ - public abstract boolean isGgfsBlockKey(Object key); + public abstract boolean isIgfsBlockKey(Object key); } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java index 532dca5037974..6314ec34a1d10 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java @@ -48,7 +48,7 @@ public class IgfsHelperImpl implements IgfsHelper { } /** {@inheritDoc} */ - @Override public boolean isGgfsBlockKey(Object key) { + @Override public boolean isIgfsBlockKey(Object key) { return key instanceof IgfsBlockKey; } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java index 70a2e06578ff4..eee0187fb98b4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java @@ -282,7 +282,7 @@ private IgfsFileWorkerBatch newBatch(final IgfsPath path, OutputStream out) thro workerMap.remove(path, worker); // Worker is stopping. Remove it from map. } else { - worker = new IgfsFileWorker("ggfs-file-worker-" + path) { + worker = new IgfsFileWorker("igfs-file-worker-" + path) { @Override protected void onFinish() { workerMap.remove(path, this); } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java index a963bde9ed7c0..59c31b1f251ee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java @@ -68,7 +68,7 @@ class IgfsIpcHandler implements IgfsServerHandler { assert ggfsCtx != null; ctx = ggfsCtx.kernalContext(); - ggfs = ggfsCtx.ggfs(); + ggfs = ggfsCtx.igfs(); // Keep buffer size multiple of block size so no extra byte array copies is performed. bufSize = ggfsCtx.configuration().getBlockSize() * 2; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsJobImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsJobImpl.java index 3ccb404b90ed2..85ffc2a4a0963 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsJobImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsJobImpl.java @@ -37,7 +37,7 @@ public class IgfsJobImpl implements ComputeJob, GridInternalWrapper { private IgfsJob job; /** GGFS name. */ - private String ggfsName; + private String igfsName; /** GGFS path. */ private IgfsPath path; @@ -61,16 +61,16 @@ public class IgfsJobImpl implements ComputeJob, GridInternalWrapper { /** * @param job GGFS job. - * @param ggfsName GGFS name. + * @param igfsName GGFS name. * @param path Split path. * @param start Split start offset. * @param len Split length. * @param rslvr GGFS split resolver. */ - public IgfsJobImpl(IgfsJob job, String ggfsName, IgfsPath path, long start, long len, + public IgfsJobImpl(IgfsJob job, String igfsName, IgfsPath path, long start, long len, IgfsRecordResolver rslvr) { this.job = job; - this.ggfsName = ggfsName; + this.igfsName = igfsName; this.path = path; this.start = start; this.len = len; @@ -79,7 +79,7 @@ public IgfsJobImpl(IgfsJob job, String ggfsName, IgfsPath path, long start, long /** {@inheritDoc} */ @Override public Object execute() { - IgniteFs fs = ignite.fileSystem(ggfsName); + IgniteFs fs = ignite.fileSystem(igfsName); try (IgfsInputStream in = fs.open(path)) { IgfsFileRange split = new IgfsFileRange(path, start, len); @@ -89,7 +89,7 @@ public IgfsJobImpl(IgfsJob job, String ggfsName, IgfsPath path, long start, long if (split == null) { log.warning("No data found for split on local node after resolver is applied " + - "[ggfsName=" + ggfsName + ", path=" + path + ", start=" + start + ", len=" + len + ']'); + "[ggfsName=" + igfsName + ", path=" + path + ", start=" + start + ", len=" + len + ']'); return null; } @@ -100,7 +100,7 @@ public IgfsJobImpl(IgfsJob job, String ggfsName, IgfsPath path, long start, long return job.execute(fs, new IgfsFileRange(path, split.start(), split.length()), in); } catch (IOException e) { - throw new IgniteException("Failed to execute GGFS job for file split [ggfsName=" + ggfsName + + throw new IgniteException("Failed to execute GGFS job for file split [ggfsName=" + igfsName + ", path=" + path + ", start=" + start + ", len=" + len + ']', e); } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java index 34cbad58c455d..d2e6c5a772d31 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java @@ -1665,7 +1665,7 @@ else if (status.isDirectory()) "the secondary file system because the path points to a directory: " + path); IgfsFileInfo newInfo = new IgfsFileInfo(status.blockSize(), status.length(), affKey, - IgniteUuid.randomUuid(), igfsCtx.ggfs().evictExclude(path, false), status.properties()); + IgniteUuid.randomUuid(), igfsCtx.igfs().evictExclude(path, false), status.properties()); // Add new file info to the listing optionally removing the previous one. IgniteUuid oldId = putIfAbsentNonTx(parentInfo.id(), path.name(), newInfo); @@ -2299,7 +2299,7 @@ else if (created != null) // Recreate the path locally. IgfsFileInfo curInfo = status.isDirectory() ? new IgfsFileInfo(true, status.properties()) : new IgfsFileInfo(igfsCtx.configuration().getBlockSize(), status.length(), - igfsCtx.ggfs().evictExclude(curPath, false), status.properties()); + igfsCtx.igfs().evictExclude(curPath, false), status.properties()); IgniteUuid oldId = putIfAbsentNonTx(parentInfo.id(), components.get(i), curInfo); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopHelper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopHelper.java index 7f0a1ca4d0087..ca831459345cb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopHelper.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopHelper.java @@ -35,7 +35,7 @@ public class IgfsNoopHelper implements IgfsHelper { } /** {@inheritDoc} */ - @Override public boolean isGgfsBlockKey(Object key) { + @Override public boolean isIgfsBlockKey(Object key) { return false; } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java index 85088444a91da..42ed3a76b3cf7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java @@ -53,7 +53,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter { /** Converts context to GGFS. */ private static final IgniteClosure CTX_TO_GGFS = new C1() { @Override public IgniteFs apply(IgfsContext ggfsCtx) { - return ggfsCtx.ggfs(); + return ggfsCtx.igfs(); } }; @@ -120,7 +120,7 @@ public IgfsProcessor(GridKernalContext ctx) { // Stop GGFS instances. for (IgfsContext ggfsCtx : ggfsCache.values()) { if (log.isDebugEnabled()) - log.debug("Stopping ggfs: " + ggfsCtx.configuration().getName()); + log.debug("Stopping igfs: " + ggfsCtx.configuration().getName()); List mgrs = ggfsCtx.managers(); @@ -130,7 +130,7 @@ public IgfsProcessor(GridKernalContext ctx) { mgr.stop(cancel); } - ggfsCtx.ggfs().stop(); + ggfsCtx.igfs().stop(); } ggfsCache.clear(); @@ -143,7 +143,7 @@ public IgfsProcessor(GridKernalContext ctx) { @Override public void onKernalStop(boolean cancel) { for (IgfsContext ggfsCtx : ggfsCache.values()) { if (log.isDebugEnabled()) - log.debug("Stopping ggfs: " + ggfsCtx.configuration().getName()); + log.debug("Stopping igfs: " + ggfsCtx.configuration().getName()); List mgrs = ggfsCtx.managers(); @@ -175,7 +175,7 @@ public IgfsProcessor(GridKernalContext ctx) { @Override @Nullable public IgniteFs ggfs(@Nullable String name) { IgfsContext ggfsCtx = ggfsCache.get(maskName(name)); - return ggfsCtx == null ? null : ggfsCtx.ggfs(); + return ggfsCtx == null ? null : ggfsCtx.igfs(); } /** {@inheritDoc} */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java index 7ff573ac0937f..5e9fcb3152a70 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java @@ -67,7 +67,7 @@ public class IgfsServer { private final boolean mgmt; /** - * Constructs ggfs server manager. + * Constructs igfs server manager. * @param ggfsCtx GGFS context. * @param endpointCfg Endpoint configuration to start. * @param mgmt Management flag - if true, server is intended to be started for Visor. @@ -217,7 +217,7 @@ private class ClientWorker extends GridWorker { * @throws IgniteCheckedException If endpoint output stream cannot be obtained. */ protected ClientWorker(IpcEndpoint endpoint, int idx) throws IgniteCheckedException { - super(ggfsCtx.kernalContext().gridName(), "ggfs-client-worker-" + idx, log); + super(ggfsCtx.kernalContext().gridName(), "igfs-client-worker-" + idx, log); this.endpoint = endpoint; @@ -384,7 +384,7 @@ private class AcceptWorker extends GridWorker { * Creates accept worker. */ protected AcceptWorker() { - super(ggfsCtx.kernalContext().gridName(), "ggfs-accept-worker", log); + super(ggfsCtx.kernalContext().gridName(), "igfs-accept-worker", log); } /** {@inheritDoc} */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsThread.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsThread.java index 533277f956719..4ada13154ea0e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsThread.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsThread.java @@ -27,7 +27,7 @@ public abstract class IgfsThread extends Thread { * Creates {@code GGFS} add-hoc thread. */ protected IgfsThread() { - super("ggfs-worker"); + super("igfs-worker"); } /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/ggfs/VisorIgfsProfilerClearTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/ggfs/VisorIgfsProfilerClearTask.java index 4b3f73b590918..0065cc8fee369 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/ggfs/VisorIgfsProfilerClearTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/ggfs/VisorIgfsProfilerClearTask.java @@ -65,7 +65,7 @@ private VisorIgfsProfilerClearJob(String arg, boolean debug) { if (logsDir != null) { PathMatcher matcher = FileSystems.getDefault().getPathMatcher( - "glob:ggfs-log-" + arg + "-*.csv"); + "glob:igfs-log-" + arg + "-*.csv"); try (DirectoryStream dirStream = Files.newDirectoryStream(logsDir)) { for (Path p : dirStream) { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/ggfs/VisorIgfsProfilerTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/ggfs/VisorIgfsProfilerTask.java index d7f15d525debb..254f541406b85 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/ggfs/VisorIgfsProfilerTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/ggfs/VisorIgfsProfilerTask.java @@ -474,7 +474,7 @@ private Collection parse(Path logDir, String ggfsName) t Collection parsedFiles = new ArrayList<>(512); try (DirectoryStream dirStream = Files.newDirectoryStream(logDir)) { - PathMatcher matcher = FileSystems.getDefault().getPathMatcher("glob:ggfs-log-" + ggfsName + "-*.csv"); + PathMatcher matcher = FileSystems.getDefault().getPathMatcher("glob:igfs-log-" + ggfsName + "-*.csv"); for (Path p : dirStream) { if (matcher.matches(p.getFileName())) { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java index 7e688b1b1bf12..1a3b8eccc28ee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java @@ -75,7 +75,7 @@ public class VisorGridConfiguration implements Serializable { private Iterable caches; /** Ggfss. */ - private Iterable ggfss; + private Iterable igfss; /** Streamers. */ private Iterable streamers; @@ -301,15 +301,15 @@ public void caches(Iterable caches) { /** * @return Ggfss. */ - public Iterable ggfss() { - return ggfss; + public Iterable igfss() { + return igfss; } /** - * @param ggfss New ggfss. + * @param igfss New igfss. */ - public void ggfss(Iterable ggfss) { - this.ggfss = ggfss; + public void ggfss(Iterable igfss) { + this.igfss = igfss; } /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java index f2f64084d70e0..4ac93aa9b573d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java @@ -171,10 +171,10 @@ public static VisorIgfsConfiguration from(IgfsConfiguration ggfs) { } /** - * Construct data transfer object for ggfs configurations properties. + * Construct data transfer object for igfs configurations properties. * - * @param ggfss ggfs configurations. - * @return ggfs configurations properties. + * @param ggfss igfs configurations. + * @return igfs configurations properties. */ public static Iterable list(IgfsConfiguration[] ggfss) { if (ggfss == null) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java index f1b067f266364..33174aba1ec01 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java @@ -208,7 +208,7 @@ protected VisorNodeDataCollectorJobResult run(VisorNodeDataCollectorJobResult re ggfs(res); if (debug) - start0 = log(ignite.log(), "Collected ggfs", getClass(), start0); + start0 = log(ignite.log(), "Collected igfs", getClass(), start0); streamers(res); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java index 057fa52f2792e..622a3c25f9ad1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java @@ -599,16 +599,16 @@ public static VisorFileBlock readBlock(File file, long off, int blockSz, long la /** * Resolve GGFS profiler logs directory. * - * @param ggfs GGFS instance to resolve logs dir for. + * @param igfs GGFS instance to resolve logs dir for. * @return {@link Path} to log dir or {@code null} if not found. * @throws IgniteCheckedException if failed to resolve. */ - public static Path resolveGgfsProfilerLogsDir(IgniteFs ggfs) throws IgniteCheckedException { + public static Path resolveGgfsProfilerLogsDir(IgniteFs igfs) throws IgniteCheckedException { String logsDir; - if (ggfs instanceof IgfsEx) - logsDir = ((IgfsEx)ggfs).clientLogDirectory(); - else if (ggfs == null) + if (igfs instanceof IgfsEx) + logsDir = ((IgfsEx)igfs).clientLogDirectory(); + else if (igfs == null) throw new IgniteCheckedException("Failed to get profiler log folder (GGFS instance not found)"); else throw new IgniteCheckedException("Failed to get profiler log folder (unexpected GGFS instance type)"); diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java index 360e5eb8a73a1..733c17685d204 100644 --- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java @@ -89,7 +89,7 @@ protected IgfsConfiguration getGgfsConfiguration() throws IgniteCheckedException ggfsCfg.setDataCacheName("dataCache"); ggfsCfg.setMetaCacheName("metaCache"); - ggfsCfg.setName("ggfs"); + ggfsCfg.setName("igfs"); ggfsCfg.setBlockSize(512 * 1024); // Together with group blocks mapper will yield 64M per node groups. diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java index fbaa9ab618418..0f568979c4f30 100644 --- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java @@ -65,7 +65,7 @@ public class IgfsFragmentizerAbstractSelfTest extends IgfsCommonAbstractTest { IgfsConfiguration ggfsCfg = new IgfsConfiguration(); - ggfsCfg.setName("ggfs"); + ggfsCfg.setName("igfs"); ggfsCfg.setMetaCacheName(META_CACHE_NAME); ggfsCfg.setDataCacheName(DATA_CACHE_NAME); ggfsCfg.setBlockSize(GGFS_BLOCK_SIZE); @@ -126,7 +126,7 @@ protected CacheConfiguration dataConfiguration() { * @throws Exception If failed. */ protected void awaitFileFragmenting(int gridIdx, IgfsPath path) throws Exception { - IgfsEx ggfs = (IgfsEx)grid(gridIdx).fileSystem("ggfs"); + IgfsEx ggfs = (IgfsEx)grid(gridIdx).fileSystem("igfs"); IgfsMetaManager meta = ggfs.context().meta(); @@ -163,6 +163,6 @@ protected void awaitFileFragmenting(int gridIdx, IgfsPath path) throws Exception /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - grid(0).fileSystem("ggfs").format(); + grid(0).fileSystem("igfs").format(); } } diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java index a8b29015476e6..f42d5a893cce4 100644 --- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java @@ -36,7 +36,7 @@ public class IgfsFragmentizerSelfTest extends IgfsFragmentizerAbstractSelfTest { * @throws Exception If failed. */ public void testReadFragmentizing() throws Exception { - IgniteFs ggfs = grid(0).fileSystem("ggfs"); + IgniteFs ggfs = grid(0).fileSystem("igfs"); IgfsPath path = new IgfsPath("/someFile"); @@ -108,7 +108,7 @@ private void checkAppendFragmentizing(int chunkSize, boolean rotate) throws Exce int fileSize = 30 * GGFS_GROUP_SIZE * GGFS_BLOCK_SIZE; while (written < fileSize) { - IgniteFs ggfs = grid(ggfsIdx).fileSystem("ggfs"); + IgniteFs ggfs = grid(ggfsIdx).fileSystem("igfs"); try (IgfsOutputStream out = ggfs.append(path, true)) { byte[] data = new byte[chunkSize]; @@ -131,7 +131,7 @@ private void checkAppendFragmentizing(int chunkSize, boolean rotate) throws Exce } } - IgniteFs ggfs = grid(0).fileSystem("ggfs"); + IgniteFs ggfs = grid(0).fileSystem("igfs"); try (IgfsInputStream in = ggfs.open(path)) { i = 0; @@ -180,7 +180,7 @@ private void checkFlushFragmentizing(int chunkSize) throws Exception { int fileSize = 50 * GGFS_GROUP_SIZE * GGFS_BLOCK_SIZE; - IgniteFs ggfs = grid(0).fileSystem("ggfs"); + IgniteFs ggfs = grid(0).fileSystem("igfs"); byte[] chunk = new byte[chunkSize]; @@ -223,7 +223,7 @@ private void checkFlushFragmentizing(int chunkSize) throws Exception { * @throws Exception If failed. */ public void testDeleteFragmentizing() throws Exception { - IgfsImpl ggfs = (IgfsImpl)grid(0).fileSystem("ggfs"); + IgfsImpl ggfs = (IgfsImpl)grid(0).fileSystem("igfs"); for (int i = 0; i < 30; i++) { IgfsPath path = new IgfsPath("/someFile" + i); diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerTopologySelfTest.java index 8ffe85130e69d..d2c44e290f0a8 100644 --- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerTopologySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerTopologySelfTest.java @@ -33,7 +33,7 @@ public void testCoordinatorLeave() throws Exception { try { IgfsPath path = new IgfsPath("/someFile"); - IgniteFs ggfs = grid(1).fileSystem("ggfs"); + IgniteFs ggfs = grid(1).fileSystem("igfs"); try (IgfsOutputStream out = ggfs.create(path, true)) { for (int i = 0; i < 10 * GGFS_GROUP_SIZE; i++) diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsPathSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsPathSelfTest.java index fa3149ce5a018..dec0bb6c39d1b 100644 --- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsPathSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsPathSelfTest.java @@ -38,7 +38,7 @@ public class IgfsPathSelfTest extends GridCommonAbstractTest { private final Marshaller marshaller = new OptimizedMarshaller(); /** - * Test public methods of ggfs path. + * Test public methods of igfs path. * * @throws Exception In case of any exception. */ @@ -87,7 +87,7 @@ private T mu(T obj) throws IgniteCheckedException { } /** - * Test ggfs path constructors. + * Test igfs path constructors. * * @throws Exception In case of any exception. */ @@ -119,7 +119,7 @@ public void testConstructors() throws Exception { } /** - * Validate ggfs path constructor fails with specified exception. + * Validate igfs path constructor fails with specified exception. * * @param cls Expected exception. * @param args Constructor arguments. Null-values are passed as Class instancies: null-string => String.class. diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java index 23e8109ee81dd..3903c6f942ac9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java @@ -42,7 +42,7 @@ public class GridCacheLeakTest extends GridCommonAbstractTest { private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Cache name. */ - private static final String CACHE_NAME = "ggfs-data"; + private static final String CACHE_NAME = "igfs-data"; /** Atomicity mode. */ private CacheAtomicityMode atomicityMode; diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java index 9e31ba875a5dd..3b5c38b379ffe 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java @@ -44,10 +44,10 @@ @SuppressWarnings({"ConstantConditions", "ThrowableResultOfMethodCallIgnored"}) public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAbstractTest { /** Primary GGFS name. */ - private static final String GGFS_PRIMARY = "ggfs-primary"; + private static final String GGFS_PRIMARY = "igfs-primary"; /** Primary GGFS name. */ - private static final String GGFS_SECONDARY = "ggfs-secondary"; + private static final String GGFS_SECONDARY = "igfs-secondary"; /** Secondary file system REST endpoint configuration map. */ private static final Map SECONDARY_REST_CFG = new HashMap() {{ diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java index e7a9883eb1df3..bd0bb17e4b2e7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java @@ -154,9 +154,9 @@ protected IgfsAbstractSelfTest(IgfsMode mode, CacheMemoryMode memoryMode) { ggfsSecondary = (IgfsImpl) igniteSecondary.fileSystem("ignitefs-secondary"); - Ignite ignite = startGridWithGgfs("ignite", "ggfs", mode, ggfsSecondary, PRIMARY_REST_CFG); + Ignite ignite = startGridWithGgfs("ignite", "igfs", mode, ggfsSecondary, PRIMARY_REST_CFG); - ggfs = (IgfsImpl) ignite.fileSystem("ggfs"); + ggfs = (IgfsImpl) ignite.fileSystem("igfs"); } /** {@inheritDoc} */ @@ -2282,9 +2282,9 @@ protected void checkExist(IgfsImpl ggfs, IgfsImpl ggfsSecondary, IgfsPath... pat */ protected void checkExist(IgfsImpl ggfs, IgfsPath... paths) throws IgniteCheckedException { for (IgfsPath path : paths) { - assert ggfs.context().meta().fileId(path) != null : "Path doesn't exist [ggfs=" + ggfs.name() + + assert ggfs.context().meta().fileId(path) != null : "Path doesn't exist [igfs=" + ggfs.name() + ", path=" + path + ']'; - assert ggfs.exists(path) : "Path doesn't exist [ggfs=" + ggfs.name() + ", path=" + path + ']'; + assert ggfs.exists(path) : "Path doesn't exist [igfs=" + ggfs.name() + ", path=" + path + ']'; } } @@ -2313,9 +2313,9 @@ protected void checkNotExist(IgfsImpl ggfs, IgfsImpl ggfsSecondary, IgfsPath... */ protected void checkNotExist(IgfsImpl ggfs, IgfsPath... paths) throws Exception { for (IgfsPath path : paths) { - assert ggfs.context().meta().fileId(path) == null : "Path exists [ggfs=" + ggfs.name() + ", path=" + + assert ggfs.context().meta().fileId(path) == null : "Path exists [igfs=" + ggfs.name() + ", path=" + path + ']'; - assert !ggfs.exists(path) : "Path exists [ggfs=" + ggfs.name() + ", path=" + path + ']'; + assert !ggfs.exists(path) : "Path exists [igfs=" + ggfs.name() + ", path=" + path + ']'; } } @@ -2364,7 +2364,7 @@ protected void checkFileContent(IgfsImpl ggfs, IgfsPath file, @Nullable byte[].. is.readFully(0, buf); - assert Arrays.equals(chunk, buf) : "Bad chunk [ggfs=" + ggfs.name() + ", chunkIdx=" + chunkIdx + + assert Arrays.equals(chunk, buf) : "Bad chunk [igfs=" + ggfs.name() + ", chunkIdx=" + chunkIdx + ", expected=" + Arrays.toString(chunk) + ", actual=" + Arrays.toString(buf) + ']'; chunkIdx++; @@ -2447,7 +2447,7 @@ public static void clear(IgniteFs ggfs) throws Exception { U.join(entry.getValue()); } - // Clear ggfs. + // Clear igfs. ggfs.format(); } } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java index b0df8ec1826fd..25070e235713f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java @@ -60,7 +60,7 @@ public class IgfsCacheSelfTest extends IgfsCommonAbstractTest { ggfsCfg.setMetaCacheName(META_CACHE_NAME); ggfsCfg.setDataCacheName(DATA_CACHE_NAME); - ggfsCfg.setName("ggfs"); + ggfsCfg.setName("igfs"); cfg.setGgfsConfiguration(ggfsCfg); 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 22aba48d64e17..3d03b75d5b239 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 @@ -78,7 +78,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest { /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - IgfsEx ggfs = (IgfsEx)grid(0).fileSystem("ggfs"); + IgfsEx ggfs = (IgfsEx)grid(0).fileSystem("igfs"); mgr = ggfs.context().data(); } @@ -95,15 +95,15 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest { cfg.setDiscoverySpi(discoSpi); - IgfsConfiguration ggfsCfg = new IgfsConfiguration(); + IgfsConfiguration igfsCfg = new IgfsConfiguration(); - ggfsCfg.setMetaCacheName(META_CACHE_NAME); - ggfsCfg.setDataCacheName(DATA_CACHE_NAME); - ggfsCfg.setBlockSize(GGFS_BLOCK_SIZE); - ggfsCfg.setName("ggfs"); - ggfsCfg.setBlockSize(BLOCK_SIZE); + igfsCfg.setMetaCacheName(META_CACHE_NAME); + igfsCfg.setDataCacheName(DATA_CACHE_NAME); + igfsCfg.setBlockSize(GGFS_BLOCK_SIZE); + igfsCfg.setName("igfs"); + igfsCfg.setBlockSize(BLOCK_SIZE); - cfg.setGgfsConfiguration(ggfsCfg); + cfg.setGgfsConfiguration(igfsCfg); return cfg; } 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 84fdafeb2be64..3830cdf7910f0 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 @@ -58,7 +58,7 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest { /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - IgfsEx ggfs = (IgfsEx)grid(0).fileSystem("ggfs"); + IgfsEx ggfs = (IgfsEx)grid(0).fileSystem("igfs"); mgr = ggfs.context().meta(); } @@ -79,7 +79,7 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest { ggfsCfg.setMetaCacheName(META_CACHE_NAME); ggfsCfg.setDataCacheName(DATA_CACHE_NAME); - ggfsCfg.setName("ggfs"); + ggfsCfg.setName("igfs"); cfg.setGgfsConfiguration(ggfsCfg); @@ -111,7 +111,7 @@ protected CacheConfiguration cacheConfiguration(String cacheName) { /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - mgr.igfsCtx.ggfs().format(); + mgr.igfsCtx.igfs().format(); } /** {@inheritDoc} */ 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 c38313882cb5c..d282f1119a34a 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 @@ -38,10 +38,10 @@ */ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest { /** Primary GGFS name. */ - private static final String GGFS_PRIMARY = "ggfs-primary"; + private static final String GGFS_PRIMARY = "igfs-primary"; /** Primary GGFS name. */ - private static final String GGFS_SECONDARY = "ggfs-secondary"; + private static final String GGFS_SECONDARY = "igfs-secondary"; /** Secondary file system REST endpoint configuration map. */ private static final Map SECONDARY_REST_CFG = new HashMap(){{ 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 3904766b02490..09e0e0d8ee0b3 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 @@ private void startUp() throws Exception { ggfsCfg.setDataCacheName("partitioned"); ggfsCfg.setMetaCacheName("replicated"); - ggfsCfg.setName("ggfs"); + ggfsCfg.setName("igfs"); ggfsCfg.setBlockSize(512 * 1024); if (setNullMode) @@ -120,7 +120,7 @@ else if (mode != null) IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setGridName("ggfs-grid"); + cfg.setGridName("igfs-grid"); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); @@ -135,7 +135,7 @@ else if (mode != null) grid = (IgniteEx)G.start(cfg); - ggfs = (IgfsImpl)grid.fileSystem("ggfs"); + ggfs = (IgfsImpl)grid.fileSystem("igfs"); } /** @@ -148,7 +148,7 @@ private void startUpSecondary() throws Exception { 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() {{ @@ -177,7 +177,7 @@ private void startUpSecondary() throws Exception { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setGridName("ggfs-grid-secondary"); + cfg.setGridName("igfs-grid-secondary"); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); @@ -190,7 +190,7 @@ private void startUpSecondary() throws Exception { 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"); } /** 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 7f3b2498642c0..270bc0d94a7ee 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 int nodesCount() { /** @return FS name. */ public String ggfsName() { - return "ggfs"; + return "igfs"; } /** @throws Exception If failed. */ 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 7cd254d4cdaa0..d83e4f80c92d0 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 void testLocalIfAffinityMapperIsWrongClass() throws Exception { 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); 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 e35ccedc921db..2267fd9dc1f3d 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 @@ protected IgfsConfiguration igniteFsConfiguration(@Nullable String endPntType, @ ggfsConfiguration.setDataCacheName("partitioned"); ggfsConfiguration.setMetaCacheName("replicated"); - ggfsConfiguration.setName("ggfs" + UUID.randomUUID()); + ggfsConfiguration.setName("igfs" + UUID.randomUUID()); ggfsConfiguration.setManagementPort(mgmtPort.getAndIncrement()); if (endPntCfg != null) 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 c71a6449e59a3..c6ecbe4ffa344 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 @@ private void check() throws Exception { 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 @@ private void check() throws Exception { int expSize = expSizes.get(id) != null ? expSizes.get(id) : 0; - assert expSize == cache.ggfsDataSpaceUsed(); + assert expSize == cache.igfsDataSpaceUsed(); } } else { @@ -393,7 +393,7 @@ private void check() throws Exception { GridCacheAdapter cache = cache(id); - assertEquals(totalSize, cache.ggfsDataSpaceUsed()); + assertEquals(totalSize, cache.igfsDataSpaceUsed()); } } @@ -413,7 +413,7 @@ private void check() throws Exception { for (int i = 0; i < GRID_CNT; i++) { GridCacheAdapter 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 @@ private void checkPreload() throws Exception { 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 @@ private void checkPreload() throws Exception { int expSize = expSizes.get(id) != null ? expSizes.get(id) : 0; - assertEquals("For node: " + id, expSize, cache.ggfsDataSpaceUsed()); + assertEquals("For node: " + id, expSize, cache.igfsDataSpaceUsed()); } } 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 3810f41ba7e8c..ddf6214854928 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 void testCreateFileColocated() throws Exception { /** @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 void testCreateFileFragmented() throws Exception { 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"))) { 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 25400a1cc5279..7b00d5d5871ca 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 @@ private IgniteConfiguration config(int idx) { ggfsCfg.setDataCacheName("dataCache"); ggfsCfg.setMetaCacheName("metaCache"); - ggfsCfg.setName("ggfs"); + ggfsCfg.setName("igfs"); ggfsCfg.setBlockSize(BLOCK_SIZE); ggfsCfg.setDefaultMode(PRIMARY); ggfsCfg.setFragmentizerEnabled(false); 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 edf2464027acf..625f1674af726 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} */ 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 d913a50b02db2..75c3c59043b2a 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 static void main(String[] args) throws Exception{ ggfsCfg.setDataCacheName("partitioned"); ggfsCfg.setMetaCacheName("partitioned"); - ggfsCfg.setName("ggfs"); + ggfsCfg.setName("igfs"); cfg.setGgfsConfiguration(ggfsCfg); 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 b9bd44fecc402..c4cd4afd3c8d8 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 @@ * or passed to map-reduce task directly when using Hadoop driver for GGFS file system: *
    *
  • - * {@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. *
    • *
  • - * {@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. *
    • - *
  • {@code fs.ggfs.[name].log.dir} - specifies log directory where sampling log files should be placed.
    • + *
  • {@code fs.igfs.[name].log.dir} - specifies log directory where sampling log files should be placed.
    • *
  • - * {@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. *
    • *
  • - * {@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}. *
    • *
  • - * {@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. *
    • *
* 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}. *

* Sample configuration that can be placed to {@code core-site.xml} file: * 

  *     <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>
  *
* Parameters could also be specified per mapreduce job, e.g. * 
- * 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
  *
* 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"; } 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 ae9b3cfff1a2f..c5e9b46c494f8 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 @@ * 
  *  <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>
  *
@@ -82,7 +82,7 @@ */ 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 void colocateFileWrites(boolean colocateFileWrites) { 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 void colocateFileWrites(boolean colocateFileWrites) { 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 @@ private FileStatus toPrimary(FileStatus status) { * @return Hadoop path. */ private Path convert(IgfsPath path) { - return new Path(GGFS_SCHEME, uriAuthority, path.toString()); + return new Path(IGFS_SCHEME, uriAuthority, path.toString()); } /** 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 028c97591ae19..03d08e5a56315 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 @@ * 
  *  <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>
  *
@@ -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 IgfsHadoopFileSystem(URI name, Configuration cfg) throws URISyntaxExcepti 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 @@ private void initialize(URI name, Configuration cfg) throws IOException { 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 @@ private FileStatus toPrimary(FileStatus status) { * @return Hadoop path. */ private Path convert(IgfsPath path) { - return new Path(GGFS_SCHEME, uriAuthority, path.toString()); + return new Path(IGFS_SCHEME, uriAuthority, path.toString()); } /** 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 42feaae9bfabf..5117ab357f8b1 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()); 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 dcfaf4d0079d5..2a0a84c2b701d 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 @@ */ 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. 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 5c8a46597144f..868945dfe80b8 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 @@ private UUID nodeForSplit(GridHadoopInputSplit split, Collection topIds, M 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; 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 c25ca5c9139d2..7f102149aaeae 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 @@ private Configuration config(int port) { 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; } 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 8f140ff25adb0..0735c1f80e213 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 abstract static class PrimarySecondaryTest extends IgfsEventsAbstractSelf IgfsConfiguration ggfsCfg = super.getGgfsConfiguration(); ggfsCfg.setSecondaryFileSystem(new IgfsHadoopFileSystemWrapper( - "ggfs://ggfs-secondary:grid-secondary@127.0.0.1:11500/", + "igfs://igfs-secondary:grid-secondary@127.0.0.1:11500/", "modules/core/src/test/config/hadoop/core-site-secondary.xml")); return ggfsCfg; @@ -129,7 +129,7 @@ public abstract static class PrimarySecondaryTest extends IgfsEventsAbstractSelf protected IgfsConfiguration getSecondaryGgfsConfiguration() throws IgniteCheckedException { IgfsConfiguration ggfsCfg = super.getGgfsConfiguration(); - ggfsCfg.setName("ggfs-secondary"); + ggfsCfg.setName("igfs-secondary"); ggfsCfg.setDefaultMode(PRIMARY); ggfsCfg.setIpcEndpointConfiguration(new HashMap(){{ put("type", "tcp"); @@ -175,7 +175,7 @@ protected IgfsConfiguration getSecondaryGgfsConfiguration() throws IgniteChecked Ignite secG = G.start(cfg); - return secG.fileSystem("ggfs-secondary"); + return secG.fileSystem("igfs-secondary"); } } @@ -216,7 +216,7 @@ public abstract static class LoopbackPrimarySecondaryTest extends PrimarySeconda IgfsConfiguration ggfsCfg = super.getGgfsConfiguration(); ggfsCfg.setSecondaryFileSystem(new IgfsHadoopFileSystemWrapper( - "ggfs://ggfs-secondary:grid-secondary@127.0.0.1:11500/", + "igfs://igfs-secondary:grid-secondary@127.0.0.1:11500/", "modules/core/src/test/config/hadoop/core-site-loopback-secondary.xml")); return ggfsCfg; @@ -226,7 +226,7 @@ public abstract static class LoopbackPrimarySecondaryTest extends PrimarySeconda @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() {{ put("type", "tcp"); 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 52d35bfca503b..4671e43560e3d 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 @@ protected IgfsConfiguration ggfsConfiguration(String gridName) throws IgniteChec 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 void testStatus() throws Exception { 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 void testZeroReplicationFactor() throws Exception { 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 void run() { * @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 void testClientReconnect() throws Exception { 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() { @@ -1773,7 +1773,7 @@ public void testClientReconnectMultithreaded() throws Exception { for (Map.Entry 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 void testClientReconnectMultithreaded() throws Exception { 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; } 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 d39595f143b1a..47e1c8664d3ed 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 IgfsHadoop20FileSystemLoopbackPrimarySelfTest() { /** {@inheritDoc} */ @Override protected String primaryFileSystemUriPath() { - return "ggfs://ggfs:" + getTestGridName(0) + "@/"; + return "igfs://igfs:" + getTestGridName(0) + "@/"; } /** {@inheritDoc} */ 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 59ea54db8b8fd..631f1882c0b43 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 IgfsHadoop20FileSystemShmemPrimarySelfTest() { /** {@inheritDoc} */ @Override protected String primaryFileSystemUriPath() { - return "ggfs://ggfs:" + getTestGridName(0) + "@/"; + return "igfs://igfs:" + getTestGridName(0) + "@/"; } /** {@inheritDoc} */ 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 20822ef3d035b..54fad39325c6f 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:grid-secondary@127.0.0.1:11500/"; + protected static final String SECONDARY_URI = "igfs://igfs-secondary:grid-secondary@127.0.0.1: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 @@ protected Ignite startGridWithGgfs(String gridName, String ggfsName, IgfsMode mo 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 void testOpenPrefetchOverride() throws Exception { 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); 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 d1363cc136124..d0c6e8f673cff 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 @@ @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:grid_secondary@127.0.0.1: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 @@ protected IgfsHadoopFileSystemAbstractSelfTest(IgfsMode mode, boolean skipEmbed, @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 @@ protected IgfsConfiguration ggfsConfiguration(String gridName) throws IgniteChec cfg.setDataCacheName("partitioned"); cfg.setMetaCacheName("replicated"); - cfg.setName("ggfs"); + cfg.setName("igfs"); cfg.setPrefetchBlocks(1); cfg.setDefaultMode(mode); @@ -424,7 +424,7 @@ public void testIpcCache() throws Exception { 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 void testZeroReplicationFactor() throws Exception { 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 void testClientReconnectMultithreaded() throws Exception { for (Map.Entry 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 @@ private Path convertPath(Path path) throws Exception { 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); 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 fe22bc29dacd6..d671394947a9a 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() {{ put("type", "tcp"); @@ -125,7 +125,7 @@ public void testOutputStreamDeferredException() throws Exception { 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); 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 f4b3580850fd0..6e238097f0897 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 @@ private void checkInvalid(final String authority) throws Exception { * @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 @@ private static FileSystem fileSystem(String authority) throws Exception { 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); 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 22213a502c9f4..7767b9735a1cb 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() {{ @@ -151,16 +151,16 @@ public void testIpcCache() throws Exception { Map cache = (Map)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 void testIpcCache() throws Exception { 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()); 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 1c59643948766..ee838a56acad1 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 @@ private void removeLogs() throws Exception { File[] logs = dir.listFiles(new FilenameFilter() { @Override public boolean accept(File dir, String name) { - return name.startsWith("ggfs-log-"); + return name.startsWith("igfs-log-"); } }); 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 b80fbe9bdb572..ec78c418c4dca 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 @@ private void startUp() throws Exception { ggfsCfg.setDataCacheName("partitioned"); ggfsCfg.setMetaCacheName("replicated"); - ggfsCfg.setName("ggfs"); + ggfsCfg.setName("igfs"); ggfsCfg.setBlockSize(512 * 1024); ggfsCfg.setDefaultMode(PRIMARY); ggfsCfg.setIpcEndpointConfiguration(new HashMap() {{ @@ -108,7 +108,7 @@ private void startUp() throws Exception { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setGridName("ggfs-grid"); + cfg.setGridName("igfs-grid"); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); @@ -123,7 +123,7 @@ private void startUp() throws Exception { Ignite g = G.start(cfg); - ggfs = (IgfsEx)g.fileSystem("ggfs"); + ggfs = (IgfsEx)g.fileSystem("igfs"); ggfs.globalSampling(sampling); @@ -297,14 +297,14 @@ private IgfsHadoopFileSystem fileSystem() throws Exception { 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); } /** 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 a42681480bda2..6a3eaa59b940f 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 @@ private void startUp() throws Exception { 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 @@ private void startUp() throws Exception { ggfsCfg.setManagementPort(-1); ggfsCfg.setSecondaryFileSystem(new IgfsHadoopFileSystemWrapper( - "ggfs://ggfs-secondary:ggfs-grid-secondary@127.0.0.1:11500/", + "igfs://igfs-secondary:igfs-grid-secondary@127.0.0.1:11500/", "modules/core/src/test/config/hadoop/core-site-loopback-secondary.xml")); CacheConfiguration cacheCfg = defaultCacheConfiguration(); @@ -122,7 +122,7 @@ private void startUp() throws Exception { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setGridName("ggfs-grid"); + cfg.setGridName("igfs-grid"); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); @@ -140,9 +140,9 @@ private void startUp() throws Exception { 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 @@ private void startUpSecondary() throws Exception { 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() {{ @@ -184,7 +184,7 @@ private void startUpSecondary() throws Exception { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setGridName("ggfs-grid-secondary"); + cfg.setGridName("igfs-grid-secondary"); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); 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 5c8ef123cfb6c..01498bcf74880 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 @@ *
  • -primaryOnly {true|false} if 'true' then creates files only in directory named 'primary'
    • * * Note: GGFS logging is disabled by default, to enable logging it is necessary to set flag - * 'fs.ggfs..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..log.dir'. + * 'fs.igfs..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..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; 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 53d79f7b94973..8696f9db456f8 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() {{ put("type", "shmem"); @@ -146,7 +146,7 @@ protected Configuration getFileSystemConfig() { */ 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); 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 7a7ccb90d4d20..7b1858973412f 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 @@ protected int gridCount() { */ 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 @@ protected void setupFileSystems(Configuration cfg) { * @return GGFS scheme for test. */ protected String ggfsScheme() { - return "ggfs://:" + getTestGridName(0) + "@/"; + return "igfs://:" + getTestGridName(0) + "@/"; } } 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 dbe2bb143444a..7665979fcb29b 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; 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 a073b21e88537..6e417140efa56 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 @@ private static boolean ensureEmpty(UUID nodeId) { * @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 @@ private static class MockIgfs implements IgfsEx { 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; } 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 05c5a2e16595a..ceb5088c604a4 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 static void main(String[] args) throws IgniteCheckedException { 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"); 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 0b4972d5619dd..82c0cedb29352 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 void testMapRun() throws Exception { 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 void testMapRun() throws Exception { 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 void testMapCombineRun() throws Exception { 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 void testMapCombineRun() throws Exception { 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 void testMapperException() throws Exception { 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 void testMapperException() throws Exception { 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 @@ private Configuration prepareJobForCancelling() throws Exception { 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()); 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 7ae01678a4704..85de25c532db6 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 void testSimpleTaskSubmit() throws Exception { 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 void testMapperException() throws Exception { 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()); 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 0fa6991b3e4b6..a6c920283762f 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;