ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [59/76] [abbrv] incubator-ignite git commit: # IGNITE-226: WIP.
Date Fri, 13 Feb 2015 18:04:05 GMT
# 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/8d6347db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8d6347db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8d6347db

Branch: refs/heads/ignite-hadoop-tests
Commit: 8d6347db80c563af7a0de15f7a728539f734f67c
Parents: 167c1b1
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Fri Feb 13 16:48:48 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Fri Feb 13 16:48:48 2015 +0300

----------------------------------------------------------------------
 .../internal/processors/igfs/IgfsImpl.java      |  12 +-
 .../processors/igfs/IgfsInputStreamImpl.java    |  12 +-
 .../processors/igfs/IgfsIpcHandler.java         |  14 +-
 .../internal/processors/igfs/IgfsManager.java   |  10 +-
 .../processors/igfs/IgfsNoopProcessor.java      |   2 +-
 .../processors/igfs/IgfsOutputStreamImpl.java   |  14 +-
 .../internal/processors/igfs/IgfsProcessor.java |  66 ++---
 .../processors/igfs/IgfsProcessorAdapter.java   |   4 +-
 .../processors/igfs/IgfsServerManager.java      |  10 +-
 .../processors/igfs/IgfsTaskArgsImpl.java       |  14 +-
 .../processors/igfs/IgfsAbstractSelfTest.java   | 128 +++++-----
 .../igfs/IgfsMetaManagerSelfTest.java           |  14 +-
 .../processors/igfs/IgfsMetricsSelfTest.java    | 118 ++++-----
 .../processors/igfs/IgfsModesSelfTest.java      |  80 +++---
 .../processors/igfs/IgfsProcessorSelfTest.java  | 254 +++++++++----------
 .../igfs/IgfsProcessorValidationSelfTest.java   | 118 ++++-----
 ...IpcEndpointRegistrationAbstractSelfTest.java |  14 +-
 .../processors/igfs/IgfsSizeSelfTest.java       |  70 ++---
 .../processors/igfs/IgfsStreamsSelfTest.java    |  14 +-
 .../processors/igfs/IgfsTaskSelfTest.java       |  44 ++--
 20 files changed, 506 insertions(+), 506 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d6347db/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 9f92850..b5887ae 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
