# IGNITE-226: WIP.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5e12908b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5e12908b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5e12908b Branch: refs/heads/ignite-226 Commit: 5e12908b8393b7b08e632298beb2c5341b915f9e Parents: 9b49a58 Author: vozerov-gridgain <[email protected]> Authored: Fri Feb 13 14:48:16 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Fri Feb 13 14:48:16 2015 +0300 ---------------------------------------------------------------------- .../examples/ignitefs/IgfsMapReduceExample.java | 2 +- .../configuration/IgniteConfiguration.java | 2 +- .../mapreduce/IgfsInputStreamJobAdapter.java | 8 +- .../apache/ignite/igfs/mapreduce/IgfsJob.java | 4 +- .../apache/ignite/igfs/mapreduce/IgfsTask.java | 6 +- .../ignite/igfs/mapreduce/IgfsTaskArgs.java | 2 +- .../apache/ignite/igfs/mapreduce/package.html | 2 +- .../ignite/internal/IgniteComponentType.java | 16 +- .../org/apache/ignite/internal/IgniteEx.java | 8 +- .../apache/ignite/internal/IgniteKernal.java | 6 +- .../processors/igfs/IgfsAttributes.java | 16 +- .../internal/processors/igfs/IgfsContext.java | 8 +- .../processors/igfs/IgfsDataManager.java | 19 +- .../processors/igfs/IgfsDeleteWorker.java | 26 +- .../internal/processors/igfs/IgfsImpl.java | 2 +- .../processors/igfs/IgfsIpcHandler.java | 20 +- .../internal/processors/igfs/IgfsJobImpl.java | 4 +- .../internal/processors/igfs/IgfsProcessor.java | 24 +- .../internal/processors/igfs/IgfsServer.java | 2 +- .../processors/igfs/IgfsTaskArgsImpl.java | 2 +- .../hadoop/core-site-loopback-secondary.xml | 16 +- .../test/config/hadoop/core-site-loopback.xml | 12 +- .../test/config/hadoop/core-site-secondary.xml | 12 +- .../core/src/test/config/hadoop/core-site.xml | 10 +- .../ignite/igfs/IgfsEventsAbstractSelfTest.java | 22 +- .../igfs/IgfsFragmentizerAbstractSelfTest.java | 28 +- .../ignite/igfs/IgfsFragmentizerSelfTest.java | 64 +- .../igfs/IgfsFragmentizerTopologySelfTest.java | 8 +- .../processors/igfs/IgfsAbstractSelfTest.java | 486 ++++++------- .../processors/igfs/IgfsCacheSelfTest.java | 10 +- .../igfs/IgfsDualAbstractSelfTest.java | 690 +++++++++---------- .../processors/igfs/IgfsTaskSelfTest.java | 2 +- .../GridHadoopDefaultMapReducePlanner.java | 2 +- .../apache/ignite/igfs/IgfsEventsTestSuite.java | 34 +- ...idHadoopDefaultMapReducePlannerSelfTest.java | 2 +- 35 files changed, 789 insertions(+), 788 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/examples/src/main/java/org/apache/ignite/examples/ignitefs/IgfsMapReduceExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/ignitefs/IgfsMapReduceExample.java b/examples/src/main/java/org/apache/ignite/examples/ignitefs/IgfsMapReduceExample.java index fdb31b4..4c17ee7 100644 --- a/examples/src/main/java/org/apache/ignite/examples/ignitefs/IgfsMapReduceExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/ignitefs/IgfsMapReduceExample.java @@ -173,7 +173,7 @@ public class IgfsMapReduceExample { } /** {@inheritDoc} */ - @Override public Object execute(IgniteFs igniteFs, IgfsRangeInputStream in) throws IgniteException, IOException { + @Override public Object execute(IgniteFs igfs, IgfsRangeInputStream in) throws IgniteException, IOException { Collection<Line> res = null; long start = in.startOffset(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index ebaaff6..7854f4b 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@ -1050,7 +1050,7 @@ public class IgniteConfiguration { * @param poolSize Executor service to use for outgoing GGFS messages. * @see IgniteConfiguration#getIgfsThreadPoolSize() */ - public void setGgfsThreadPoolSize(int poolSize) { + public void setIgfsThreadPoolSize(int poolSize) { this.igfsPoolSize = poolSize; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsInputStreamJobAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsInputStreamJobAdapter.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsInputStreamJobAdapter.java index 99b79f3..b63b717 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsInputStreamJobAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsInputStreamJobAdapter.java @@ -32,21 +32,21 @@ import java.io.*; */ public abstract class IgfsInputStreamJobAdapter extends IgfsJobAdapter { /** {@inheritDoc} */ - @Override public final Object execute(IgniteFs ggfs, IgfsFileRange range, IgfsInputStream in) + @Override public final Object execute(IgniteFs igfs, IgfsFileRange range, IgfsInputStream in) throws IgniteException, IOException { in.seek(range.start()); - return execute(ggfs, new IgfsRangeInputStream(in, range)); + return execute(igfs, new IgfsRangeInputStream(in, range)); } /** * Executes this job. * - * @param ggfs GGFS instance. + * @param igfs IGFS instance. * @param in Input stream. * @return Execution result. * @throws IgniteException If execution failed. * @throws IOException If IO exception encountered while working with stream. */ - public abstract Object execute(IgniteFs ggfs, IgfsRangeInputStream in) throws IgniteException, IOException; + public abstract Object execute(IgniteFs igfs, IgfsRangeInputStream in) throws IgniteException, IOException; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJob.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJob.java index 5057001..fe14c1b 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJob.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJob.java @@ -44,7 +44,7 @@ public interface IgfsJob { /** * Executes this job. * - * @param ggfs GGFS instance. + * @param igfs GGFS instance. * @param range File range aligned to record boundaries. * @param in Input stream for split file. This input stream is not aligned to range and points to file start * by default. @@ -52,7 +52,7 @@ public interface IgfsJob { * @throws IgniteException If execution failed. * @throws IOException If file system operation resulted in IO exception. */ - public Object execute(IgniteFs ggfs, IgfsFileRange range, IgfsInputStream in) throws IgniteException, + public Object execute(IgniteFs igfs, IgfsFileRange range, IgfsInputStream in) throws IgniteException, IOException; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTask.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTask.java index bcfdf92..3224829 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTask.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTask.java @@ -88,8 +88,8 @@ public abstract class IgfsTask<T, R> extends ComputeTaskAdapter<IgfsTaskArgs<T>, assert ignite != null; assert args != null; - IgniteFs fs = ignite.fileSystem(args.ggfsName()); - IgfsProcessorAdapter ggfsProc = ((IgniteKernal) ignite).context().ggfs(); + IgniteFs fs = ignite.fileSystem(args.igfsName()); + IgfsProcessorAdapter igfsProc = ((IgniteKernal) ignite).context().ggfs(); Map<ComputeJob, ClusterNode> splitMap = new HashMap<>(); @@ -126,7 +126,7 @@ public abstract class IgfsTask<T, R> extends ComputeTaskAdapter<IgfsTaskArgs<T>, IgfsJob job = createJob(path, new IgfsFileRange(file.path(), loc.start(), loc.length()), args); if (job != null) { - ComputeJob jobImpl = ggfsProc.createJob(job, fs.name(), file.path(), loc.start(), + ComputeJob jobImpl = igfsProc.createJob(job, fs.name(), file.path(), loc.start(), loc.length(), args.recordResolver()); splitMap.put(jobImpl, node); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTaskArgs.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTaskArgs.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTaskArgs.java index ede741d..994e485 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTaskArgs.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTaskArgs.java @@ -42,7 +42,7 @@ public interface IgfsTaskArgs<T> { * * @return GGFS name. */ - public String ggfsName(); + public String igfsName(); /** * Gets file paths to process. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/package.html ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/package.html b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/package.html index 330c08f..13eff24 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/package.html +++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/package.html @@ -19,6 +19,6 @@ <html> <body> <!-- Package description. --> - Contains APIs for In-Memory MapReduce over GGFS. + Contains APIs for In-Memory MapReduce over IGFS. </body> </html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java index 120cb65..f7a3a9e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java @@ -26,10 +26,10 @@ import java.lang.reflect.*; * Component type. */ public enum IgniteComponentType { - /** GGFS. */ - GGFS( - "org.apache.ignite.internal.processors.fs.IgniteFsNoopProcessor", - "org.apache.ignite.internal.processors.fs.IgniteFsProcessor", + /** IGFS. */ + IGFS( + "org.apache.ignite.internal.processors.igfs.IgfsNoopProcessor", + "org.apache.ignite.internal.processors.igfs.IgfsProcessor", "ignite-hadoop" ), @@ -40,10 +40,10 @@ public enum IgniteComponentType { "ignite-hadoop" ), - /** GGFS helper component. */ - GGFS_HELPER( - "org.apache.ignite.internal.processors.fs.IgniteFsNoopHelper", - "org.apache.ignite.internal.processors.fs.IgniteFsHelperImpl", + /** IGFS helper component. */ + IGFS_HELPER( + "org.apache.ignite.internal.processors.igfs.IgfsNoopHelper", + "org.apache.ignite.internal.processors.igfs.IgfsHelperImpl", "ignite-hadoop" ), http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java index bc1da76..ae5f765 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java @@ -122,12 +122,12 @@ public interface IgniteEx extends Ignite, ClusterGroupEx, IgniteCluster { IgniteInternalFuture<Boolean> sendAdminEmailAsync(String subj, String body, boolean html); /** - * Get GGFS instance returning null if it doesn't exist. + * Get IGFS instance returning null if it doesn't exist. * - * @param name GGFS name. - * @return GGFS. + * @param name IGFS name. + * @return IGFS. */ - @Nullable public IgniteFs ggfsx(@Nullable String name); + @Nullable public IgniteFs igfsx(@Nullable String name); /** * Get Hadoop facade. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 7cdb06d..c1668be 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -675,7 +675,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit // Starts lifecycle aware components. U.startLifecycleAware(lifecycleAwares(cfg)); - addHelper(ctx, GGFS_HELPER.create(F.isEmpty(cfg.getIgfsConfiguration()))); + addHelper(ctx, IGFS_HELPER.create(F.isEmpty(cfg.getIgfsConfiguration()))); startProcessor(ctx, new IgnitePluginProcessor(ctx, cfg), attrs); @@ -727,7 +727,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit startProcessor(ctx, new GridRestProcessor(ctx), attrs); startProcessor(ctx, new GridDataLoaderProcessor(ctx), attrs); startProcessor(ctx, new GridStreamProcessor(ctx), attrs); - startProcessor(ctx, (GridProcessor)GGFS.create(ctx, F.isEmpty(cfg.getIgfsConfiguration())), attrs); + startProcessor(ctx, (GridProcessor) IGFS.create(ctx, F.isEmpty(cfg.getIgfsConfiguration())), attrs); startProcessor(ctx, new GridContinuousProcessor(ctx), attrs); startProcessor(ctx, (GridProcessor)(cfg.isPeerClassLoadingEnabled() ? IgniteComponentType.HADOOP.create(ctx, true): // No-op when peer class loading is enabled. @@ -2909,7 +2909,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit } /** {@inheritDoc} */ - @Nullable @Override public IgniteFs ggfsx(@Nullable String name) { + @Nullable @Override public IgniteFs igfsx(@Nullable String name) { guard(); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAttributes.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAttributes.java index 31b696e..a897e92 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAttributes.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAttributes.java @@ -33,7 +33,7 @@ public class IgfsAttributes implements Externalizable { private static final long serialVersionUID = 0L; /** GGFS name. */ - private String ggfsName; + private String igfsName; /** File's data block size (bytes). */ private int blockSize; @@ -57,7 +57,7 @@ public class IgfsAttributes implements Externalizable { private Map<String, IgfsMode> pathModes; /** - * @param ggfsName GGFS name. + * @param igfsName GGFS name. * @param blockSize File's data block size (bytes). * @param grpSize Size of the group figured in {@link org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper}. * @param metaCacheName Meta cache name. @@ -65,10 +65,10 @@ public class IgfsAttributes implements Externalizable { * @param dfltMode Default mode. * @param pathModes Path modes. */ - public IgfsAttributes(String ggfsName, int blockSize, int grpSize, String metaCacheName, String dataCacheName, + public IgfsAttributes(String igfsName, int blockSize, int grpSize, String metaCacheName, String dataCacheName, IgfsMode dfltMode, Map<String, IgfsMode> pathModes, boolean fragmentizerEnabled) { this.blockSize = blockSize; - this.ggfsName = ggfsName; + this.igfsName = igfsName; this.grpSize = grpSize; this.metaCacheName = metaCacheName; this.dataCacheName = dataCacheName; @@ -87,8 +87,8 @@ public class IgfsAttributes implements Externalizable { /** * @return GGFS name. */ - public String ggfsName() { - return ggfsName; + public String igfsName() { + return igfsName; } /** @@ -142,7 +142,7 @@ public class IgfsAttributes implements Externalizable { /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { - U.writeString(out, ggfsName); + U.writeString(out, igfsName); out.writeInt(blockSize); out.writeInt(grpSize); U.writeString(out, metaCacheName); @@ -166,7 +166,7 @@ public class IgfsAttributes implements Externalizable { /** {@inheritDoc} */ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - ggfsName = U.readString(in); + igfsName = U.readString(in); blockSize = in.readInt(); grpSize = in.readInt(); metaCacheName = U.readString(in); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java ---------------------------------------------------------------------- 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 2304069..1f0f007 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 @@ -180,11 +180,11 @@ public class IgfsContext { public boolean igfsNode(ClusterNode node) { assert node != null; - IgfsAttributes[] ggfs = node.attribute(ATTR_GGFS); + IgfsAttributes[] igfs = node.attribute(ATTR_GGFS); - if (ggfs != null) - for (IgfsAttributes attrs : ggfs) - if (F.eq(cfg.getName(), attrs.ggfsName())) + if (igfs != null) + for (IgfsAttributes attrs : igfs) + if (F.eq(cfg.getName(), attrs.igfsName())) return true; return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java ---------------------------------------------------------------------- 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 509ca3a..3f7b0c4 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 @@ -1030,12 +1030,11 @@ public class IgfsDataManager extends IgfsManager { if (!node.isLocal()) { final IgfsBlocksMessage msg = new IgfsBlocksMessage(fileId, batchId, blocks); - callGgfsLocalSafe(new GridPlainCallable<Object>() { + callIgfsLocalSafe(new GridPlainCallable<Object>() { @Override @Nullable public Object call() throws Exception { try { igfsCtx.send(nodeId, topic, msg, SYSTEM_POOL); - } - catch (IgniteCheckedException e) { + } catch (IgniteCheckedException e) { completionFut.onError(nodeId, e); } @@ -1044,16 +1043,18 @@ public class IgfsDataManager extends IgfsManager { }); } else { - callGgfsLocalSafe(new GridPlainCallable<Object>() { - @Override @Nullable public Object call() throws Exception { + callIgfsLocalSafe(new GridPlainCallable<Object>() { + @Override + @Nullable + public Object call() throws Exception { storeBlocksAsync(blocks).listenAsync(new CI1<IgniteInternalFuture<?>>() { - @Override public void apply(IgniteInternalFuture<?> fut) { + @Override + public void apply(IgniteInternalFuture<?> fut) { try { fut.get(); completionFut.onWriteAck(nodeId, batchId); - } - catch (IgniteCheckedException e) { + } catch (IgniteCheckedException e) { completionFut.onError(nodeId, e); } } @@ -1161,7 +1162,7 @@ public class IgfsDataManager extends IgfsManager { * * @param c Callable to execute. */ - private <T> void callGgfsLocalSafe(Callable<T> c) { + private <T> void callIgfsLocalSafe(Callable<T> c) { try { ggfsSvc.submit(c); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java ---------------------------------------------------------------------- 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 151e16c..17b9b29 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 @@ -47,7 +47,7 @@ public class IgfsDeleteWorker extends IgfsThread { private static final int MAX_DELETE_BATCH = 100; /** GGFS context. */ - private final IgfsContext ggfsCtx; + private final IgfsContext igfsCtx; /** Metadata manager. */ private final IgfsMetaManager meta; @@ -79,26 +79,26 @@ public class IgfsDeleteWorker extends IgfsThread { /** * Constructor. * - * @param ggfsCtx GGFS context. + * @param igfsCtx GGFS context. */ - IgfsDeleteWorker(IgfsContext ggfsCtx) { - super("igfs-delete-worker%" + ggfsCtx.igfs().name() + "%" + ggfsCtx.kernalContext().localNodeId() + "%"); + IgfsDeleteWorker(IgfsContext igfsCtx) { + super("igfs-delete-worker%" + igfsCtx.igfs().name() + "%" + igfsCtx.kernalContext().localNodeId() + "%"); - this.ggfsCtx = ggfsCtx; + this.igfsCtx = igfsCtx; - meta = ggfsCtx.meta(); - data = ggfsCtx.data(); + meta = igfsCtx.meta(); + data = igfsCtx.data(); - evts = ggfsCtx.kernalContext().event(); + evts = igfsCtx.kernalContext().event(); - String ggfsName = ggfsCtx.igfs().name(); + String ggfsName = igfsCtx.igfs().name(); topic = F.isEmpty(ggfsName) ? TOPIC_IGFS : TOPIC_IGFS.topic(ggfsName); assert meta != null; assert data != null; - log = ggfsCtx.kernalContext().log(IgfsDeleteWorker.class); + log = igfsCtx.kernalContext().log(IgfsDeleteWorker.class); } /** {@inheritDoc} */ @@ -225,7 +225,7 @@ public class IgfsDeleteWorker extends IgfsThread { if (evts.isRecordable(EVT_IGFS_FILE_PURGED)) { if (info.path() != null) evts.record(new IgfsEvent(info.path(), - ggfsCtx.kernalContext().discovery().localNode(), EVT_IGFS_FILE_PURGED)); + igfsCtx.kernalContext().discovery().localNode(), EVT_IGFS_FILE_PURGED)); else LT.warn(log, null, "Removing file without path info: " + info); } @@ -277,7 +277,7 @@ public class IgfsDeleteWorker extends IgfsThread { } } - GridCompoundFuture<Object, ?> fut = new GridCompoundFuture<>(ggfsCtx.kernalContext()); + GridCompoundFuture<Object, ?> fut = new GridCompoundFuture<>(igfsCtx.kernalContext()); // Delegate to child folders. for (IgfsListingEntry entry : delListing.values()) { @@ -334,7 +334,7 @@ public class IgfsDeleteWorker extends IgfsThread { for (ClusterNode node : nodes) { try { - ggfsCtx.send(node, topic, msg, GridIoPolicy.SYSTEM_POOL); + igfsCtx.send(node, topic, msg, GridIoPolicy.SYSTEM_POOL); } catch (IgniteCheckedException e) { U.warn(log, "Failed to send GGFS delete message to node [nodeId=" + node.id() + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java ---------------------------------------------------------------------- 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 c943f61..ac8c0f0 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 @@ -1720,7 +1720,7 @@ public final class IgfsImpl implements IgfsEx { String ggfsName = name(); for (IgfsAttributes attr : attrs) { - if (F.eq(ggfsName, attr.ggfsName())) + if (F.eq(ggfsName, attr.igfsName())) return true; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java ---------------------------------------------------------------------- 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 a00b70f..054210d 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 @@ -246,7 +246,7 @@ class IgfsIpcHandler implements IgfsServerHandler { IgfsPathControlRequest req = (IgfsPathControlRequest)msg; if (log.isDebugEnabled()) - log.debug("Processing path control request [ggfsName=" + ggfs.name() + ", req=" + req + ']'); + log.debug("Processing path control request [igfsName=" + ggfs.name() + ", req=" + req + ']'); IgfsControlResponse res = new IgfsControlResponse(); @@ -320,7 +320,7 @@ class IgfsIpcHandler implements IgfsServerHandler { long streamId = registerResource(ses, ggfsIn); if (log.isDebugEnabled()) - log.debug("Opened GGFS input stream for file read [ggfsName=" + ggfs.name() + ", path=" + + log.debug("Opened GGFS input stream for file read [igfsName=" + ggfs.name() + ", path=" + req.path() + ", streamId=" + streamId + ", ses=" + ses + ']'); IgfsFileInfo info = new IgfsFileInfo(ggfsIn.fileInfo(), null, @@ -343,7 +343,7 @@ class IgfsIpcHandler implements IgfsServerHandler { )); if (log.isDebugEnabled()) - log.debug("Opened GGFS output stream for file create [ggfsName=" + ggfs.name() + ", path=" + + log.debug("Opened GGFS output stream for file create [igfsName=" + ggfs.name() + ", path=" + req.path() + ", streamId=" + streamId + ", ses=" + ses + ']'); res.response(streamId); @@ -360,7 +360,7 @@ class IgfsIpcHandler implements IgfsServerHandler { )); if (log.isDebugEnabled()) - log.debug("Opened GGFS output stream for file append [ggfsName=" + ggfs.name() + ", path=" + + log.debug("Opened GGFS output stream for file append [igfsName=" + ggfs.name() + ", path=" + req.path() + ", streamId=" + streamId + ", ses=" + ses + ']'); res.response(streamId); @@ -379,7 +379,7 @@ class IgfsIpcHandler implements IgfsServerHandler { } if (log.isDebugEnabled()) - log.debug("Finished processing path control request [ggfsName=" + ggfs.name() + ", req=" + req + + log.debug("Finished processing path control request [igfsName=" + ggfs.name() + ", req=" + req + ", res=" + res + ']'); return res; @@ -409,7 +409,7 @@ class IgfsIpcHandler implements IgfsServerHandler { Closeable res = resource(ses, rsrcId); if (log.isDebugEnabled()) - log.debug("Requested to close resource [ggfsName=" + ggfs.name() + ", rsrcId=" + rsrcId + + log.debug("Requested to close resource [igfsName=" + ggfs.name() + ", rsrcId=" + rsrcId + ", res=" + res + ']'); if (res == null) @@ -430,11 +430,11 @@ class IgfsIpcHandler implements IgfsServerHandler { boolean success = ses.unregisterResource(rsrcId, res); - assert success : "Failed to unregister resource [ggfsName=" + ggfs.name() + ", rsrcId=" + rsrcId + + assert success : "Failed to unregister resource [igfsName=" + ggfs.name() + ", rsrcId=" + rsrcId + ", res=" + res + ']'; if (log.isDebugEnabled()) - log.debug("Closed GGFS stream [ggfsName=" + ggfs.name() + ", streamId=" + rsrcId + + log.debug("Closed GGFS stream [igfsName=" + ggfs.name() + ", streamId=" + rsrcId + ", ses=" + ses + ']'); resp.response(true); @@ -517,7 +517,7 @@ class IgfsIpcHandler implements IgfsServerHandler { // Do not generate affinity key for replicated or near-only cache. if (!req.colocate()) { if (log.isDebugEnabled()) - log.debug("Will not generate affinity key for path control request [ggfsName=" + ggfs.name() + + log.debug("Will not generate affinity key for path control request [igfsName=" + ggfs.name() + ", req=" + req + ']'); return null; @@ -526,7 +526,7 @@ class IgfsIpcHandler implements IgfsServerHandler { IgniteUuid key = ggfs.nextAffinityKey(); if (log.isDebugEnabled()) - log.debug("Generated affinity key for path control request [ggfsName=" + ggfs.name() + + log.debug("Generated affinity key for path control request [igfsName=" + ggfs.name() + ", req=" + req + ", key=" + key + ']'); return key; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsJobImpl.java ---------------------------------------------------------------------- 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 85ffc2a..14fb138 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 @@ -89,7 +89,7 @@ public class IgfsJobImpl implements ComputeJob, GridInternalWrapper<IgfsJob> { if (split == null) { log.warning("No data found for split on local node after resolver is applied " + - "[ggfsName=" + igfsName + ", path=" + path + ", start=" + start + ", len=" + len + ']'); + "[igfsName=" + igfsName + ", path=" + path + ", start=" + start + ", len=" + len + ']'); return null; } @@ -100,7 +100,7 @@ public class IgfsJobImpl implements ComputeJob, GridInternalWrapper<IgfsJob> { 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=" + igfsName + + throw new IgniteException("Failed to execute GGFS job for file split [igfsName=" + igfsName + ", path=" + path + ", start=" + start + ", len=" + len + ']', e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java ---------------------------------------------------------------------- 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 c80530f..133891a 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 @@ -358,7 +358,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter { for (IgfsAttributes rmtAttr : rmtAttrs) for (IgfsAttributes locAttr : locAttrs) { // Checking the use of different caches on the different GGFSes. - if (!F.eq(rmtAttr.ggfsName(), locAttr.ggfsName())) { + if (!F.eq(rmtAttr.igfsName(), locAttr.igfsName())) { if (F.eq(rmtAttr.metaCacheName(), locAttr.metaCacheName())) throw new IgniteCheckedException("Meta cache names should be different for different GGFS instances " + "configuration (fix configuration or set " + @@ -366,8 +366,8 @@ public class IgfsProcessor extends IgfsProcessorAdapter { "property) [metaCacheName=" + rmtAttr.metaCacheName() + ", locNodeId=" + ctx.localNodeId() + ", rmtNodeId=" + rmtNode.id() + - ", locGgfsName=" + locAttr.ggfsName() + - ", rmtGgfsName=" + rmtAttr.ggfsName() + ']'); + ", locGgfsName=" + locAttr.igfsName() + + ", rmtGgfsName=" + rmtAttr.igfsName() + ']'); if (F.eq(rmtAttr.dataCacheName(), locAttr.dataCacheName())) throw new IgniteCheckedException("Data cache names should be different for different GGFS instances " + @@ -376,33 +376,33 @@ public class IgfsProcessor extends IgfsProcessorAdapter { "property)[dataCacheName=" + rmtAttr.dataCacheName() + ", locNodeId=" + ctx.localNodeId() + ", rmtNodeId=" + rmtNode.id() + - ", locGgfsName=" + locAttr.ggfsName() + - ", rmtGgfsName=" + rmtAttr.ggfsName() + ']'); + ", locGgfsName=" + locAttr.igfsName() + + ", rmtGgfsName=" + rmtAttr.igfsName() + ']'); continue; } // Compare other attributes only for GGFSes with same name. checkSame("Data block size", "BlockSize", rmtNode.id(), rmtAttr.blockSize(), - locAttr.blockSize(), rmtAttr.ggfsName()); + locAttr.blockSize(), rmtAttr.igfsName()); checkSame("Affinity mapper group size", "GrpSize", rmtNode.id(), rmtAttr.groupSize(), - locAttr.groupSize(), rmtAttr.ggfsName()); + locAttr.groupSize(), rmtAttr.igfsName()); checkSame("Meta cache name", "MetaCacheName", rmtNode.id(), rmtAttr.metaCacheName(), - locAttr.metaCacheName(), rmtAttr.ggfsName()); + locAttr.metaCacheName(), rmtAttr.igfsName()); checkSame("Data cache name", "DataCacheName", rmtNode.id(), rmtAttr.dataCacheName(), - locAttr.dataCacheName(), rmtAttr.ggfsName()); + locAttr.dataCacheName(), rmtAttr.igfsName()); checkSame("Default mode", "DefaultMode", rmtNode.id(), rmtAttr.defaultMode(), - locAttr.defaultMode(), rmtAttr.ggfsName()); + locAttr.defaultMode(), rmtAttr.igfsName()); checkSame("Path modes", "PathModes", rmtNode.id(), rmtAttr.pathModes(), - locAttr.pathModes(), rmtAttr.ggfsName()); + locAttr.pathModes(), rmtAttr.igfsName()); checkSame("Fragmentizer enabled", "FragmentizerEnabled", rmtNode.id(), rmtAttr.fragmentizerEnabled(), - locAttr.fragmentizerEnabled(), rmtAttr.ggfsName()); + locAttr.fragmentizerEnabled(), rmtAttr.igfsName()); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java ---------------------------------------------------------------------- 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 5e9fcb3..038d084 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 @@ -394,7 +394,7 @@ public class IgfsServer { IpcEndpoint client = srvEndpoint.accept(); if (log.isDebugEnabled()) - log.debug("GGFS client connected [ggfsName=" + ggfsCtx.kernalContext().gridName() + + log.debug("GGFS client connected [igfsName=" + ggfsCtx.kernalContext().gridName() + ", client=" + client + ']'); ClientWorker worker = new ClientWorker(client, acceptCnt++); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsTaskArgsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsTaskArgsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsTaskArgsImpl.java index 222fed5..1763690 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsTaskArgsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsTaskArgsImpl.java @@ -77,7 +77,7 @@ public class IgfsTaskArgsImpl<T> implements IgfsTaskArgs<T>, Externalizable { } /** {@inheritDoc} */ - @Override public String ggfsName() { + @Override public String igfsName() { return ggfsName; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/test/config/hadoop/core-site-loopback-secondary.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/hadoop/core-site-loopback-secondary.xml b/modules/core/src/test/config/hadoop/core-site-loopback-secondary.xml index a36d256..2dc952a 100644 --- a/modules/core/src/test/config/hadoop/core-site-loopback-secondary.xml +++ b/modules/core/src/test/config/hadoop/core-site-loopback-secondary.xml @@ -24,31 +24,31 @@ <configuration> <property> <name>fs.default.name</name> - <value>ggfs://127.0.0.1:11500/</value> + <value>igfs://127.0.0.1:11500/</value> </property> <property> - <name>fs.ggfs.impl</name> - <value>org.apache.ignite.igfs.hadoop.v1.GridGgfsHadoopFileSystem</value> + <name>fs.igfs.impl</name> + <value>org.apache.ignite.igfs.hadoop.v1.IgfsHadoopFileSystem</value> </property> <property> - <name>fs.AbstractFileSystem.ggfs.impl</name> - <value>org.apache.ignite.igfs.hadoop.v2.GridGgfsHadoopFileSystem</value> + <name>fs.AbstractFileSystem.igfs.impl</name> + <value>org.apache.ignite.igfs.hadoop.v2.IgfsHadoopFileSystem</value> </property> <property> - <name>fs.ggfs.127.0.0.1:11500.endpoint.no_embed</name> + <name>fs.igfs.127.0.0.1:11500.endpoint.no_embed</name> <value>true</value> </property> <property> - <name>fs.ggfs.127.0.0.1:11500.endpoint.no_local_shmem</name> + <name>fs.igfs.127.0.0.1:11500.endpoint.no_local_shmem</name> <value>true</value> </property> <property> - <name>fs.ggfs.block.size</name> + <name>fs.igfs.block.size</name> <value>1024</value> </property> </configuration> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/test/config/hadoop/core-site-loopback.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/hadoop/core-site-loopback.xml b/modules/core/src/test/config/hadoop/core-site-loopback.xml index 2a1aa5d..63902fa 100644 --- a/modules/core/src/test/config/hadoop/core-site-loopback.xml +++ b/modules/core/src/test/config/hadoop/core-site-loopback.xml @@ -24,21 +24,21 @@ <configuration> <property> <name>fs.default.name</name> - <value>ggfs:///</value> + <value>igfs:///</value> </property> <property> - <name>fs.ggfs.impl</name> - <value>org.apache.ignite.igfs.hadoop.v1.GridGgfsHadoopFileSystem</value> + <name>fs.igfs.impl</name> + <value>org.apache.ignite.igfs.hadoop.v1.IgfsHadoopFileSystem</value> </property> <property> - <name>fs.AbstractFileSystem.ggfs.impl</name> - <value>org.apache.ignite.igfs.hadoop.v2.GridGgfsHadoopFileSystem</value> + <name>fs.AbstractFileSystem.igfs.impl</name> + <value>org.apache.ignite.igfs.hadoop.v2.IgfsHadoopFileSystem</value> </property> <property> - <name>fs.ggfs..endpoint.no_local_shmem</name> + <name>fs.igfs..endpoint.no_local_shmem</name> <value>true</value> </property> </configuration> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/test/config/hadoop/core-site-secondary.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/hadoop/core-site-secondary.xml b/modules/core/src/test/config/hadoop/core-site-secondary.xml index 0f6d9a8..648df36 100644 --- a/modules/core/src/test/config/hadoop/core-site-secondary.xml +++ b/modules/core/src/test/config/hadoop/core-site-secondary.xml @@ -24,21 +24,21 @@ <configuration> <property> <name>fs.default.name</name> - <value>ggfs://127.0.0.1:11500/</value> + <value>igfs://127.0.0.1:11500/</value> </property> <property> - <name>fs.ggfs.impl</name> - <value>org.apache.ignite.igfs.hadoop.v1.GridGgfsHadoopFileSystem</value> + <name>fs.igfs.impl</name> + <value>org.apache.ignite.igfs.hadoop.v1.IgfsHadoopFileSystem</value> </property> <property> - <name>fs.AbstractFileSystem.ggfs.impl</name> - <value>org.apache.ignite.igfs.hadoop.v2.GridGgfsHadoopFileSystem</value> + <name>fs.AbstractFileSystem.igfs.impl</name> + <value>org.apache.ignite.igfs.hadoop.v2.IgfsHadoopFileSystem</value> </property> <property> - <name>fs.ggfs.127.0.0.1:11500.endpoint.no_embed</name> + <name>fs.igfs.127.0.0.1:11500.endpoint.no_embed</name> <value>true</value> </property> </configuration> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/test/config/hadoop/core-site.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/hadoop/core-site.xml b/modules/core/src/test/config/hadoop/core-site.xml index e198923..eb16ce7 100644 --- a/modules/core/src/test/config/hadoop/core-site.xml +++ b/modules/core/src/test/config/hadoop/core-site.xml @@ -24,16 +24,16 @@ <configuration> <property> <name>fs.default.name</name> - <value>ggfs:///</value> + <value>igfs:///</value> </property> <property> - <name>fs.ggfs.impl</name> - <value>org.apache.ignite.igfs.hadoop.v1.GridGgfsHadoopFileSystem</value> + <name>fs.igfs.impl</name> + <value>org.apache.ignite.igfs.hadoop.v1.IgfsHadoopFileSystem</value> </property> <property> - <name>fs.AbstractFileSystem.ggfs.impl</name> - <value>org.apache.ignite.igfs.hadoop.v2.GridGgfsHadoopFileSystem</value> + <name>fs.AbstractFileSystem.igfs.impl</name> + <value>org.apache.ignite.igfs.hadoop.v2.IgfsHadoopFileSystem</value> </property> </configuration> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java ---------------------------------------------------------------------- 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 3313185..abd3cb5 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 @@ -84,32 +84,32 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest /** * @return GGFS configuration for this test. */ - protected IgfsConfiguration getGgfsConfiguration() throws IgniteCheckedException { - IgfsConfiguration ggfsCfg = new IgfsConfiguration(); + protected IgfsConfiguration getIgfsConfiguration() throws IgniteCheckedException { + IgfsConfiguration igfsCfg = new IgfsConfiguration(); - ggfsCfg.setDataCacheName("dataCache"); - ggfsCfg.setMetaCacheName("metaCache"); - ggfsCfg.setName("igfs"); + igfsCfg.setDataCacheName("dataCache"); + igfsCfg.setMetaCacheName("metaCache"); + igfsCfg.setName("igfs"); - ggfsCfg.setBlockSize(512 * 1024); // Together with group blocks mapper will yield 64M per node groups. + igfsCfg.setBlockSize(512 * 1024); // Together with group blocks mapper will yield 64M per node groups. - return ggfsCfg; + return igfsCfg; } /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - return getConfiguration(gridName, getGgfsConfiguration()); + return getConfiguration(gridName, getIgfsConfiguration()); } /** * The same as getConfiguration(String gridName) but it sets custom GGFS configuration * * @param gridName Grid name. - * @param ggfsCfg GGFS configuration. + * @param igfsCfg GGFS configuration. * @return Grid configuration. * @throws Exception If failed. */ - protected IgniteConfiguration getConfiguration(String gridName, IgfsConfiguration ggfsCfg) throws Exception { + protected IgniteConfiguration getConfiguration(String gridName, IgfsConfiguration igfsCfg) throws Exception { IgniteConfiguration cfg = IgnitionEx.loadConfiguration("config/hadoop/default-config.xml").get1(); assert cfg != null; @@ -118,7 +118,7 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest cfg.setIncludeEventTypes(concat(EVTS_IGFS, EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED)); - cfg.setIgfsConfiguration(ggfsCfg); + cfg.setIgfsConfiguration(igfsCfg); cfg.setCacheConfiguration(getCacheConfiguration(gridName)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java ---------------------------------------------------------------------- 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 ad1e824..8a5d2c0 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 @@ -40,10 +40,10 @@ public class IgfsFragmentizerAbstractSelfTest extends IgfsCommonAbstractTest { protected static final int NODE_CNT = 4; /** GGFS block size. */ - protected static final int GGFS_BLOCK_SIZE = 1024; + protected static final int IGFS_BLOCK_SIZE = 1024; /** GGFS group size. */ - protected static final int GGFS_GROUP_SIZE = 32; + protected static final int IGFS_GROUP_SIZE = 32; /** Metadata cache name. */ private static final String META_CACHE_NAME = "meta"; @@ -63,20 +63,20 @@ public class IgfsFragmentizerAbstractSelfTest extends IgfsCommonAbstractTest { cfg.setCacheConfiguration(metaConfiguration(), dataConfiguration()); - IgfsConfiguration ggfsCfg = new IgfsConfiguration(); + IgfsConfiguration igfsCfg = new IgfsConfiguration(); - ggfsCfg.setName("igfs"); - ggfsCfg.setMetaCacheName(META_CACHE_NAME); - ggfsCfg.setDataCacheName(DATA_CACHE_NAME); - ggfsCfg.setBlockSize(GGFS_BLOCK_SIZE); + igfsCfg.setName("igfs"); + igfsCfg.setMetaCacheName(META_CACHE_NAME); + igfsCfg.setDataCacheName(DATA_CACHE_NAME); + igfsCfg.setBlockSize(IGFS_BLOCK_SIZE); // Need to set this to avoid thread starvation. - ggfsCfg.setPerNodeParallelBatchCount(8); + igfsCfg.setPerNodeParallelBatchCount(8); - ggfsCfg.setFragmentizerThrottlingBlockLength(16 * GGFS_BLOCK_SIZE); - ggfsCfg.setFragmentizerThrottlingDelay(10); + igfsCfg.setFragmentizerThrottlingBlockLength(16 * IGFS_BLOCK_SIZE); + igfsCfg.setFragmentizerThrottlingDelay(10); - cfg.setIgfsConfiguration(ggfsCfg); + cfg.setIgfsConfiguration(igfsCfg); return cfg; } @@ -111,7 +111,7 @@ public class IgfsFragmentizerAbstractSelfTest extends IgfsCommonAbstractTest { cfg.setCacheMode(PARTITIONED); cfg.setBackups(0); - cfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(GGFS_GROUP_SIZE)); + cfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(IGFS_GROUP_SIZE)); cfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); cfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cfg.setQueryIndexEnabled(false); @@ -126,9 +126,9 @@ public class IgfsFragmentizerAbstractSelfTest extends IgfsCommonAbstractTest { * @throws Exception If failed. */ protected void awaitFileFragmenting(int gridIdx, IgfsPath path) throws Exception { - IgfsEx ggfs = (IgfsEx)grid(gridIdx).fileSystem("igfs"); + IgfsEx igfs = (IgfsEx)grid(gridIdx).fileSystem("igfs"); - IgfsMetaManager meta = ggfs.context().meta(); + IgfsMetaManager meta = igfs.context().meta(); IgniteUuid fileId = meta.fileId(path); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java ---------------------------------------------------------------------- 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 f42d5a8..99a40c4 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,14 +36,14 @@ public class IgfsFragmentizerSelfTest extends IgfsFragmentizerAbstractSelfTest { * @throws Exception If failed. */ public void testReadFragmentizing() throws Exception { - IgniteFs ggfs = grid(0).fileSystem("igfs"); + IgniteFs igfs = grid(0).fileSystem("igfs"); IgfsPath path = new IgfsPath("/someFile"); - try (IgfsOutputStream out = ggfs.create(path, true)) { + try (IgfsOutputStream out = igfs.create(path, true)) { // Write 10 groups. - for (int i = 0; i < 10 * GGFS_GROUP_SIZE; i++) { - byte[] data = new byte[GGFS_BLOCK_SIZE]; + for (int i = 0; i < 10 * IGFS_GROUP_SIZE; i++) { + byte[] data = new byte[IGFS_BLOCK_SIZE]; Arrays.fill(data, (byte)i); @@ -54,9 +54,9 @@ public class IgfsFragmentizerSelfTest extends IgfsFragmentizerAbstractSelfTest { long start = System.currentTimeMillis(); do { - try (IgfsInputStream in = ggfs.open(path)) { - for (int i = 0; i < 10 * GGFS_GROUP_SIZE; i++) { - for (int j = 0; j < GGFS_BLOCK_SIZE; j++) + try (IgfsInputStream in = igfs.open(path)) { + for (int i = 0; i < 10 * IGFS_GROUP_SIZE; i++) { + for (int j = 0; j < IGFS_BLOCK_SIZE; j++) assertEquals(i & 0xFF, in.read()); } @@ -70,28 +70,28 @@ public class IgfsFragmentizerSelfTest extends IgfsFragmentizerAbstractSelfTest { * @throws Exception If failed. */ public void testAppendFragmentizing() throws Exception { - checkAppendFragmentizing(GGFS_BLOCK_SIZE / 4, false); + checkAppendFragmentizing(IGFS_BLOCK_SIZE / 4, false); } /** * @throws Exception If failed. */ public void testAppendFragmentizingAligned() throws Exception { - checkAppendFragmentizing(GGFS_BLOCK_SIZE, false); + checkAppendFragmentizing(IGFS_BLOCK_SIZE, false); } /** * @throws Exception If failed. */ public void testAppendFragmentizingDifferentNodes() throws Exception { - checkAppendFragmentizing(GGFS_BLOCK_SIZE / 4, true); + checkAppendFragmentizing(IGFS_BLOCK_SIZE / 4, true); } /** * @throws Exception If failed. */ public void testAppendFragmentizingAlignedDifferentNodes() throws Exception { - checkAppendFragmentizing(GGFS_BLOCK_SIZE, true); + checkAppendFragmentizing(IGFS_BLOCK_SIZE, true); } /** @@ -103,14 +103,14 @@ public class IgfsFragmentizerSelfTest extends IgfsFragmentizerAbstractSelfTest { long written = 0; int i = 0; - int ggfsIdx = 0; + int igfsIdx = 0; - int fileSize = 30 * GGFS_GROUP_SIZE * GGFS_BLOCK_SIZE; + int fileSize = 30 * IGFS_GROUP_SIZE * IGFS_BLOCK_SIZE; while (written < fileSize) { - IgniteFs ggfs = grid(ggfsIdx).fileSystem("igfs"); + IgniteFs igfs = grid(igfsIdx).fileSystem("igfs"); - try (IgfsOutputStream out = ggfs.append(path, true)) { + try (IgfsOutputStream out = igfs.append(path, true)) { byte[] data = new byte[chunkSize]; Arrays.fill(data, (byte)i); @@ -124,16 +124,16 @@ public class IgfsFragmentizerSelfTest extends IgfsFragmentizerAbstractSelfTest { i++; if (rotate && i % 5 == 0) { - ggfsIdx++; + igfsIdx++; - if (ggfsIdx >= NODE_CNT) - ggfsIdx = 0; + if (igfsIdx >= NODE_CNT) + igfsIdx = 0; } } - IgniteFs ggfs = grid(0).fileSystem("igfs"); + IgniteFs igfs = grid(0).fileSystem("igfs"); - try (IgfsInputStream in = ggfs.open(path)) { + try (IgfsInputStream in = igfs.open(path)) { i = 0; int read = 0; @@ -158,14 +158,14 @@ public class IgfsFragmentizerSelfTest extends IgfsFragmentizerAbstractSelfTest { * @throws Exception If failed. */ public void testFlushFragmentizing() throws Exception { - checkFlushFragmentizing(GGFS_BLOCK_SIZE / 4); + checkFlushFragmentizing(IGFS_BLOCK_SIZE / 4); } /** * @throws Exception If failed. */ public void testFlushFragmentizingAligned() throws Exception { - checkFlushFragmentizing(GGFS_BLOCK_SIZE); + checkFlushFragmentizing(IGFS_BLOCK_SIZE); } /** @@ -178,14 +178,14 @@ public class IgfsFragmentizerSelfTest extends IgfsFragmentizerAbstractSelfTest { long written = 0; int cnt = 0; - int fileSize = 50 * GGFS_GROUP_SIZE * GGFS_BLOCK_SIZE; + int fileSize = 50 * IGFS_GROUP_SIZE * IGFS_BLOCK_SIZE; - IgniteFs ggfs = grid(0).fileSystem("igfs"); + IgniteFs igfs = grid(0).fileSystem("igfs"); byte[] chunk = new byte[chunkSize]; while (written < fileSize) { - try (IgfsOutputStream out = ggfs.append(path, true)) { + try (IgfsOutputStream out = igfs.append(path, true)) { for (int i = 0; i < 8; i++) { Arrays.fill(chunk, (byte)cnt); @@ -200,7 +200,7 @@ public class IgfsFragmentizerSelfTest extends IgfsFragmentizerAbstractSelfTest { } } - try (IgfsInputStream in = ggfs.open(path)) { + try (IgfsInputStream in = igfs.open(path)) { cnt = 0; int read = 0; @@ -223,22 +223,22 @@ public class IgfsFragmentizerSelfTest extends IgfsFragmentizerAbstractSelfTest { * @throws Exception If failed. */ public void testDeleteFragmentizing() throws Exception { - IgfsImpl ggfs = (IgfsImpl)grid(0).fileSystem("igfs"); + IgfsImpl igfs = (IgfsImpl)grid(0).fileSystem("igfs"); for (int i = 0; i < 30; i++) { IgfsPath path = new IgfsPath("/someFile" + i); - try (IgfsOutputStream out = ggfs.create(path, true)) { - for (int j = 0; j < 5 * GGFS_GROUP_SIZE; j++) - out.write(new byte[GGFS_BLOCK_SIZE]); + try (IgfsOutputStream out = igfs.create(path, true)) { + for (int j = 0; j < 5 * IGFS_GROUP_SIZE; j++) + out.write(new byte[IGFS_BLOCK_SIZE]); } U.sleep(200); } - ggfs.delete(new IgfsPath("/"), true); + igfs.delete(new IgfsPath("/"), true); - ggfs.awaitDeletesAsync().get(); + igfs.awaitDeletesAsync().get(); GridTestUtils.retryAssert(log, 50, 100, new CA() { @Override public void apply() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e12908b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerTopologySelfTest.java ---------------------------------------------------------------------- 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 d2c44e2..59faa42 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,11 +33,11 @@ public class IgfsFragmentizerTopologySelfTest extends IgfsFragmentizerAbstractSe try { IgfsPath path = new IgfsPath("/someFile"); - IgniteFs ggfs = grid(1).fileSystem("igfs"); + IgniteFs igfs = grid(1).fileSystem("igfs"); - try (IgfsOutputStream out = ggfs.create(path, true)) { - for (int i = 0; i < 10 * GGFS_GROUP_SIZE; i++) - out.write(new byte[GGFS_BLOCK_SIZE]); + try (IgfsOutputStream out = igfs.create(path, true)) { + for (int i = 0; i < 10 * IGFS_GROUP_SIZE; i++) + out.write(new byte[IGFS_BLOCK_SIZE]); } awaitFileFragmenting(1, path);