@@ -2026,7 +2026,7 @@ public final class IgfsImpl implements IgfsEx {
         /**
          * Constructor.
          *
-         * @param ggfsCtx IGFS context.
+         * @param igfsCtx IGFS context.
          * @param path Path to stored file.
          * @param fileInfo File info.
          * @param prefetchBlocks Prefetch blocks.
@@ -2034,10 +2034,10 @@ public final class IgfsImpl implements IgfsEx {
          * @param secReader Optional secondary file system reader.
          * @param metrics Metrics.
          */
-        IgfsEventAwareInputStream(IgfsContext ggfsCtx, IgfsPath path, IgfsFileInfo fileInfo,
+        IgfsEventAwareInputStream(IgfsContext igfsCtx, IgfsPath path, IgfsFileInfo fileInfo,
             int prefetchBlocks, int seqReadsBeforePrefetch, @Nullable IgfsReader secReader,
             IgfsLocalMetrics metrics) {
-            super(ggfsCtx, path, fileInfo, prefetchBlocks, seqReadsBeforePrefetch, secReader, metrics);
+            super(igfsCtx, path, fileInfo, prefetchBlocks, seqReadsBeforePrefetch, secReader, metrics);
 
             metrics.incrementFilesOpenedForRead();
         }
@@ -2085,12 +2085,12 @@ public final class IgfsImpl implements IgfsEx {
                     private Ignite g;
 
                     @Nullable @Override public IgniteBiTuple<Long, Long> execute() {
-                        IgniteFs ggfs = ((IgniteKernal)g).context().igfs().igfs(igfsName);
+                        IgniteFs igfs = ((IgniteKernal)g).context().igfs().igfs(igfsName);
 
-                        if (ggfs == null)
+                        if (igfs == null)
                             return F.t(0L, 0L);
 
-                        IgfsMetrics metrics = ggfs.metrics();
+                        IgfsMetrics metrics = igfs.metrics();
 
                         long loc = metrics.localSpaceSize();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d6347db/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
index 7939b3b..32d1f76 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
@@ -101,7 +101,7 @@ public class IgfsInputStreamImpl extends IgfsInputStreamAdapter {
     /**
      * Constructs file output stream.
      *
-     * @param ggfsCtx IGFS context.
+     * @param igfsCtx IGFS context.
      * @param path Path to stored file.
      * @param fileInfo File info to write binary data to.
      * @param prefetchBlocks Number of blocks to prefetch.
@@ -109,9 +109,9 @@ public class IgfsInputStreamImpl extends IgfsInputStreamAdapter {
      * @param secReader Optional secondary file system reader.
      * @param metrics Local IGFS metrics.
      */
-    IgfsInputStreamImpl(IgfsContext ggfsCtx, IgfsPath path, IgfsFileInfo fileInfo, int prefetchBlocks,
+    IgfsInputStreamImpl(IgfsContext igfsCtx, IgfsPath path, IgfsFileInfo fileInfo, int prefetchBlocks,
         int seqReadsBeforePrefetch, @Nullable IgfsReader secReader, IgfsLocalMetrics metrics) {
-        assert ggfsCtx != null;
+        assert igfsCtx != null;
         assert path != null;
         assert fileInfo != null;
         assert metrics != null;
@@ -123,10 +123,10 @@ public class IgfsInputStreamImpl extends IgfsInputStreamAdapter {
         this.secReader = secReader;
         this.metrics = metrics;
 
-        meta = ggfsCtx.meta();
-        data = ggfsCtx.data();
+        meta = igfsCtx.meta();
+        data = igfsCtx.data();
 
-        log = ggfsCtx.kernalContext().log(IgfsInputStream.class);
+        log = igfsCtx.kernalContext().log(IgfsInputStream.class);
 
         maxLocCacheSize = (prefetchBlocks > 0 ? prefetchBlocks : 1) * 3 / 2;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d6347db/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 da0c608..daef65a 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
@@ -314,17 +314,17 @@ class IgfsIpcHandler implements IgfsServerHandler {
                     break;
 
                 case OPEN_READ: {
-                    IgfsInputStreamAdapter ggfsIn = !req.flag() ? igfs.open(req.path(), bufSize) :
+                    IgfsInputStreamAdapter igfsIn = !req.flag() ? igfs.open(req.path(), bufSize) :
                         igfs.open(req.path(), bufSize, req.sequentialReadsBeforePrefetch());
 
-                    long streamId = registerResource(ses, ggfsIn);
+                    long streamId = registerResource(ses, igfsIn);
 
                     if (log.isDebugEnabled())
                         log.debug("Opened IGFS input stream for file read [igfsName=" + igfs.name() + ", path=" +
                             req.path() + ", streamId=" + streamId + ", ses=" + ses + ']');
 
-                    IgfsFileInfo info = new IgfsFileInfo(ggfsIn.fileInfo(), null,
-                        ggfsIn.fileInfo().modificationTime());
+                    IgfsFileInfo info = new IgfsFileInfo(igfsIn.fileInfo(), null,
+                        igfsIn.fileInfo().modificationTime());
 
                     res.response(new IgfsInputStreamDescriptor(streamId, info.length()));
 
@@ -446,12 +446,12 @@ class IgfsIpcHandler implements IgfsServerHandler {
                 long pos = req.position();
                 int size = req.length();
 
-                IgfsInputStreamAdapter ggfsIn = (IgfsInputStreamAdapter)resource(ses, rsrcId);
+                IgfsInputStreamAdapter igfsIn = (IgfsInputStreamAdapter)resource(ses, rsrcId);
 
-                if (ggfsIn == null)
+                if (igfsIn == null)
                     throw new IgniteCheckedException("Input stream not found (already closed?): " + rsrcId);
 
-                byte[][] chunks = ggfsIn.readChunks(pos, size);
+                byte[][] chunks = igfsIn.readChunks(pos, size);
 
                 resp.response(chunks);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d6347db/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsManager.java
index d2007b7..b33ee15 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsManager.java
@@ -37,17 +37,17 @@ public abstract class IgfsManager {
     /**
      * Called when IGFS processor is started.
      *
-     * @param ggfsCtx IGFS context.
+     * @param igfsCtx IGFS context.
      */
-    public void start(IgfsContext ggfsCtx) throws IgniteCheckedException {
+    public void start(IgfsContext igfsCtx) throws IgniteCheckedException {
         if (!starting.compareAndSet(false, true))
             assert false : "Method start is called more than once for manager: " + this;
 
-        assert ggfsCtx != null;
+        assert igfsCtx != null;
 
-        this.igfsCtx = ggfsCtx;
+        this.igfsCtx = igfsCtx;
 
-        log = ggfsCtx.kernalContext().log(getClass());
+        log = igfsCtx.kernalContext().log(getClass());
 
         start0();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d6347db/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopProcessor.java
index 1bc463d..26ef77a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopProcessor.java
@@ -64,7 +64,7 @@ public class IgfsNoopProcessor extends IgfsProcessorAdapter {
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public ComputeJob createJob(IgfsJob job, @Nullable String ggfsName, IgfsPath path,
+    @Nullable @Override public ComputeJob createJob(IgfsJob job, @Nullable String igfsName, IgfsPath path,
         long start, long length, IgfsRecordResolver recRslv) {
         return null;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d6347db/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
index 0f9f5a7..36f19cc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
@@ -40,7 +40,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStreamAdapter {
     private static final int MAX_BLOCKS_CNT = 16;
 
     /** IGFS context. */
-    private IgfsContext ggfsCtx;
+    private IgfsContext igfsCtx;
 
     /** Meta info manager. */
     private final IgfsMetaManager meta;
@@ -89,7 +89,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStreamAdapter {
     /**
      * Constructs file output stream.
      *
-     * @param ggfsCtx IGFS context.
+     * @param igfsCtx IGFS context.
      * @param path Path to stored file.
      * @param fileInfo File info to write binary data to.
      * @param bufSize The size of the buffer to be used.
@@ -98,7 +98,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStreamAdapter {
      * @param metrics Local GGFs metrics.
      * @throws IgniteCheckedException If stream creation failed.
      */
-    IgfsOutputStreamImpl(IgfsContext ggfsCtx, IgfsPath path, IgfsFileInfo fileInfo, IgniteUuid parentId,
+    IgfsOutputStreamImpl(IgfsContext igfsCtx, IgfsPath path, IgfsFileInfo fileInfo, IgniteUuid parentId,
         int bufSize, IgfsMode mode, @Nullable IgfsFileWorkerBatch batch, IgfsLocalMetrics metrics)
         throws IgniteCheckedException {
         super(path, optimizeBufferSize(bufSize, fileInfo));
@@ -113,9 +113,9 @@ class IgfsOutputStreamImpl extends IgfsOutputStreamAdapter {
         if (fileInfo.lockId() == null)
             throw new IgfsException("Failed to acquire file lock (concurrently modified?): " + path);
 
-        this.ggfsCtx = ggfsCtx;
-        meta = ggfsCtx.meta();
-        data = ggfsCtx.data();
+        this.igfsCtx = igfsCtx;
+        meta = igfsCtx.meta();
+        data = igfsCtx.data();
 
         this.fileInfo = fileInfo;
         this.mode = mode;
@@ -404,7 +404,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStreamAdapter {
      * @return Affinity range.
      */
     private IgfsFileAffinityRange initialStreamRange(IgfsFileInfo fileInfo) {
-        if (!ggfsCtx.configuration().isFragmentizerEnabled())
+        if (!igfsCtx.configuration().isFragmentizerEnabled())
             return null;
 
         if (!Boolean.parseBoolean(fileInfo.properties().get(IgniteFs.PROP_PREFER_LOCAL_WRITES)))

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d6347db/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 3af4d57..73f5950 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
@@ -52,8 +52,8 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
 
     /** Converts context to IGFS. */
     private static final IgniteClosure<IgfsContext,IgniteFs> CTX_TO_IGFS = new C1<IgfsContext, IgniteFs>() {
-        @Override public IgniteFs apply(IgfsContext ggfsCtx) {
-            return ggfsCtx.igfs();
+        @Override public IgniteFs apply(IgfsContext igfsCtx) {
+            return igfsCtx.igfs();
         }
     };
 
@@ -77,11 +77,11 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
 
         assert cfgs != null && cfgs.length > 0;
 
-        validateLocalGgfsConfigurations(cfgs);
+        validateLocalIgfsConfigurations(cfgs);
 
         // Start IGFS instances.
         for (IgfsConfiguration cfg : cfgs) {
-            IgfsContext ggfsCtx = new IgfsContext(
+            IgfsContext igfsCtx = new IgfsContext(
                 ctx,
                 new IgfsConfiguration(cfg),
                 new IgfsMetaManager(),
@@ -90,10 +90,10 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
                 new IgfsFragmentizerManager());
 
             // Start managers first.
-            for (IgfsManager mgr : ggfsCtx.managers())
-                mgr.start(ggfsCtx);
+            for (IgfsManager mgr : igfsCtx.managers())
+                mgr.start(igfsCtx);
 
-            igfsCache.put(maskName(cfg.getName()), ggfsCtx);
+            igfsCache.put(maskName(cfg.getName()), igfsCtx);
         }
 
         if (log.isDebugEnabled())
@@ -107,22 +107,22 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
 
         if (!getBoolean(IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK)) {
             for (ClusterNode n : ctx.discovery().remoteNodes())
-                checkGgfsOnRemoteNode(n);
+                checkIgfsOnRemoteNode(n);
         }
 
-        for (IgfsContext ggfsCtx : igfsCache.values())
-            for (IgfsManager mgr : ggfsCtx.managers())
+        for (IgfsContext igfsCtx : igfsCache.values())
+            for (IgfsManager mgr : igfsCtx.managers())
                 mgr.onKernalStart();
     }
 
     /** {@inheritDoc} */
     @Override public void stop(boolean cancel) {
         // Stop IGFS instances.
-        for (IgfsContext ggfsCtx : igfsCache.values()) {
+        for (IgfsContext igfsCtx : igfsCache.values()) {
             if (log.isDebugEnabled())
-                log.debug("Stopping igfs: " + ggfsCtx.configuration().getName());
+                log.debug("Stopping igfs: " + igfsCtx.configuration().getName());
 
-            List<IgfsManager> mgrs = ggfsCtx.managers();
+            List<IgfsManager> mgrs = igfsCtx.managers();
 
             for (ListIterator<IgfsManager> it = mgrs.listIterator(mgrs.size()); it.hasPrevious();) {
                 IgfsManager mgr = it.previous();
@@ -130,7 +130,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
                 mgr.stop(cancel);
             }
 
-            ggfsCtx.igfs().stop();
+            igfsCtx.igfs().stop();
         }
 
         igfsCache.clear();
@@ -141,11 +141,11 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
 
     /** {@inheritDoc} */
     @Override public void onKernalStop(boolean cancel) {
-        for (IgfsContext ggfsCtx : igfsCache.values()) {
+        for (IgfsContext igfsCtx : igfsCache.values()) {
             if (log.isDebugEnabled())
-                log.debug("Stopping igfs: " + ggfsCtx.configuration().getName());
+                log.debug("Stopping igfs: " + igfsCtx.configuration().getName());
 
-            List<IgfsManager> mgrs = ggfsCtx.managers();
+            List<IgfsManager> mgrs = igfsCtx.managers();
 
             for (ListIterator<IgfsManager> it = mgrs.listIterator(mgrs.size()); it.hasPrevious();) {
                 IgfsManager mgr = it.previous();
@@ -162,7 +162,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
     @Override public void printMemoryStats() {
         X.println(">>>");
         X.println(">>> IGFS processor memory stats [grid=" + ctx.gridName() + ']');
-        X.println(">>>   ggfsCacheSize: " + igfsCache.size());
+        X.println(">>>   igfsCacheSize: " + igfsCache.size());
     }
 
     /** {@inheritDoc} */
@@ -173,9 +173,9 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
 
     /** {@inheritDoc} */
     @Override @Nullable public IgniteFs igfs(@Nullable String name) {
-        IgfsContext ggfsCtx = igfsCache.get(maskName(name));
+        IgfsContext igfsCtx = igfsCache.get(maskName(name));
 
-        return ggfsCtx == null ? null : ggfsCtx.igfs();
+        return igfsCtx == null ? null : igfsCtx.igfs();
     }
 
     /** {@inheritDoc} */
@@ -186,9 +186,9 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public ComputeJob createJob(IgfsJob job, @Nullable String ggfsName, IgfsPath path,
+    @Nullable @Override public ComputeJob createJob(IgfsJob job, @Nullable String igfsName, IgfsPath path,
         long start, long len, IgfsRecordResolver recRslv) {
-        return new IgfsJobImpl(job, ggfsName, path, start, len, recRslv);
+        return new IgfsJobImpl(job, igfsName, path, start, len, recRslv);
     }
 
     /** {@inheritDoc} */
@@ -218,8 +218,8 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
 
         assert gridCfg.getIgfsConfiguration() != null;
 
-        for (IgfsConfiguration ggfsCfg : gridCfg.getIgfsConfiguration()) {
-            CacheConfiguration cacheCfg = cacheCfgs.get(ggfsCfg.getDataCacheName());
+        for (IgfsConfiguration igfsCfg : gridCfg.getIgfsConfiguration()) {
+            CacheConfiguration cacheCfg = cacheCfgs.get(igfsCfg.getDataCacheName());
 
             if (cacheCfg == null)
                 continue; // No cache for the given IGFS configuration.
@@ -232,14 +232,14 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
                 continue;
 
             attrVals.add(new IgfsAttributes(
-                ggfsCfg.getName(),
-                ggfsCfg.getBlockSize(),
+                igfsCfg.getName(),
+                igfsCfg.getBlockSize(),
                 ((IgfsGroupDataBlocksKeyMapper)affMapper).groupSize(),
-                ggfsCfg.getMetaCacheName(),
-                ggfsCfg.getDataCacheName(),
-                ggfsCfg.getDefaultMode(),
-                ggfsCfg.getPathModes(),
-                ggfsCfg.isFragmentizerEnabled()));
+                igfsCfg.getMetaCacheName(),
+                igfsCfg.getDataCacheName(),
+                igfsCfg.getDefaultMode(),
+                igfsCfg.getPathModes(),
+                igfsCfg.isFragmentizerEnabled()));
         }
 
         attrs.put(ATTR_IGFS, attrVals.toArray(new IgfsAttributes[attrVals.size()]));
@@ -258,7 +258,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
      * @param cfgs IGFS configurations
      * @throws IgniteCheckedException If any of IGFS configurations is invalid.
      */
-    private void validateLocalGgfsConfigurations(IgfsConfiguration[] cfgs) throws IgniteCheckedException {
+    private void validateLocalIgfsConfigurations(IgfsConfiguration[] cfgs) throws IgniteCheckedException {
         Collection<String> cfgNames = new HashSet<>();
 
         for (IgfsConfiguration cfg : cfgs) {
@@ -346,7 +346,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
      * @param rmtNode Remote node.
      * @throws IgniteCheckedException If check failed.
      */
-    private void checkGgfsOnRemoteNode(ClusterNode rmtNode) throws IgniteCheckedException {
+    private void checkIgfsOnRemoteNode(ClusterNode rmtNode) throws IgniteCheckedException {
         IgfsAttributes[] locAttrs = ctx.discovery().localNode().attribute(IgniteNodeAttributes.ATTR_IGFS);
         IgfsAttributes[] rmtAttrs = rmtNode.attribute(IgniteNodeAttributes.ATTR_IGFS);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d6347db/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorAdapter.java
index eca525f..b695104 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorAdapter.java
@@ -68,13 +68,13 @@ public abstract class IgfsProcessorAdapter extends GridProcessorAdapter {
      * Create compute job for the given IGFS job.
      *
      * @param job IGFS job.
-     * @param ggfsName IGFS name.
+     * @param igfsName IGFS name.
      * @param path Path.
      * @param start Start position.
      * @param length Length.
      * @param recRslv Record resolver.
      * @return Compute job.
      */
-    @Nullable public abstract ComputeJob createJob(IgfsJob job, @Nullable String ggfsName, IgfsPath path,
+    @Nullable public abstract ComputeJob createJob(IgfsJob job, @Nullable String igfsName, IgfsPath path,
         long start, long length, IgfsRecordResolver recRslv);
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d6347db/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerManager.java
index 7fc0865..e1f4a0f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServerManager.java
@@ -49,8 +49,8 @@ public class IgfsServerManager extends IgfsManager {
 
     /** {@inheritDoc} */
     @Override protected void start0() throws IgniteCheckedException {
-        IgfsConfiguration ggfsCfg = igfsCtx.configuration();
-        Map<String,String> cfg = ggfsCfg.getIpcEndpointConfiguration();
+        IgfsConfiguration igfsCfg = igfsCtx.configuration();
+        Map<String,String> cfg = igfsCfg.getIpcEndpointConfiguration();
 
         if (F.isEmpty(cfg)) {
             // Set default configuration.
@@ -60,14 +60,14 @@ public class IgfsServerManager extends IgfsManager {
             cfg.put("port", String.valueOf(DFLT_IPC_PORT));
         }
 
-        if (ggfsCfg.isIpcEndpointEnabled())
+        if (igfsCfg.isIpcEndpointEnabled())
             bind(cfg, /*management*/false);
 
-        if (ggfsCfg.getManagementPort() >= 0) {
+        if (igfsCfg.getManagementPort() >= 0) {
             cfg = new HashMap<>();
 
             cfg.put("type", "tcp");
-            cfg.put("port", String.valueOf(ggfsCfg.getManagementPort()));
+            cfg.put("port", String.valueOf(igfsCfg.getManagementPort()));
 
             bind(cfg, /*management*/true);
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d6347db/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 62dc68d..1d15037 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
@@ -32,7 +32,7 @@ public class IgfsTaskArgsImpl<T> implements IgfsTaskArgs<T>,  Externalizable {
     private static final long serialVersionUID = 0L;
 
     /** IGFS name. */
-    private String ggfsName;
+    private String igfsName;
 
     /** Paths. */
     private Collection<IgfsPath> paths;
@@ -59,16 +59,16 @@ public class IgfsTaskArgsImpl<T> implements IgfsTaskArgs<T>,  Externalizable {
     /**
      * Constructor.
      *
-     * @param ggfsName IGFS name.
+     * @param igfsName IGFS name.
      * @param paths Paths.
      * @param recRslvr Record resolver.
      * @param skipNonExistentFiles Skip non existent files flag.
      * @param maxRangeLen Maximum range length.
      * @param usrArg User argument.
      */
-    public IgfsTaskArgsImpl(String ggfsName, Collection<IgfsPath> paths, IgfsRecordResolver recRslvr,
+    public IgfsTaskArgsImpl(String igfsName, Collection<IgfsPath> paths, IgfsRecordResolver recRslvr,
         boolean skipNonExistentFiles, long maxRangeLen, T usrArg) {
-        this.ggfsName = ggfsName;
+        this.igfsName = igfsName;
         this.paths = paths;
         this.recRslvr = recRslvr;
         this.skipNonExistentFiles = skipNonExistentFiles;
@@ -78,7 +78,7 @@ public class IgfsTaskArgsImpl<T> implements IgfsTaskArgs<T>,  Externalizable {
 
     /** {@inheritDoc} */
     @Override public String igfsName() {
-        return ggfsName;
+        return igfsName;
     }
 
     /** {@inheritDoc} */
@@ -113,7 +113,7 @@ public class IgfsTaskArgsImpl<T> implements IgfsTaskArgs<T>,  Externalizable {
 
     /** {@inheritDoc} */
     @Override public void writeExternal(ObjectOutput out) throws IOException {
-        U.writeString(out, ggfsName);
+        U.writeString(out, igfsName);
         U.writeCollection(out, paths);
 
         out.writeObject(recRslvr);
@@ -124,7 +124,7 @@ public class IgfsTaskArgsImpl<T> implements IgfsTaskArgs<T>,  Externalizable {
 
     /** {@inheritDoc} */
     @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        ggfsName = U.readString(in);
+        igfsName = U.readString(in);
         paths = U.readCollection(in);
 
         recRslvr = (IgfsRecordResolver)in.readObject();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d6347db/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
----------------------------------------------------------------------
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 2a908b8..0b0557a 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
@@ -44,7 +44,7 @@ import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.igfs.IgfsMode.*;
 
 /**
- * Test fo regular GGFs operations.
+ * Test fo regular igfs operations.
  */
 public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
     /** IGFS block size. */
@@ -173,26 +173,26 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      * Start grid with IGFS.
      *
      * @param gridName Grid name.
-     * @param ggfsName IGFS name
+     * @param igfsName IGFS name
      * @param mode IGFS mode.
      * @param secondaryFs Secondary file system (optional).
      * @param restCfg Rest configuration string (optional).
      * @return Started grid instance.
      * @throws Exception If failed.
      */
-    protected Ignite startGridWithIgfs(String gridName, String ggfsName, IgfsMode mode,
+    protected Ignite startGridWithIgfs(String gridName, String igfsName, IgfsMode mode,
         @Nullable Igfs secondaryFs, @Nullable Map<String, String> restCfg) throws Exception {
-        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
-
-        ggfsCfg.setDataCacheName("dataCache");
-        ggfsCfg.setMetaCacheName("metaCache");
-        ggfsCfg.setName(ggfsName);
-        ggfsCfg.setBlockSize(IGFS_BLOCK_SIZE);
-        ggfsCfg.setDefaultMode(mode);
-        ggfsCfg.setIpcEndpointConfiguration(restCfg);
-        ggfsCfg.setSecondaryFileSystem(secondaryFs);
-        ggfsCfg.setPrefetchBlocks(PREFETCH_BLOCKS);
-        ggfsCfg.setSequentialReadsBeforePrefetch(SEQ_READS_BEFORE_PREFETCH);
+        IgfsConfiguration igfsCfg = new IgfsConfiguration();
+
+        igfsCfg.setDataCacheName("dataCache");
+        igfsCfg.setMetaCacheName("metaCache");
+        igfsCfg.setName(igfsName);
+        igfsCfg.setBlockSize(IGFS_BLOCK_SIZE);
+        igfsCfg.setDefaultMode(mode);
+        igfsCfg.setIpcEndpointConfiguration(restCfg);
+        igfsCfg.setSecondaryFileSystem(secondaryFs);
+        igfsCfg.setPrefetchBlocks(PREFETCH_BLOCKS);
+        igfsCfg.setSequentialReadsBeforePrefetch(SEQ_READS_BEFORE_PREFETCH);
 
         CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
 
@@ -225,7 +225,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
 
         cfg.setDiscoverySpi(discoSpi);
         cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg);
-        cfg.setIgfsConfiguration(ggfsCfg);
+        cfg.setIgfsConfiguration(igfsCfg);
 
         cfg.setLocalHost("127.0.0.1");
         cfg.setConnectorConfiguration(null);
@@ -2132,21 +2132,21 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
     /**
      * Create the given directories and files in the given IGFS.
      *
-     * @param ggfs IGFS.
+     * @param igfs IGFS.
      * @param dirs Directories.
      * @param files Files.
      * @throws Exception If failed.
      */
-    public static void create(Igfs ggfs, @Nullable IgfsPath[] dirs, @Nullable IgfsPath[] files)
+    public static void create(Igfs igfs, @Nullable IgfsPath[] dirs, @Nullable IgfsPath[] files)
         throws Exception {
         if (dirs != null) {
             for (IgfsPath dir : dirs)
-                ggfs.mkdirs(dir);
+                igfs.mkdirs(dir);
         }
 
         if (files != null) {
             for (IgfsPath file : files) {
-                OutputStream os = ggfs.create(file, true);
+                OutputStream os = igfs.create(file, true);
 
                 os.close();
             }
@@ -2182,26 +2182,26 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
     /**
      * Create the file in the given IGFS and write provided data chunks to it.
      *
-     * @param ggfs IGFS.
+     * @param igfs IGFS.
      * @param file File.
      * @param overwrite Overwrite flag.
      * @param blockSize Block size.
      * @param chunks Data chunks.
      * @throws Exception If failed.
      */
-    protected void createFile(IgniteFs ggfs, IgfsPath file, boolean overwrite, long blockSize,
+    protected void createFile(IgniteFs igfs, IgfsPath file, boolean overwrite, long blockSize,
         @Nullable byte[]... chunks) throws Exception {
         IgfsOutputStream os = null;
 
         try {
-            os = ggfs.create(file, 256, overwrite, null, 0, blockSize, null);
+            os = igfs.create(file, 256, overwrite, null, 0, blockSize, null);
 
             writeFileChunks(os, chunks);
         }
         finally {
             U.closeQuiet(os);
 
-            awaitFileClose(ggfs, file);
+            awaitFileClose(igfs, file);
         }
     }
 
@@ -2246,12 +2246,12 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
     /**
      * Await for previously opened output stream to close. This is achieved by requesting dummy update on the file.
      *
-     * @param ggfs IGFS.
+     * @param igfs IGFS.
      * @param file File.
      */
-    public static void awaitFileClose(Igfs ggfs, IgfsPath file) {
+    public static void awaitFileClose(Igfs igfs, IgfsPath file) {
         try {
-            ggfs.update(file, Collections.singletonMap("prop", "val"));
+            igfs.update(file, Collections.singletonMap("prop", "val"));
         }
         catch (IgniteException ignore) {
             // No-op.
@@ -2261,61 +2261,61 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
     /**
      * Ensure that the given paths exist in the given IGFSs.
      *
-     * @param ggfs First IGFS.
-     * @param ggfsSecondary Second IGFS.
+     * @param igfs First IGFS.
+     * @param igfsSecondary Second IGFS.
      * @param paths Paths.
      * @throws Exception If failed.
      */
-    protected void checkExist(IgfsImpl ggfs, IgfsImpl ggfsSecondary, IgfsPath... paths) throws Exception {
-        checkExist(ggfs, paths);
+    protected void checkExist(IgfsImpl igfs, IgfsImpl igfsSecondary, IgfsPath... paths) throws Exception {
+        checkExist(igfs, paths);
 
         if (dual)
-            checkExist(ggfsSecondary, paths);
+            checkExist(igfsSecondary, paths);
     }
 
     /**
      * Ensure that the given paths exist in the given IGFS.
      *
-     * @param ggfs IGFS.
+     * @param igfs IGFS.
      * @param paths Paths.
      * @throws IgniteCheckedException If failed.
      */
-    protected void checkExist(IgfsImpl ggfs, IgfsPath... paths) throws IgniteCheckedException {
+    protected void checkExist(IgfsImpl igfs, IgfsPath... paths) throws IgniteCheckedException {
         for (IgfsPath path : paths) {
-            assert ggfs.context().meta().fileId(path) != null : "Path doesn't exist [igfs=" + ggfs.name() +
+            assert igfs.context().meta().fileId(path) != null : "Path doesn't exist [igfs=" + igfs.name() +
                 ", path=" + path + ']';
-            assert ggfs.exists(path) : "Path doesn't exist [igfs=" + ggfs.name() + ", path=" + path + ']';
+            assert igfs.exists(path) : "Path doesn't exist [igfs=" + igfs.name() + ", path=" + path + ']';
         }
     }
 
     /**
      * Ensure that the given paths don't exist in the given IGFSs.
      *
-     * @param ggfs First IGFS.
-     * @param ggfsSecondary Second IGFS.
+     * @param igfs First IGFS.
+     * @param igfsSecondary Second IGFS.
      * @param paths Paths.
      * @throws Exception If failed.
      */
-    protected void checkNotExist(IgfsImpl ggfs, IgfsImpl ggfsSecondary, IgfsPath... paths)
+    protected void checkNotExist(IgfsImpl igfs, IgfsImpl igfsSecondary, IgfsPath... paths)
         throws Exception {
-        checkNotExist(ggfs, paths);
+        checkNotExist(igfs, paths);
 
         if (dual)
-            checkNotExist(ggfsSecondary, paths);
+            checkNotExist(igfsSecondary, paths);
     }
 
     /**
      * Ensure that the given paths don't exist in the given IGFS.
      *
-     * @param ggfs IGFS.
+     * @param igfs IGFS.
      * @param paths Paths.
      * @throws Exception If failed.
      */
-    protected void checkNotExist(IgfsImpl ggfs, IgfsPath... paths) throws Exception {
+    protected void checkNotExist(IgfsImpl igfs, IgfsPath... paths) throws Exception {
         for (IgfsPath path : paths) {
-            assert ggfs.context().meta().fileId(path) == null : "Path exists [igfs=" + ggfs.name() + ", path=" +
+            assert igfs.context().meta().fileId(path) == null : "Path exists [igfs=" + igfs.name() + ", path=" +
                 path + ']';
-            assert !ggfs.exists(path) : "Path exists [igfs=" + ggfs.name() + ", path=" + path + ']';
+            assert !igfs.exists(path) : "Path exists [igfs=" + igfs.name() + ", path=" + path + ']';
         }
     }
 
@@ -2323,39 +2323,39 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      * Ensure that the given file exists in the given IGFSs and that it has exactly the same content as provided in the
      * "data" parameter.
      *
-     * @param ggfs First IGFS.
-     * @param ggfsSecondary Second IGFS.
+     * @param igfs First IGFS.
+     * @param igfsSecondary Second IGFS.
      * @param file File.
      * @param chunks Expected data.
      * @throws Exception If failed.
      */
-    protected void checkFile(IgfsImpl ggfs, IgfsImpl ggfsSecondary, IgfsPath file,
+    protected void checkFile(IgfsImpl igfs, IgfsImpl igfsSecondary, IgfsPath file,
         @Nullable byte[]... chunks) throws Exception {
-        checkExist(ggfs, file);
-        checkFileContent(ggfs, file, chunks);
+        checkExist(igfs, file);
+        checkFileContent(igfs, file, chunks);
 
         if (dual) {
-            checkExist(ggfsSecondary, file);
-            checkFileContent(ggfsSecondary, file, chunks);
+            checkExist(igfsSecondary, file);
+            checkFileContent(igfsSecondary, file, chunks);
         }
     }
 
     /**
      * Ensure that the given file has exactly the same content as provided in the "data" parameter.
      *
-     * @param ggfs IGFS.
+     * @param igfs IGFS.
      * @param file File.
      * @param chunks Expected data.
      * @throws IOException In case of IO exception.
      * @throws IgniteCheckedException In case of Grid exception.
      */
-    protected void checkFileContent(IgfsImpl ggfs, IgfsPath file, @Nullable byte[]... chunks)
+    protected void checkFileContent(IgfsImpl igfs, IgfsPath file, @Nullable byte[]... chunks)
         throws IOException, IgniteCheckedException {
         if (chunks != null && chunks.length > 0) {
             IgfsInputStream is = null;
 
             try {
-                is = ggfs.open(file);
+                is = igfs.open(file);
 
                 int chunkIdx = 0;
 
@@ -2364,7 +2364,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
 
                     is.readFully(0, buf);
 
-                    assert Arrays.equals(chunk, buf) : "Bad chunk [igfs=" + ggfs.name() + ", chunkIdx=" + chunkIdx +
+                    assert Arrays.equals(chunk, buf) : "Bad chunk [igfs=" + igfs.name() + ", chunkIdx=" + chunkIdx +
                         ", expected=" + Arrays.toString(chunk) + ", actual=" + Arrays.toString(buf) + ']';
 
                     chunkIdx++;
@@ -2415,31 +2415,31 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
     /**
      * Safely clear IGFSs.
      *
-     * @param ggfs First IGFS.
-     * @param ggfsSecondary Second IGFS.
+     * @param igfs First IGFS.
+     * @param igfsSecondary Second IGFS.
      * @throws Exception If failed.
      */
-    protected void clear(IgniteFs ggfs, IgniteFs ggfsSecondary) throws Exception {
-        clear(ggfs);
+    protected void clear(IgniteFs igfs, IgniteFs igfsSecondary) throws Exception {
+        clear(igfs);
 
         if (dual)
-            clear(ggfsSecondary);
+            clear(igfsSecondary);
     }
 
     /**
      * Clear particular IGFS.
      *
-     * @param ggfs IGFS.
+     * @param igfs IGFS.
      * @throws Exception If failed.
      */
-    public static void clear(IgniteFs ggfs) throws Exception {
+    public static void clear(IgniteFs igfs) throws Exception {
         Field workerMapFld = IgfsImpl.class.getDeclaredField("workerMap");
 
         workerMapFld.setAccessible(true);
 
         // Wait for all workers to finish.
         Map<IgfsPath, IgfsFileWorker> workerMap =
-            (Map<IgfsPath, IgfsFileWorker>)workerMapFld.get(ggfs);
+            (Map<IgfsPath, IgfsFileWorker>)workerMapFld.get(igfs);
 
         for (Map.Entry<IgfsPath, IgfsFileWorker> entry : workerMap.entrySet()) {
             entry.getValue().cancel();
@@ -2448,6 +2448,6 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
         }
 
         // Clear igfs.
-        ggfs.format();
+        igfs.format();
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d6347db/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
index acbf956..9da1418 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,9 +58,9 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
-        IgfsEx ggfs = (IgfsEx)grid(0).fileSystem("igfs");
+        IgfsEx igfs = (IgfsEx)grid(0).fileSystem("igfs");
 
-        mgr = ggfs.context().meta();
+        mgr = igfs.context().meta();
     }
 
     /** {@inheritDoc} */
@@ -75,13 +75,13 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
 
         cfg.setDiscoverySpi(discoSpi);
 
-        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
+        IgfsConfiguration igfsCfg = new IgfsConfiguration();
 
-        ggfsCfg.setMetaCacheName(META_CACHE_NAME);
-        ggfsCfg.setDataCacheName(DATA_CACHE_NAME);
-        ggfsCfg.setName("igfs");
+        igfsCfg.setMetaCacheName(META_CACHE_NAME);
+        igfsCfg.setDataCacheName(DATA_CACHE_NAME);
+        igfsCfg.setName("igfs");
 
-        cfg.setIgfsConfiguration(ggfsCfg);
+        cfg.setIgfsConfiguration(igfsCfg);
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d6347db/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java
index 56f6874..be5afe7 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
@@ -56,10 +56,10 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
     private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
 
     /** Primary IGFS instances. */
-    private static IgniteFs[] ggfsPrimary;
+    private static IgniteFs[] igfsPrimary;
 
     /** Secondary IGFS instance. */
-    private static IgniteFs ggfsSecondary;
+    private static IgniteFs igfsSecondary;
 
     /** Primary file system block size. */
     public static final int PRIMARY_BLOCK_SIZE = 512;
@@ -84,12 +84,12 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     private void startPrimary() throws Exception {
-        ggfsPrimary = new IgniteFs[NODES_CNT];
+        igfsPrimary = new IgniteFs[NODES_CNT];
 
         for (int i = 0; i < NODES_CNT; i++) {
             Ignite g = G.start(primaryConfiguration(i));
 
-            ggfsPrimary[i] = g.fileSystem(IGFS_PRIMARY);
+            igfsPrimary[i] = g.fileSystem(IGFS_PRIMARY);
         }
     }
 
@@ -101,20 +101,20 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     private IgniteConfiguration primaryConfiguration(int idx) throws Exception {
-        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
+        IgfsConfiguration igfsCfg = new IgfsConfiguration();
 
-        ggfsCfg.setDataCacheName("dataCache");
-        ggfsCfg.setMetaCacheName("metaCache");
-        ggfsCfg.setName(IGFS_PRIMARY);
-        ggfsCfg.setBlockSize(PRIMARY_BLOCK_SIZE);
-        ggfsCfg.setDefaultMode(PRIMARY);
-        ggfsCfg.setSecondaryFileSystem(ggfsSecondary);
+        igfsCfg.setDataCacheName("dataCache");
+        igfsCfg.setMetaCacheName("metaCache");
+        igfsCfg.setName(IGFS_PRIMARY);
+        igfsCfg.setBlockSize(PRIMARY_BLOCK_SIZE);
+        igfsCfg.setDefaultMode(PRIMARY);
+        igfsCfg.setSecondaryFileSystem(igfsSecondary);
 
         Map<String, IgfsMode> pathModes = new HashMap<>();
 
         pathModes.put("/fileRemote", DUAL_SYNC);
 
-        ggfsCfg.setPathModes(pathModes);
+        igfsCfg.setPathModes(pathModes);
 
         CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
 
@@ -146,7 +146,7 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
 
         cfg.setDiscoverySpi(discoSpi);
         cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg);
-        cfg.setIgfsConfiguration(ggfsCfg);
+        cfg.setIgfsConfiguration(igfsCfg);
 
         cfg.setLocalHost("127.0.0.1");
 
@@ -159,14 +159,14 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     private void startSecondary() throws Exception {
-        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
+        IgfsConfiguration igfsCfg = new IgfsConfiguration();
 
-        ggfsCfg.setDataCacheName("dataCache");
-        ggfsCfg.setMetaCacheName("metaCache");
-        ggfsCfg.setName(IGFS_SECONDARY);
-        ggfsCfg.setBlockSize(SECONDARY_BLOCK_SIZE);
-        ggfsCfg.setDefaultMode(PRIMARY);
-        ggfsCfg.setIpcEndpointConfiguration(SECONDARY_REST_CFG);
+        igfsCfg.setDataCacheName("dataCache");
+        igfsCfg.setMetaCacheName("metaCache");
+        igfsCfg.setName(IGFS_SECONDARY);
+        igfsCfg.setBlockSize(SECONDARY_BLOCK_SIZE);
+        igfsCfg.setDefaultMode(PRIMARY);
+        igfsCfg.setIpcEndpointConfiguration(SECONDARY_REST_CFG);
 
         CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
 
@@ -198,18 +198,18 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
 
         cfg.setDiscoverySpi(discoSpi);
         cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg);
-        cfg.setIgfsConfiguration(ggfsCfg);
+        cfg.setIgfsConfiguration(igfsCfg);
 
         cfg.setLocalHost("127.0.0.1");
 
         Ignite g = G.start(cfg);
 
-        ggfsSecondary = g.fileSystem(IGFS_SECONDARY);
+        igfsSecondary = g.fileSystem(IGFS_SECONDARY);
     }
 
     /** @throws Exception If failed. */
     public void testMetrics() throws Exception {
-        IgniteFs fs = ggfsPrimary[0];
+        IgniteFs fs = igfsPrimary[0];
 
         assertNotNull(fs);
 
@@ -349,7 +349,7 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
 
     /** @throws Exception If failed. */
     public void testMultipleClose() throws Exception {
-        IgniteFs fs = ggfsPrimary[0];
+        IgniteFs fs = igfsPrimary[0];
 
         IgfsOutputStream out = fs.create(new IgfsPath("/file"), false);
 
@@ -373,129 +373,129 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testBlockMetrics() throws Exception {
-        IgfsEx ggfs = (IgfsEx)ggfsPrimary[0];
+        IgfsEx igfs = (IgfsEx)igfsPrimary[0];
 
         IgfsPath fileRemote = new IgfsPath("/fileRemote");
         IgfsPath file1 = new IgfsPath("/file1");
         IgfsPath file2 = new IgfsPath("/file2");
 
         // Create remote file and write some data to it.
-        IgfsOutputStream out = ggfsSecondary.create(fileRemote, 256, true, null, 1, 256, null);
+        IgfsOutputStream out = igfsSecondary.create(fileRemote, 256, true, null, 1, 256, null);
 
-        int rmtBlockSize = ggfsSecondary.info(fileRemote).blockSize();
+        int rmtBlockSize = igfsSecondary.info(fileRemote).blockSize();
 
         out.write(new byte[rmtBlockSize]);
         out.close();
 
         // Start metrics measuring.
-        IgfsMetrics initMetrics = ggfs.metrics();
+        IgfsMetrics initMetrics = igfs.metrics();
 
         // Create empty file.
-        ggfs.create(file1, 256, true, null, 1, 256, null).close();
+        igfs.create(file1, 256, true, null, 1, 256, null).close();
 
-        int blockSize = ggfs.info(file1).blockSize();
+        int blockSize = igfs.info(file1).blockSize();
 
-        checkBlockMetrics(initMetrics, ggfs.metrics(), 0, 0, 0, 0, 0, 0);
+        checkBlockMetrics(initMetrics, igfs.metrics(), 0, 0, 0, 0, 0, 0);
 
         // Write two blocks to the file.
-        IgfsOutputStream os = ggfs.append(file1, false);
+        IgfsOutputStream os = igfs.append(file1, false);
         os.write(new byte[blockSize * 2]);
         os.close();
 
-        checkBlockMetrics(initMetrics, ggfs.metrics(), 0, 0, 0, 2, 0, blockSize * 2);
+        checkBlockMetrics(initMetrics, igfs.metrics(), 0, 0, 0, 2, 0, blockSize * 2);
 
         // Write one more file (one block).
-        os = ggfs.create(file2, 256, true, null, 1, 256, null);
+        os = igfs.create(file2, 256, true, null, 1, 256, null);
         os.write(new byte[blockSize]);
         os.close();
 
-        checkBlockMetrics(initMetrics, ggfs.metrics(), 0, 0, 0, 3, 0, blockSize * 3);
+        checkBlockMetrics(initMetrics, igfs.metrics(), 0, 0, 0, 3, 0, blockSize * 3);
 
         // Read data from the first file.
-        IgfsInputStreamAdapter is = ggfs.open(file1);
+        IgfsInputStreamAdapter is = igfs.open(file1);
         is.readFully(0, new byte[blockSize * 2]);
         is.close();
 
-        checkBlockMetrics(initMetrics, ggfs.metrics(), 2, 0, blockSize * 2, 3, 0, blockSize * 3);
+        checkBlockMetrics(initMetrics, igfs.metrics(), 2, 0, blockSize * 2, 3, 0, blockSize * 3);
 
         // Read data from the second file with hits.
-        is = ggfs.open(file2);
+        is = igfs.open(file2);
         is.readChunks(0, blockSize);
         is.close();
 
-        checkBlockMetrics(initMetrics, ggfs.metrics(), 3, 0, blockSize * 3, 3, 0, blockSize * 3);
+        checkBlockMetrics(initMetrics, igfs.metrics(), 3, 0, blockSize * 3, 3, 0, blockSize * 3);
 
         // Clear the first file.
-        ggfs.create(file1, true).close();
+        igfs.create(file1, true).close();
 
-        checkBlockMetrics(initMetrics, ggfs.metrics(), 3, 0, blockSize * 3, 3, 0, blockSize * 3);
+        checkBlockMetrics(initMetrics, igfs.metrics(), 3, 0, blockSize * 3, 3, 0, blockSize * 3);
 
         // Delete the second file.
-        ggfs.delete(file2, false);
+        igfs.delete(file2, false);
 
-        checkBlockMetrics(initMetrics, ggfs.metrics(), 3, 0, blockSize * 3, 3, 0, blockSize * 3);
+        checkBlockMetrics(initMetrics, igfs.metrics(), 3, 0, blockSize * 3, 3, 0, blockSize * 3);
 
         // Read remote file.
-        is = ggfs.open(fileRemote);
+        is = igfs.open(fileRemote);
         is.readChunks(0, rmtBlockSize);
         is.close();
 
-        checkBlockMetrics(initMetrics, ggfs.metrics(), 4, 1, blockSize * 3 + rmtBlockSize, 3, 0, blockSize * 3);
+        checkBlockMetrics(initMetrics, igfs.metrics(), 4, 1, blockSize * 3 + rmtBlockSize, 3, 0, blockSize * 3);
 
         // Lets wait for blocks will be placed to cache
         U.sleep(300);
 
         // Read remote file again.
-        is = ggfs.open(fileRemote);
+        is = igfs.open(fileRemote);
         is.readChunks(0, rmtBlockSize);
         is.close();
 
-        checkBlockMetrics(initMetrics, ggfs.metrics(), 5, 1, blockSize * 3 + rmtBlockSize * 2, 3, 0, blockSize * 3);
+        checkBlockMetrics(initMetrics, igfs.metrics(), 5, 1, blockSize * 3 + rmtBlockSize * 2, 3, 0, blockSize * 3);
 
-        IgfsMetrics metrics = ggfs.metrics();
+        IgfsMetrics metrics = igfs.metrics();
 
         assert metrics.secondarySpaceSize() == rmtBlockSize;
 
         // Write some data to the file working in DUAL mode.
-        os = ggfs.append(fileRemote, false);
+        os = igfs.append(fileRemote, false);
         os.write(new byte[rmtBlockSize]);
         os.close();
 
         // Additional block read here due to file ending synchronization.
-        checkBlockMetrics(initMetrics, ggfs.metrics(), 5, 1, blockSize * 3 + rmtBlockSize * 2, 4, 1,
+        checkBlockMetrics(initMetrics, igfs.metrics(), 5, 1, blockSize * 3 + rmtBlockSize * 2, 4, 1,
             blockSize * 3 + rmtBlockSize);
 
-        metrics = ggfs.metrics();
+        metrics = igfs.metrics();
 
         assert metrics.secondarySpaceSize() == rmtBlockSize * 2;
 
-        ggfs.delete(fileRemote, false);
+        igfs.delete(fileRemote, false);
 
         U.sleep(300);
 
-        assert ggfs.metrics().secondarySpaceSize() == 0;
+        assert igfs.metrics().secondarySpaceSize() == 0;
 
         // Write partial block to the first file.
-        os = ggfs.append(file1, false);
+        os = igfs.append(file1, false);
         os.write(new byte[blockSize / 2]);
         os.close();
 
-        checkBlockMetrics(initMetrics, ggfs.metrics(), 5, 1, blockSize * 3 + rmtBlockSize * 2, 5, 1,
+        checkBlockMetrics(initMetrics, igfs.metrics(), 5, 1, blockSize * 3 + rmtBlockSize * 2, 5, 1,
             blockSize * 7 / 2 + rmtBlockSize);
 
         // Now read partial block.
         // Read remote file again.
-        is = ggfs.open(file1);
+        is = igfs.open(file1);
         is.seek(blockSize * 2);
         is.readChunks(0, blockSize / 2);
         is.close();
 
-        checkBlockMetrics(initMetrics, ggfs.metrics(), 6, 1, blockSize * 7 / 2 + rmtBlockSize * 2, 5, 1,
+        checkBlockMetrics(initMetrics, igfs.metrics(), 6, 1, blockSize * 7 / 2 + rmtBlockSize * 2, 5, 1,
             blockSize * 7 / 2 + rmtBlockSize);
 
-        ggfs.resetMetrics();
+        igfs.resetMetrics();
 
-        metrics = ggfs.metrics();
+        metrics = igfs.metrics();
 
         assert metrics.blocksReadTotal() == 0;
         assert metrics.blocksReadRemote() == 0;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d6347db/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java
index 0ed202c..2b501f7 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
@@ -42,10 +42,10 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
     private IgniteEx grid;
 
     /** Primary IGFS. */
-    private IgfsImpl ggfs;
+    private IgfsImpl igfs;
 
     /** Secondary IGFS. */
-    private IgfsImpl ggfsSecondary;
+    private IgfsImpl igfsSecondary;
 
     /** Default IGFS mode. */
     private IgfsMode mode;
@@ -82,22 +82,22 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
     private void startUp() throws Exception {
         startUpSecondary();
 
-        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
+        IgfsConfiguration igfsCfg = new IgfsConfiguration();
 
-        ggfsCfg.setDataCacheName("partitioned");
-        ggfsCfg.setMetaCacheName("replicated");
-        ggfsCfg.setName("igfs");
-        ggfsCfg.setBlockSize(512 * 1024);
+        igfsCfg.setDataCacheName("partitioned");
+        igfsCfg.setMetaCacheName("replicated");
+        igfsCfg.setName("igfs");
+        igfsCfg.setBlockSize(512 * 1024);
 
         if (setNullMode)
-            ggfsCfg.setDefaultMode(null);
+            igfsCfg.setDefaultMode(null);
         else if (mode != null)
-            ggfsCfg.setDefaultMode(mode);
+            igfsCfg.setDefaultMode(mode);
 
-        ggfsCfg.setPathModes(pathModes);
+        igfsCfg.setPathModes(pathModes);
 
         if (setSecondaryFs)
-            ggfsCfg.setSecondaryFileSystem(ggfsSecondary);
+            igfsCfg.setSecondaryFileSystem(igfsSecondary);
 
         CacheConfiguration cacheCfg = defaultCacheConfiguration();
 
@@ -128,14 +128,14 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
 
         cfg.setDiscoverySpi(discoSpi);
         cfg.setCacheConfiguration(metaCacheCfg, cacheCfg);
-        cfg.setIgfsConfiguration(ggfsCfg);
+        cfg.setIgfsConfiguration(igfsCfg);
 
         cfg.setLocalHost("127.0.0.1");
         cfg.setConnectorConfiguration(null);
 
         grid = (IgniteEx)G.start(cfg);
 
-        ggfs = (IgfsImpl)grid.fileSystem("igfs");
+        igfs = (IgfsImpl)grid.fileSystem("igfs");
     }
 
     /**
@@ -144,14 +144,14 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     private void startUpSecondary() throws Exception {
-        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
-
-        ggfsCfg.setDataCacheName("partitioned");
-        ggfsCfg.setMetaCacheName("replicated");
-        ggfsCfg.setName("igfs-secondary");
-        ggfsCfg.setBlockSize(512 * 1024);
-        ggfsCfg.setDefaultMode(PRIMARY);
-        ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{
+        IgfsConfiguration igfsCfg = new IgfsConfiguration();
+
+        igfsCfg.setDataCacheName("partitioned");
+        igfsCfg.setMetaCacheName("replicated");
+        igfsCfg.setName("igfs-secondary");
+        igfsCfg.setBlockSize(512 * 1024);
+        igfsCfg.setDefaultMode(PRIMARY);
+        igfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{
             put("type", "tcp");
             put("port", "11500");
         }});
@@ -185,12 +185,12 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
 
         cfg.setDiscoverySpi(discoSpi);
         cfg.setCacheConfiguration(metaCacheCfg, cacheCfg);
-        cfg.setIgfsConfiguration(ggfsCfg);
+        cfg.setIgfsConfiguration(igfsCfg);
 
         cfg.setLocalHost("127.0.0.1");
         cfg.setConnectorConfiguration(null);
 
-        ggfsSecondary = (IgfsImpl)G.start(cfg).fileSystem("igfs-secondary");
+        igfsSecondary = (IgfsImpl)G.start(cfg).fileSystem("igfs-secondary");
     }
 
     /**
@@ -488,11 +488,11 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     private void checkMode(String pathStr, IgfsMode expMode) throws Exception {
-        assert ggfs != null;
+        assert igfs != null;
 
         IgfsPath path = new IgfsPath(pathStr);
 
-        IgfsModeResolver rslvr = ggfs.modeResolver();
+        IgfsModeResolver rslvr = igfs.modeResolver();
 
         IgfsMode mode = rslvr.resolveMode(path);
 
@@ -522,24 +522,24 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
         IgfsPath file = new IgfsPath("/dir/file");
 
         // Create new directory.
-        ggfs.mkdirs(dir);
+        igfs.mkdirs(dir);
 
         // Create new file.
-        IgfsOutputStream os = ggfs.create(file, 1024, true, null, 0, 2048, null);
+        IgfsOutputStream os = igfs.create(file, 1024, true, null, 0, 2048, null);
 
         os.write(testData1);
 
         os.close();
 
         // Re-open it and append.
-        os = ggfs.append(file, 1024, false, null);
+        os = igfs.append(file, 1024, false, null);
 
         os.write(testData2);
 
         os.close();
 
         // Check file content.
-        IgfsInputStream is = ggfs.open(file);
+        IgfsInputStream is = igfs.open(file);
 
         assertEquals(testData.length, is.length());
 
@@ -552,15 +552,15 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
         assert Arrays.equals(testData, data);
 
         if (secondaryUsed) {
-            assert ggfsSecondary.exists(dir);
-            assert ggfsSecondary.exists(file);
+            assert igfsSecondary.exists(dir);
+            assert igfsSecondary.exists(file);
 
             // In ASYNC mode we wait at most 2 seconds for background writer to finish.
             for (int i = 0; i < 20; i++) {
                 IgfsInputStream isSecondary = null;
 
                 try {
-                    isSecondary = ggfsSecondary.open(file);
+                    isSecondary = igfsSecondary.open(file);
 
                     if (isSecondary.length() == testData.length)
                         break;
@@ -572,7 +572,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
                 }
             }
 
-            IgfsInputStream isSecondary = ggfsSecondary.open(file);
+            IgfsInputStream isSecondary = igfsSecondary.open(file);
 
             assertEquals(testData.length, isSecondary.length());
 
@@ -581,8 +581,8 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
             assert Arrays.equals(testData, data);
         }
         else {
-            assert !ggfsSecondary.exists(dir);
-            assert !ggfsSecondary.exists(file);
+            assert !igfsSecondary.exists(dir);
+            assert !igfsSecondary.exists(file);
         }
 
         int cacheSize = grid.cachex("partitioned").size();
@@ -593,12 +593,12 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
             assert cacheSize != 0;
 
         // Now delete all.
-        ggfs.delete(dir, true);
+        igfs.delete(dir, true);
 
-        assert !ggfs.exists(dir);
-        assert !ggfs.exists(file);
+        assert !igfs.exists(dir);
+        assert !igfs.exists(file);
 
-        assert !ggfsSecondary.exists(dir);
-        assert !ggfsSecondary.exists(file);
+        assert !igfsSecondary.exists(dir);
+        assert !igfsSecondary.exists(file);
     }
 }


Mime
View raw message