ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [50/52] [abbrv] incubator-ignite git commit: # IGNITE-226: WIP.
Date Fri, 13 Feb 2015 13:14:53 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/5443bb38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5443bb38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5443bb38

Branch: refs/heads/ignite-226
Commit: 5443bb38fd41287a09cf314163fc017913ae7903
Parents: 5e12908
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Fri Feb 13 14:55:47 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Fri Feb 13 14:55:47 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/igfs/mapreduce/IgfsTask.java  |   2 +-
 .../ignite/internal/GridKernalContext.java      |   6 +-
 .../ignite/internal/GridKernalContextImpl.java  |  28 +-
 .../apache/ignite/internal/IgniteKernal.java    |  12 +-
 .../ignite/internal/IgniteNodeAttributes.java   |   2 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |  22 +-
 .../igfs/common/IgfsControlResponse.java        |  62 +--
 .../igfs/common/IgfsHandshakeRequest.java       |  12 +-
 .../ignite/internal/igfs/common/IgfsLogger.java |  10 +-
 .../internal/igfs/common/IgfsMarshaller.java    |   4 +-
 .../ignite/internal/igfs/common/package.html    |   2 +-
 .../processors/cache/GridCacheAdapter.java      |  36 +-
 .../processors/cache/GridCacheMapEntry.java     |   2 +-
 .../processors/cache/GridCacheProcessor.java    |  18 +-
 .../processors/cache/GridCacheUtils.java        |  16 +-
 .../closure/GridClosureProcessor.java           |   2 +-
 .../internal/processors/igfs/IgfsContext.java   |   2 +-
 .../processors/igfs/IgfsDataManager.java        |   8 +-
 .../processors/igfs/IgfsDeleteWorker.java       |   4 +-
 .../processors/igfs/IgfsHandshakeResponse.java  |  14 +-
 .../internal/processors/igfs/IgfsImpl.java      |  88 ++--
 .../processors/igfs/IgfsIpcHandler.java         |  78 ++--
 .../processors/igfs/IgfsNoopProcessor.java      |   4 +-
 .../internal/processors/igfs/IgfsProcessor.java |  10 +-
 .../processors/igfs/IgfsProcessorAdapter.java   |   4 +-
 .../visor/node/VisorNodeDataCollectorJob.java   |   6 +-
 .../processors/igfs/IgfsAbstractSelfTest.java   | 188 ++++----
 .../igfs/IgfsDataManagerSelfTest.java           |   8 +-
 .../igfs/IgfsDualAbstractSelfTest.java          | 456 +++++++++----------
 .../IgfsAbstractRecordResolverSelfTest.java     |  24 +-
 ...IgfsByteDelimiterRecordResolverSelfTest.java |   4 +-
 .../IgfsFixedLengthRecordResolverSelfTest.java  |   4 +-
 ...sNewLineDelimiterRecordResolverSelfTest.java |   4 +-
 ...fsStringDelimiterRecordResolverSelfTest.java |   4 +-
 .../igfs/hadoop/v1/IgfsHadoopFileSystem.java    |   2 +-
 .../igfs/hadoop/v2/IgfsHadoopFileSystem.java    |   2 +-
 .../internal/igfs/hadoop/IgfsHadoopOutProc.java |   2 +-
 .../IgfsHadoopFileSystemClientSelfTest.java     |   2 +-
 38 files changed, 577 insertions(+), 577 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/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 3224829..3e1723d 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
@@ -89,7 +89,7 @@ public abstract class IgfsTask<T, R> extends ComputeTaskAdapter<IgfsTaskArgs<T>,
         assert args != null;
 
         IgniteFs fs = ignite.fileSystem(args.igfsName());
-        IgfsProcessorAdapter igfsProc = ((IgniteKernal) ignite).context().ggfs();
+        IgfsProcessorAdapter igfsProc = ((IgniteKernal) ignite).context().igfs();
 
         Map<ComputeJob, ClusterNode> splitMap = new HashMap<>();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
index 2e0f378..c2483a1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
@@ -261,14 +261,14 @@ public interface GridKernalContext extends Iterable<GridComponent> {
      *
      * @return File system processor.
      */
-    public IgfsProcessorAdapter ggfs();
+    public IgfsProcessorAdapter igfs();
 
     /**
      * Gets GGFS utils processor.
      *
      * @return GGFS utils processor.
      */
-    public IgfsHelper ggfsHelper();
+    public IgfsHelper igfsHelper();
 
     /**
      * Gets stream processor.
@@ -506,7 +506,7 @@ public interface GridKernalContext extends Iterable<GridComponent> {
      *
      * @return Thread pool implementation to be used for GGFS outgoing message sending.
      */
-    public ExecutorService getGgfsExecutorService();
+    public ExecutorService getIgfsExecutorService();
 
     /**
      * Should return an instance of fully configured thread pool to be used for

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index 699d10a..f59e7bc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -214,11 +214,11 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
 
     /** */
     @GridToStringInclude
-    private IgfsProcessorAdapter ggfsProc;
+    private IgfsProcessorAdapter igfsProc;
 
     /** */
     @GridToStringInclude
-    private IgfsHelper ggfsHelper;
+    private IgfsHelper igfsHelper;
 
     /** */
     @GridToStringInclude
@@ -278,7 +278,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
 
     /** */
     @GridToStringExclude
-    private ExecutorService ggfsExecSvc;
+    private ExecutorService igfsExecSvc;
 
     /** */
     @GridToStringExclude
@@ -325,7 +325,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
      *  @param sysExecSvc System executor service.
      *  @param p2pExecSvc P2P executor service.
      *  @param mgmtExecSvc Management executor service.
-     *  @param ggfsExecSvc GGFS executor service.
+     *  @param igfsExecSvc GGFS executor service.
      *  @param restExecSvc REST executor service.
      */
     @SuppressWarnings("TypeMayBeWeakened")
@@ -339,7 +339,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
         ExecutorService sysExecSvc,
         ExecutorService p2pExecSvc,
         ExecutorService mgmtExecSvc,
-        ExecutorService ggfsExecSvc,
+        ExecutorService igfsExecSvc,
         ExecutorService restExecSvc) {
         assert grid != null;
         assert cfg != null;
@@ -353,7 +353,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
         this.sysExecSvc = sysExecSvc;
         this.p2pExecSvc = p2pExecSvc;
         this.mgmtExecSvc = mgmtExecSvc;
-        this.ggfsExecSvc = ggfsExecSvc;
+        this.igfsExecSvc = igfsExecSvc;
         this.restExecSvc = restExecSvc;
 
         try {
@@ -452,7 +452,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
         else if (comp instanceof GridDataLoaderProcessor)
             dataLdrProc = (GridDataLoaderProcessor)comp;
         else if (comp instanceof IgfsProcessorAdapter)
-            ggfsProc = (IgfsProcessorAdapter)comp;
+            igfsProc = (IgfsProcessorAdapter)comp;
         else if (comp instanceof GridOffHeapProcessor)
             offheapProc = (GridOffHeapProcessor)comp;
         else if (comp instanceof GridStreamProcessor)
@@ -482,7 +482,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
         assert helper != null;
 
         if (helper instanceof IgfsHelper)
-            ggfsHelper = (IgfsHelper)helper;
+            igfsHelper = (IgfsHelper)helper;
         else
             assert false : "Unknown helper class: " + helper.getClass();
     }
@@ -676,13 +676,13 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
     }
 
     /** {@inheritDoc} */
-    @Override public IgfsProcessorAdapter ggfs() {
-        return ggfsProc;
+    @Override public IgfsProcessorAdapter igfs() {
+        return igfsProc;
     }
 
     /** {@inheritDoc} */
-    @Override public IgfsHelper ggfsHelper() {
-        return ggfsHelper;
+    @Override public IgfsHelper igfsHelper() {
+        return igfsHelper;
     }
 
     /** {@inheritDoc} */
@@ -857,8 +857,8 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
     }
 
     /** {@inheritDoc} */
-    @Override public ExecutorService getGgfsExecutorService() {
-        return ggfsExecSvc;
+    @Override public ExecutorService getIgfsExecutorService() {
+        return igfsExecSvc;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/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 c1668be..45972a6 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
@@ -527,13 +527,13 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit
      *@param sysExecSvc
      * @param p2pExecSvc
      * @param mgmtExecSvc
-     * @param ggfsExecSvc
+     * @param igfsExecSvc
      * @param errHnd Error handler to use for notification about startup problems.  @throws IgniteCheckedException Thrown in case of any errors.
      */
     @SuppressWarnings({"CatchGenericClass", "unchecked"})
     public void start(final IgniteConfiguration cfg, ExecutorService utilityCachePool, final ExecutorService execSvc,
         final ExecutorService sysExecSvc, ExecutorService p2pExecSvc, ExecutorService mgmtExecSvc,
-        ExecutorService ggfsExecSvc, ExecutorService restExecSvc, GridAbsClosure errHnd)
+        ExecutorService igfsExecSvc, ExecutorService restExecSvc, GridAbsClosure errHnd)
         throws IgniteCheckedException {
         gw.compareAndSet(null, new GridKernalGatewayImpl(cfg.getGridName()));
 
@@ -644,7 +644,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit
         try {
             GridKernalContextImpl ctx =
                 new GridKernalContextImpl(log, this, cfg, gw, utilityCachePool, execSvc, sysExecSvc, p2pExecSvc,
-                    mgmtExecSvc, ggfsExecSvc, restExecSvc);
+                    mgmtExecSvc, igfsExecSvc, restExecSvc);
 
             nodeLoc = new ClusterNodeLocalMapImpl(ctx);
 
@@ -2896,7 +2896,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit
         guard();
 
         try{
-            IgniteFs fs = ctx.ggfs().ggfs(name);
+            IgniteFs fs = ctx.igfs().igfs(name);
 
             if (fs == null)
                 throw new IllegalArgumentException("IgniteFs is not configured: " + name);
@@ -2913,7 +2913,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit
         guard();
 
         try {
-            return ctx.ggfs().ggfs(name);
+            return ctx.igfs().igfs(name);
         }
         finally {
             unguard();
@@ -2925,7 +2925,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit
         guard();
 
         try {
-            return ctx.ggfs().ggfss();
+            return ctx.igfs().igfss();
         }
         finally {
             unguard();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
index 082908a..ca6f79b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
@@ -64,7 +64,7 @@ public final class IgniteNodeAttributes {
     public static final String ATTR_TX_CONFIG = ATTR_PREFIX + ".tx";
 
     /** Internal attribute name constant. */
-    public static final String ATTR_GGFS = ATTR_PREFIX + ".igfs";
+    public static final String ATTR_IGFS = ATTR_PREFIX + ".igfs";
 
     /** Internal attribute name constant. */
     public static final String ATTR_MONGO = ATTR_PREFIX + ".mongo";

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 0027d70..cbf3cdc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1166,8 +1166,8 @@ public class IgnitionEx {
         /** P2P executor service. */
         private ExecutorService p2pExecSvc;
 
-        /** GGFS executor service. */
-        private ExecutorService ggfsExecSvc;
+        /** IGFS executor service. */
+        private ExecutorService igfsExecSvc;
 
         /** REST requests executor service. */
         private ExecutorService restExecSvc;
@@ -1502,7 +1502,7 @@ public class IgnitionEx {
                 new LinkedBlockingQueue<Runnable>());
 
             // Note that we do not pre-start threads here as igfs pool may not be needed.
-            ggfsExecSvc = new IgniteThreadPoolExecutor(
+            igfsExecSvc = new IgniteThreadPoolExecutor(
                 "igfs-" + cfg.getGridName(),
                 cfg.getIgfsThreadPoolSize(),
                 cfg.getIgfsThreadPoolSize(),
@@ -1561,13 +1561,13 @@ public class IgnitionEx {
             myCfg.setMarshalLocalJobs(cfg.isMarshalLocalJobs());
             myCfg.setNodeId(nodeId);
 
-            IgfsConfiguration[] ggfsCfgs = cfg.getIgfsConfiguration();
+            IgfsConfiguration[] igfsCfgs = cfg.getIgfsConfiguration();
 
-            if (ggfsCfgs != null) {
-                IgfsConfiguration[] clone = ggfsCfgs.clone();
+            if (igfsCfgs != null) {
+                IgfsConfiguration[] clone = igfsCfgs.clone();
 
-                for (int i = 0; i < ggfsCfgs.length; i++)
-                    clone[i] = new IgfsConfiguration(ggfsCfgs[i]);
+                for (int i = 0; i < igfsCfgs.length; i++)
+                    clone[i] = new IgfsConfiguration(igfsCfgs[i]);
 
                 myCfg.setIgfsConfiguration(clone);
             }
@@ -1845,7 +1845,7 @@ public class IgnitionEx {
                 // Init here to make grid available to lifecycle listeners.
                 grid = grid0;
 
-                grid0.start(myCfg, utilityCacheExecSvc, execSvc, sysExecSvc, p2pExecSvc, mgmtExecSvc, ggfsExecSvc,
+                grid0.start(myCfg, utilityCacheExecSvc, execSvc, sysExecSvc, p2pExecSvc, mgmtExecSvc, igfsExecSvc,
                     restExecSvc,
                     new CA() {
                         @Override public void apply() {
@@ -2145,9 +2145,9 @@ public class IgnitionEx {
 
             p2pExecSvc = null;
 
-            U.shutdownNow(getClass(), ggfsExecSvc, log);
+            U.shutdownNow(getClass(), igfsExecSvc, log);
 
-            ggfsExecSvc = null;
+            igfsExecSvc = null;
 
             if (restExecSvc != null)
                 U.shutdownNow(getClass(), restExecSvc, log);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java
index 90c72e2..38587b3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java
@@ -37,7 +37,7 @@ public class IgfsControlResponse extends IgfsMessage {
     private static final int ERR_GENERIC = 0;
 
     /** Generic GGFS error while performing operations. */
-    private static final int ERR_GGFS_GENERIC = 1;
+    private static final int ERR_IGFS_GENERIC = 1;
 
     /** Target file not found. */
     private static final int ERR_FILE_NOT_FOUND = 2;
@@ -64,22 +64,22 @@ public class IgfsControlResponse extends IgfsMessage {
     public static final int RES_TYPE_LONG = 1;
 
     /** Response is GridGgfsFile. */
-    public static final int RES_TYPE_GGFS_FILE = 2;
+    public static final int RES_TYPE_IGFS_FILE = 2;
 
     /** Response is GridGgfsFileInfo. */
-    public static final int RES_TYPE_GGFS_STREAM_DESCRIPTOR = 3;
+    public static final int RES_TYPE_IGFS_STREAM_DESCRIPTOR = 3;
 
     /** Response is GridGgfsPath. */
-    public static final int RES_TYPE_GGFS_PATH = 4;
+    public static final int RES_TYPE_IGFS_PATH = 4;
 
     /** Response is collection of GridGgfsFile. */
-    public static final int RES_TYPE_COL_GGFS_FILE = 5;
+    public static final int RES_TYPE_COL_IGFS_FILE = 5;
 
     /** Response is collection of GridGgfsPath. */
-    public static final int RES_TYPE_COL_GGFS_PATH = 6;
+    public static final int RES_TYPE_COL_IGFS_PATH = 6;
 
     /** Response is collection of GridGgfsBlockLocation. */
-    public static final int RES_TYPE_COL_GGFS_BLOCK_LOCATION = 7;
+    public static final int RES_TYPE_COL_IGFS_BLOCK_LOCATION = 7;
 
     /** Response is collection of GridGgfsBlockLocation. */
     public static final int RES_TYPE_BYTE_ARRAY = 8;
@@ -94,7 +94,7 @@ public class IgfsControlResponse extends IgfsMessage {
     public static final int RES_TYPE_STATUS = 11;
 
     /** Response is a path summary. */
-    public static final int RES_TYPE_GGFS_PATH_SUMMARY = 12;
+    public static final int RES_TYPE_IGFS_PATH_SUMMARY = 12;
 
     /** Message header size. */
     public static final int RES_HEADER_SIZE = 9;
@@ -160,7 +160,7 @@ public class IgfsControlResponse extends IgfsMessage {
      * @param res Response.
      */
     public void response(IgfsInputStreamDescriptor res) {
-        resType = RES_TYPE_GGFS_STREAM_DESCRIPTOR;
+        resType = RES_TYPE_IGFS_STREAM_DESCRIPTOR;
 
         this.res = res;
     }
@@ -169,7 +169,7 @@ public class IgfsControlResponse extends IgfsMessage {
      * @param res Response.
      */
     public void response(IgfsFile res) {
-        resType = RES_TYPE_GGFS_FILE;
+        resType = RES_TYPE_IGFS_FILE;
 
         this.res = res;
     }
@@ -178,7 +178,7 @@ public class IgfsControlResponse extends IgfsMessage {
      * @param res Response.
      */
     public void response(IgfsPath res) {
-        resType = RES_TYPE_GGFS_PATH;
+        resType = RES_TYPE_IGFS_PATH;
 
         this.res = res;
     }
@@ -187,7 +187,7 @@ public class IgfsControlResponse extends IgfsMessage {
      * @param res Path summary response.
      */
     public void response(IgfsPathSummary res) {
-        resType = RES_TYPE_GGFS_PATH_SUMMARY;
+        resType = RES_TYPE_IGFS_PATH_SUMMARY;
 
         this.res = res;
     }
@@ -196,7 +196,7 @@ public class IgfsControlResponse extends IgfsMessage {
      * @param res Response.
      */
     public void files(Collection<IgfsFile> res) {
-        resType = RES_TYPE_COL_GGFS_FILE;
+        resType = RES_TYPE_COL_IGFS_FILE;
 
         this.res = res;
     }
@@ -205,7 +205,7 @@ public class IgfsControlResponse extends IgfsMessage {
      * @param res Response.
      */
     public void paths(Collection<IgfsPath> res) {
-        resType = RES_TYPE_COL_GGFS_PATH;
+        resType = RES_TYPE_COL_IGFS_PATH;
 
         this.res = res;
     }
@@ -214,7 +214,7 @@ public class IgfsControlResponse extends IgfsMessage {
      * @param res Response.
      */
     public void locations(Collection<IgfsBlockLocation> res) {
-        resType = RES_TYPE_COL_GGFS_BLOCK_LOCATION;
+        resType = RES_TYPE_COL_IGFS_BLOCK_LOCATION;
 
         this.res = res;
     }
@@ -272,7 +272,7 @@ public class IgfsControlResponse extends IgfsMessage {
             throw new IgfsInvalidHdfsVersionException(err);
         else if (errCode == ERR_CORRUPTED_FILE)
             throw new IgfsCorruptedFileException(err);
-        else if (errCode == ERR_GGFS_GENERIC)
+        else if (errCode == ERR_IGFS_GENERIC)
             throw new IgfsException(err);
 
         throw new IgniteCheckedException(err);
@@ -346,7 +346,7 @@ public class IgfsControlResponse extends IgfsMessage {
             return ERR_CORRUPTED_FILE;
             // This check should be the last.
         else if (e.hasCause(IgfsException.class))
-            return ERR_GGFS_GENERIC;
+            return ERR_IGFS_GENERIC;
 
         return ERR_GENERIC;
     }
@@ -401,10 +401,10 @@ public class IgfsControlResponse extends IgfsMessage {
 
                 break;
 
-            case RES_TYPE_GGFS_PATH:
-            case RES_TYPE_GGFS_PATH_SUMMARY:
-            case RES_TYPE_GGFS_FILE:
-            case RES_TYPE_GGFS_STREAM_DESCRIPTOR:
+            case RES_TYPE_IGFS_PATH:
+            case RES_TYPE_IGFS_PATH_SUMMARY:
+            case RES_TYPE_IGFS_FILE:
+            case RES_TYPE_IGFS_STREAM_DESCRIPTOR:
             case RES_TYPE_HANDSHAKE:
             case RES_TYPE_STATUS: {
                 out.writeBoolean(res != null);
@@ -415,9 +415,9 @@ public class IgfsControlResponse extends IgfsMessage {
                 break;
             }
 
-            case RES_TYPE_COL_GGFS_FILE:
-            case RES_TYPE_COL_GGFS_PATH:
-            case RES_TYPE_COL_GGFS_BLOCK_LOCATION: {
+            case RES_TYPE_COL_IGFS_FILE:
+            case RES_TYPE_COL_IGFS_PATH:
+            case RES_TYPE_COL_IGFS_BLOCK_LOCATION: {
                 Collection<Externalizable> items = (Collection<Externalizable>)res;
 
                 if (items != null) {
@@ -471,7 +471,7 @@ public class IgfsControlResponse extends IgfsMessage {
 
                 break;
 
-            case RES_TYPE_GGFS_PATH: {
+            case RES_TYPE_IGFS_PATH: {
                 boolean hasVal = in.readBoolean();
 
                 if (hasVal) {
@@ -485,7 +485,7 @@ public class IgfsControlResponse extends IgfsMessage {
                 break;
             }
 
-            case RES_TYPE_GGFS_PATH_SUMMARY: {
+            case RES_TYPE_IGFS_PATH_SUMMARY: {
                 boolean hasVal = in.readBoolean();
 
                 if (hasVal) {
@@ -499,7 +499,7 @@ public class IgfsControlResponse extends IgfsMessage {
                 break;
             }
 
-            case RES_TYPE_GGFS_FILE: {
+            case RES_TYPE_IGFS_FILE: {
                 boolean hasVal = in.readBoolean();
 
                 if (hasVal) {
@@ -513,7 +513,7 @@ public class IgfsControlResponse extends IgfsMessage {
                 break;
             }
 
-            case RES_TYPE_GGFS_STREAM_DESCRIPTOR: {
+            case RES_TYPE_IGFS_STREAM_DESCRIPTOR: {
                 boolean hasVal = in.readBoolean();
 
                 if (hasVal) {
@@ -555,7 +555,7 @@ public class IgfsControlResponse extends IgfsMessage {
                 break;
             }
 
-            case RES_TYPE_COL_GGFS_FILE: {
+            case RES_TYPE_COL_IGFS_FILE: {
                 Collection<IgfsFile> files = null;
 
                 int size = in.readInt();
@@ -577,7 +577,7 @@ public class IgfsControlResponse extends IgfsMessage {
                 break;
             }
 
-            case RES_TYPE_COL_GGFS_PATH: {
+            case RES_TYPE_COL_IGFS_PATH: {
                 Collection<IgfsPath> paths = null;
 
                 int size = in.readInt();
@@ -599,7 +599,7 @@ public class IgfsControlResponse extends IgfsMessage {
                 break;
             }
 
-            case RES_TYPE_COL_GGFS_BLOCK_LOCATION: {
+            case RES_TYPE_COL_IGFS_BLOCK_LOCATION: {
                 Collection<IgfsBlockLocation> locations = null;
 
                 int size = in.readInt();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsHandshakeRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsHandshakeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsHandshakeRequest.java
index 068303c..0929cf8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsHandshakeRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsHandshakeRequest.java
@@ -29,7 +29,7 @@ public class IgfsHandshakeRequest extends IgfsMessage {
     private String gridName;
 
     /** Expected GGFS name. */
-    private String ggfsName;
+    private String igfsName;
 
     /** Logger directory. */
     private String logDir;
@@ -61,15 +61,15 @@ public class IgfsHandshakeRequest extends IgfsMessage {
     /**
      * @return GGFS name.
      */
-    public String ggfsName() {
-        return ggfsName;
+    public String igfsName() {
+        return igfsName;
     }
 
     /**
-     * @param ggfsName GGFS name.
+     * @param igfsName GGFS name.
      */
-    public void ggfsName(String ggfsName) {
-        this.ggfsName = ggfsName;
+    public void igfsName(String igfsName) {
+        this.igfsName = igfsName;
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java
index 510d480..eb7b854 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java
@@ -161,7 +161,7 @@ public final class IgfsLogger {
      *
      * @return Logger instance.
      */
-    public static IgfsLogger logger(String endpoint, String ggfsName, String dir, int batchSize) {
+    public static IgfsLogger logger(String endpoint, String igfsName, String dir, int batchSize) {
         if (endpoint == null)
             endpoint = "";
 
@@ -171,7 +171,7 @@ public final class IgfsLogger {
             IgfsLogger log = loggers.get(endpoint);
 
             if (log == null) {
-                log = new IgfsLogger(endpoint, ggfsName, dir, batchSize);
+                log = new IgfsLogger(endpoint, igfsName, dir, batchSize);
 
                 IgfsLogger log0 = loggers.putIfAbsent(endpoint, log);
 
@@ -199,11 +199,11 @@ public final class IgfsLogger {
      * Construct normal file logger.
      *
      * @param endpoint Endpoint.
-     * @param ggfsName GGFS name.
+     * @param igfsName IGFS name.
      * @param dir Log file path.
      * @param batchSize Batch size.
      */
-    private IgfsLogger(String endpoint, String ggfsName, String dir, int batchSize) {
+    private IgfsLogger(String endpoint, String igfsName, String dir, int batchSize) {
         A.notNull(endpoint, "endpoint cannot be null");
         A.notNull(dir, "dir cannot be null");
         A.ensure(batchSize > 0, "batch size cannot be negative");
@@ -220,7 +220,7 @@ public final class IgfsLogger {
         A.ensure(dirFile.isDirectory(), "dir must point to a directory");
         A.ensure(dirFile.exists(), "dir must exist");
 
-        file = new File(dirFile, "igfs-log-" + ggfsName + "-" + pid + ".csv");
+        file = new File(dirFile, "igfs-log-" + igfsName + "-" + pid + ".csv");
 
         entries = new ConcurrentLinkedDeque8<>();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java
index dcbf489..104b6d9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java
@@ -90,7 +90,7 @@ public class IgfsMarshaller {
                     IgfsHandshakeRequest req = (IgfsHandshakeRequest)msg;
 
                     U.writeString(out, req.gridName());
-                    U.writeString(out, req.ggfsName());
+                    U.writeString(out, req.igfsName());
                     U.writeString(out, req.logDirectory());
 
                     break;
@@ -206,7 +206,7 @@ public class IgfsMarshaller {
                     IgfsHandshakeRequest req = new IgfsHandshakeRequest();
 
                     req.gridName(U.readString(in));
-                    req.ggfsName(U.readString(in));
+                    req.igfsName(U.readString(in));
                     req.logDirectory(U.readString(in));
 
                     msg = req;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/package.html
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/package.html b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/package.html
index ed9fac6..2c576ca 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/package.html
+++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/package.html
@@ -19,6 +19,6 @@
 <html>
 <body>
     <!-- Package description. -->
-    Contains GGFS classes that are common between client and server.
+    Contains IGFS classes that are common between client and server.
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 7de1b26..fc3c061 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -169,7 +169,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
     private CacheAffinity<K> aff;
 
     /** Whether this cache is GGFS data cache. */
-    private boolean ggfsDataCache;
+    private boolean igfsDataCache;
 
     /** Whether this cache is Mongo data cache. */
     @SuppressWarnings("UnusedDeclaration")
@@ -180,10 +180,10 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
     private boolean mongoMetaCache;
 
     /** Current GGFS data cache size. */
-    private LongAdder ggfsDataCacheSize;
+    private LongAdder igfsDataCacheSize;
 
     /** Max space for GGFS. */
-    private long ggfsDataSpaceMax;
+    private long igfsDataSpaceMax;
 
     /** Asynchronous operations limit semaphore. */
     private Semaphore asyncOpsSem;
@@ -237,18 +237,18 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
 
         mxBean = new CacheMetricsMXBeanImpl(this);
 
-        IgfsConfiguration[] ggfsCfgs = gridCfg.getIgfsConfiguration();
+        IgfsConfiguration[] igfsCfgs = gridCfg.getIgfsConfiguration();
 
-        if (ggfsCfgs != null) {
-            for (IgfsConfiguration ggfsCfg : ggfsCfgs) {
-                if (F.eq(ctx.name(), ggfsCfg.getDataCacheName())) {
+        if (igfsCfgs != null) {
+            for (IgfsConfiguration igfsCfg : igfsCfgs) {
+                if (F.eq(ctx.name(), igfsCfg.getDataCacheName())) {
                     if (!ctx.isNear()) {
-                        ggfsDataCache = true;
-                        ggfsDataCacheSize = new LongAdder();
+                        igfsDataCache = true;
+                        igfsDataCacheSize = new LongAdder();
 
-                        ggfsDataSpaceMax = ggfsCfg.getMaxSpaceSize();
+                        igfsDataSpaceMax = igfsCfg.getMaxSpaceSize();
 
-                        if (ggfsDataSpaceMax == 0) {
+                        if (igfsDataSpaceMax == 0) {
                             long maxMem = Runtime.getRuntime().maxMemory();
 
                             // We leave JVM at least 500M of memory for correct operation.
@@ -259,7 +259,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
 
                             long dfltMaxSize = (long)(0.8f * maxMem);
 
-                            ggfsDataSpaceMax = Math.min(dfltMaxSize, jvmFreeSize);
+                            igfsDataSpaceMax = Math.min(dfltMaxSize, jvmFreeSize);
                         }
                     }
 
@@ -4746,19 +4746,19 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
 
     /** {@inheritDoc} */
     @Override public boolean isIgfsDataCache() {
-        return ggfsDataCache;
+        return igfsDataCache;
     }
 
     /** {@inheritDoc} */
     @Override public long igfsDataSpaceUsed() {
-        assert ggfsDataCache;
+        assert igfsDataCache;
 
-        return ggfsDataCacheSize.longValue();
+        return igfsDataCacheSize.longValue();
     }
 
     /** {@inheritDoc} */
     @Override public long igfsDataSpaceMax() {
-        return ggfsDataSpaceMax;
+        return igfsDataSpaceMax;
     }
 
     /** {@inheritDoc} */
@@ -4777,9 +4777,9 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
      * @param delta Size delta.
      */
     public void onIgfsDataSizeChanged(long delta) {
-        assert ggfsDataCache;
+        assert igfsDataCache;
 
-        ggfsDataCacheSize.add(delta);
+        igfsDataCacheSize.add(delta);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index d640bc1..0f0af6e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -195,7 +195,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V>
         assert Thread.holdsLock(this);
 
         // In case we deal with GGFS cache, count updated data
-        if (cctx.cache().isIgfsDataCache() && cctx.kernalContext().ggfsHelper().isIgfsBlockKey(key())) {
+        if (cctx.cache().isIgfsDataCache() && cctx.kernalContext().igfsHelper().isIgfsBlockKey(key())) {
             int newSize = valueLength((byte[])val, valBytes != null ? GridCacheValueBytes.marshaled(valBytes) :
                 GridCacheValueBytes.nil());
             int oldSize = valueLength((byte[])this.val, this.val == null ? valueBytesUnlocked() :

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index c260d5a..edb7f3e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -167,7 +167,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
         if (cfg.getAffinityMapper() == null)
             cfg.setAffinityMapper(new GridCacheDefaultAffinityKeyMapper());
 
-        ctx.ggfsHelper().preProcessCacheConfiguration(cfg);
+        ctx.igfsHelper().preProcessCacheConfiguration(cfg);
 
         if (cfg.getPreloadMode() == null)
             cfg.setPreloadMode(ASYNC);
@@ -405,7 +405,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
             }
         }
 
-        ctx.ggfsHelper().validateCacheConfiguration(cc);
+        ctx.igfsHelper().validateCacheConfiguration(cc);
 
         switch (cc.getMemoryMode()) {
             case OFFHEAP_VALUES: {
@@ -440,10 +440,10 @@ public class GridCacheProcessor extends GridProcessorAdapter {
                     cc.getName());
         }
 
-        boolean ggfsCache = CU.isGgfsCache(c, cc.getName());
+        boolean igfsCache = CU.isIgfsCache(c, cc.getName());
         boolean utilityCache = CU.isUtilityCache(cc.getName());
 
-        if (!ggfsCache && !utilityCache && !cc.isQueryIndexEnabled())
+        if (!igfsCache && !utilityCache && !cc.isQueryIndexEnabled())
             U.warn(log, "Query indexing is disabled (queries will not work) for cache: '" + cc.getName() + "'. " +
                 "To enable change GridCacheConfiguration.isQueryIndexEnabled() property.",
                 "Query indexing is disabled (queries will not work) for cache: " + cc.getName());
@@ -561,12 +561,12 @@ public class GridCacheProcessor extends GridProcessorAdapter {
         maxPreloadOrder = validatePreloadOrder(ctx.config().getCacheConfiguration());
 
         // Internal caches which should not be returned to user.
-        IgfsConfiguration[] ggfsCfgs = ctx.grid().configuration().getIgfsConfiguration();
+        IgfsConfiguration[] igfsCfgs = ctx.grid().configuration().getIgfsConfiguration();
 
-        if (ggfsCfgs != null) {
-            for (IgfsConfiguration ggfsCfg : ggfsCfgs) {
-                sysCaches.add(ggfsCfg.getMetaCacheName());
-                sysCaches.add(ggfsCfg.getDataCacheName());
+        if (igfsCfgs != null) {
+            for (IgfsConfiguration igfsCfg : igfsCfgs) {
+                sysCaches.add(igfsCfg.getMetaCacheName());
+                sysCaches.add(igfsCfg.getDataCacheName());
             }
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index d665326..ad1cdb6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -1581,16 +1581,16 @@ public class GridCacheUtils {
     /**
      * @param cfg Grid configuration.
      * @param cacheName Cache name.
-     * @return {@code True} in this is GGFS data or meta cache.
+     * @return {@code True} in this is IGFS data or meta cache.
      */
-    public static boolean isGgfsCache(IgniteConfiguration cfg, @Nullable String cacheName) {
-        IgfsConfiguration[] ggfsCfgs = cfg.getIgfsConfiguration();
+    public static boolean isIgfsCache(IgniteConfiguration cfg, @Nullable String cacheName) {
+        IgfsConfiguration[] igfsCfgs = cfg.getIgfsConfiguration();
 
-        if (ggfsCfgs != null) {
-            for (IgfsConfiguration ggfsCfg : ggfsCfgs) {
-                // GGFS config probably has not been validated yet => possible NPE, so we check for null.
-                if (ggfsCfg != null &&
-                    (F.eq(cacheName, ggfsCfg.getDataCacheName()) || F.eq(cacheName, ggfsCfg.getMetaCacheName())))
+        if (igfsCfgs != null) {
+            for (IgfsConfiguration igfsCfg : igfsCfgs) {
+                // IGFS config probably has not been validated yet => possible NPE, so we check for null.
+                if (igfsCfg != null &&
+                    (F.eq(cacheName, igfsCfg.getDataCacheName()) || F.eq(cacheName, igfsCfg.getMetaCacheName())))
                     return true;
             }
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
index b1d8471..84e2a8f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
@@ -69,7 +69,7 @@ public class GridClosureProcessor extends GridProcessorAdapter {
 
         sysPool = ctx.getSystemExecutorService();
         pubPool = ctx.getExecutorService();
-        igfsPool = ctx.getGgfsExecutorService();
+        igfsPool = ctx.getIgfsExecutorService();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/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 1f0f007..82c2770 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,7 +180,7 @@ public class IgfsContext {
     public boolean igfsNode(ClusterNode node) {
         assert node != null;
 
-        IgfsAttributes[] igfs = node.attribute(ATTR_GGFS);
+        IgfsAttributes[] igfs = node.attribute(ATTR_IGFS);
 
         if (igfs != null)
             for (IgfsAttributes attrs : igfs)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/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 3f7b0c4..cf2719b 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
@@ -96,8 +96,8 @@ public class IgfsDataManager extends IgfsManager {
     /** Affinity key generator. */
     private AtomicLong affKeyGen = new AtomicLong();
 
-    /** GGFS executor service. */
-    private ExecutorService ggfsSvc;
+    /** IGFS executor service. */
+    private ExecutorService igfsSvc;
 
     /** Request ID counter for write messages. */
     private AtomicLong reqIdCtr = new AtomicLong();
@@ -201,7 +201,7 @@ public class IgfsDataManager extends IgfsManager {
             }
         }, EVT_NODE_LEFT, EVT_NODE_FAILED);
 
-        ggfsSvc = igfsCtx.kernalContext().getGgfsExecutorService();
+        igfsSvc = igfsCtx.kernalContext().getIgfsExecutorService();
 
         trashPurgeTimeout = igfsCtx.configuration().getTrashPurgeTimeout();
 
@@ -1164,7 +1164,7 @@ public class IgfsDataManager extends IgfsManager {
      */
     private <T> void callIgfsLocalSafe(Callable<T> c) {
         try {
-            ggfsSvc.submit(c);
+            igfsSvc.submit(c);
         }
         catch (RejectedExecutionException ignored) {
             // This exception will happen if network speed is too low and data comes faster

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/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 17b9b29..0ae46b9 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
@@ -91,9 +91,9 @@ public class IgfsDeleteWorker extends IgfsThread {
 
         evts = igfsCtx.kernalContext().event();
 
-        String ggfsName = igfsCtx.igfs().name();
+        String igfsName = igfsCtx.igfs().name();
 
-        topic = F.isEmpty(ggfsName) ? TOPIC_IGFS : TOPIC_IGFS.topic(ggfsName);
+        topic = F.isEmpty(igfsName) ? TOPIC_IGFS : TOPIC_IGFS.topic(igfsName);
 
         assert meta != null;
         assert data != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHandshakeResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHandshakeResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHandshakeResponse.java
index 890cd6b..929aac0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHandshakeResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHandshakeResponse.java
@@ -29,7 +29,7 @@ public class IgfsHandshakeResponse implements Externalizable {
     private static final long serialVersionUID = 0L;
 
     /** GGFS name. */
-    private String ggfsName;
+    private String igfsName;
 
     /** SECONDARY paths. */
     private IgfsPaths paths;
@@ -53,10 +53,10 @@ public class IgfsHandshakeResponse implements Externalizable {
      * @param paths Secondary paths.
      * @param blockSize Server default block size.
      */
-    public IgfsHandshakeResponse(String ggfsName, IgfsPaths paths, long blockSize, Boolean sampling) {
+    public IgfsHandshakeResponse(String igfsName, IgfsPaths paths, long blockSize, Boolean sampling) {
         assert paths != null;
 
-        this.ggfsName = ggfsName;
+        this.igfsName = igfsName;
         this.paths = paths;
         this.blockSize = blockSize;
         this.sampling = sampling;
@@ -65,8 +65,8 @@ public class IgfsHandshakeResponse implements Externalizable {
     /**
      * @return GGFS name.
      */
-    public String ggfsName() {
-        return ggfsName;
+    public String igfsName() {
+        return igfsName;
     }
 
     /**
@@ -92,7 +92,7 @@ public class IgfsHandshakeResponse implements Externalizable {
 
     /** {@inheritDoc} */
     @Override public void writeExternal(ObjectOutput out) throws IOException {
-        U.writeString(out, ggfsName);
+        U.writeString(out, igfsName);
 
         paths.writeExternal(out);
 
@@ -108,7 +108,7 @@ public class IgfsHandshakeResponse implements Externalizable {
 
     /** {@inheritDoc} */
     @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        ggfsName = U.readString(in);
+        igfsName = U.readString(in);
 
         paths = new IgfsPaths();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/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 ac8c0f0..a04afa9 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
@@ -74,7 +74,7 @@ public final class IgfsImpl implements IgfsEx {
     private IgfsConfiguration cfg;
 
     /** Ggfs context. */
-    private IgfsContext ggfsCtx;
+    private IgfsContext igfsCtx;
 
     /** Event storage manager. */
     private GridEventStorageManager evts;
@@ -121,19 +121,19 @@ public final class IgfsImpl implements IgfsEx {
     /**
      * Creates GGFS instance with given context.
      *
-     * @param ggfsCtx Context.
+     * @param igfsCtx Context.
      * @throws IgniteCheckedException In case of error.
      */
-    IgfsImpl(IgfsContext ggfsCtx) throws IgniteCheckedException {
-        assert ggfsCtx != null;
+    IgfsImpl(IgfsContext igfsCtx) throws IgniteCheckedException {
+        assert igfsCtx != null;
 
-        this.ggfsCtx = ggfsCtx;
+        this.igfsCtx = igfsCtx;
 
-        cfg = ggfsCtx.configuration();
-        log = ggfsCtx.kernalContext().log(IgfsImpl.class);
-        evts = ggfsCtx.kernalContext().event();
-        meta = ggfsCtx.meta();
-        data = ggfsCtx.data();
+        cfg = igfsCtx.configuration();
+        log = igfsCtx.kernalContext().log(IgfsImpl.class);
+        evts = igfsCtx.kernalContext().event();
+        meta = igfsCtx.meta();
+        data = igfsCtx.data();
         secondaryFs = cfg.getSecondaryFileSystem();
 
         /* Default GGFS mode. */
@@ -161,8 +161,8 @@ public final class IgfsImpl implements IgfsEx {
 
         cfgModes.putAll(dfltModes);
 
-        if (ggfsCtx.configuration().getPathModes() != null) {
-            for (Map.Entry<String, IgfsMode> e : ggfsCtx.configuration().getPathModes().entrySet()) {
+        if (igfsCtx.configuration().getPathModes() != null) {
+            for (Map.Entry<String, IgfsMode> e : igfsCtx.configuration().getPathModes().entrySet()) {
                 if (!dfltModes.containsKey(e.getKey()))
                     cfgModes.put(e.getKey(), e.getValue());
                 else
@@ -194,9 +194,9 @@ public final class IgfsImpl implements IgfsEx {
             modeRslvr.modesOrdered());
 
         // Check whether GGFS LRU eviction policy is set on data cache.
-        String dataCacheName = ggfsCtx.configuration().getDataCacheName();
+        String dataCacheName = igfsCtx.configuration().getDataCacheName();
 
-        for (CacheConfiguration cacheCfg : ggfsCtx.kernalContext().config().getCacheConfiguration()) {
+        for (CacheConfiguration cacheCfg : igfsCtx.kernalContext().config().getCacheConfiguration()) {
             if (F.eq(dataCacheName, cacheCfg.getName())) {
                 CacheEvictionPolicy evictPlc = cacheCfg.getEvictionPolicy();
 
@@ -209,8 +209,8 @@ public final class IgfsImpl implements IgfsEx {
 
         topic = F.isEmpty(name()) ? TOPIC_IGFS : TOPIC_IGFS.topic(name());
 
-        ggfsCtx.kernalContext().io().addMessageListener(topic, delMsgLsnr);
-        ggfsCtx.kernalContext().event().addLocalEventListener(delDiscoLsnr, EVT_NODE_LEFT, EVT_NODE_FAILED);
+        igfsCtx.kernalContext().io().addMessageListener(topic, delMsgLsnr);
+        igfsCtx.kernalContext().event().addLocalEventListener(delDiscoLsnr, EVT_NODE_LEFT, EVT_NODE_FAILED);
     }
 
     /**
@@ -218,7 +218,7 @@ public final class IgfsImpl implements IgfsEx {
      */
     private ClusterNode localNode() {
         if (locNode == null)
-            locNode = ggfsCtx.kernalContext().discovery().localNode();
+            locNode = igfsCtx.kernalContext().discovery().localNode();
 
         return locNode;
     }
@@ -249,8 +249,8 @@ public final class IgfsImpl implements IgfsEx {
         if (secondaryFs instanceof AutoCloseable)
             U.closeQuiet((AutoCloseable)secondaryFs);
 
-        ggfsCtx.kernalContext().io().removeMessageListener(topic, delMsgLsnr);
-        ggfsCtx.kernalContext().event().removeLocalEventListener(delDiscoLsnr);
+        igfsCtx.kernalContext().io().removeMessageListener(topic, delMsgLsnr);
+        igfsCtx.kernalContext().event().removeLocalEventListener(delDiscoLsnr);
 
         if (interrupted)
             Thread.currentThread().interrupt();
@@ -360,7 +360,7 @@ public final class IgfsImpl implements IgfsEx {
 
     /** {@inheritDoc} */
     @Override public IgfsContext context() {
-        return ggfsCtx;
+        return igfsCtx;
     }
 
     /**
@@ -400,7 +400,7 @@ public final class IgfsImpl implements IgfsEx {
     @Override public IgfsStatus globalSpace() throws IgniteCheckedException {
         if (enterBusy()) {
             try {
-                IgniteBiTuple<Long, Long> space = ggfsCtx.kernalContext().grid().compute().execute(
+                IgniteBiTuple<Long, Long> space = igfsCtx.kernalContext().grid().compute().execute(
                     new IgfsGlobalSpaceTask(name()), null);
 
                 return new IgfsStatus(space.get1(), space.get2());
@@ -1104,7 +1104,7 @@ public final class IgfsImpl implements IgfsEx {
 
                     IgfsSecondaryInputStreamDescriptor desc = meta.openDual(secondaryFs, path, bufSize);
 
-                    IgfsEventAwareInputStream os = new IgfsEventAwareInputStream(ggfsCtx, path, desc.info(),
+                    IgfsEventAwareInputStream os = new IgfsEventAwareInputStream(igfsCtx, path, desc.info(),
                         cfg.getPrefetchBlocks(), seqReadsBeforePrefetch, desc.reader(), metrics);
 
                     if (evts.isRecordable(EVT_IGFS_FILE_OPENED_READ))
@@ -1125,7 +1125,7 @@ public final class IgfsImpl implements IgfsEx {
                     throw new IgfsInvalidPathException("Failed to open file (not a file): " + path);
 
                 // Input stream to read data from grid cache with separate blocks.
-                IgfsEventAwareInputStream os = new IgfsEventAwareInputStream(ggfsCtx, path, info,
+                IgfsEventAwareInputStream os = new IgfsEventAwareInputStream(igfsCtx, path, info,
                     cfg.getPrefetchBlocks(), seqReadsBeforePrefetch, null, metrics);
 
                 if (evts.isRecordable(EVT_IGFS_FILE_OPENED_READ))
@@ -1497,8 +1497,8 @@ public final class IgfsImpl implements IgfsEx {
                 }
 
                 return new IgfsMetricsAdapter(
-                    ggfsCtx.data().spaceSize(),
-                    ggfsCtx.data().maxSpaceSize(),
+                    igfsCtx.data().spaceSize(),
+                    igfsCtx.data().maxSpaceSize(),
                     secondarySpaceSize,
                     sum.directoriesCount(),
                     sum.filesCount(),
@@ -1604,9 +1604,9 @@ public final class IgfsImpl implements IgfsEx {
             IgniteUuid id = meta.softDelete(null, null, ROOT_ID);
 
             if (id == null)
-                return new GridFinishedFuture<Object>(ggfsCtx.kernalContext());
+                return new GridFinishedFuture<Object>(igfsCtx.kernalContext());
             else {
-                GridFutureAdapter<Object> fut = new GridFutureAdapter<>(ggfsCtx.kernalContext());
+                GridFutureAdapter<Object> fut = new GridFutureAdapter<>(igfsCtx.kernalContext());
 
                 GridFutureAdapter<Object> oldFut = delFuts.putIfAbsent(id, fut);
 
@@ -1625,7 +1625,7 @@ public final class IgfsImpl implements IgfsEx {
             }
         }
         catch (IgniteCheckedException e) {
-            return new GridFinishedFuture<Object>(ggfsCtx.kernalContext(), e);
+            return new GridFinishedFuture<Object>(igfsCtx.kernalContext(), e);
         }
     }
 
@@ -1637,10 +1637,10 @@ public final class IgfsImpl implements IgfsEx {
             if (log.isDebugEnabled())
                 log.debug("Constructing delete future for trash entries: " + ids);
 
-            GridCompoundFuture<Object, Object> resFut = new GridCompoundFuture<>(ggfsCtx.kernalContext());
+            GridCompoundFuture<Object, Object> resFut = new GridCompoundFuture<>(igfsCtx.kernalContext());
 
             for (IgniteUuid id : ids) {
-                GridFutureAdapter<Object> fut = new GridFutureAdapter<>(ggfsCtx.kernalContext());
+                GridFutureAdapter<Object> fut = new GridFutureAdapter<>(igfsCtx.kernalContext());
 
                 IgniteInternalFuture<Object> oldFut = delFuts.putIfAbsent(id, fut);
 
@@ -1662,7 +1662,7 @@ public final class IgfsImpl implements IgfsEx {
             return resFut;
         }
         else
-            return new GridFinishedFuture<>(ggfsCtx.kernalContext());
+            return new GridFinishedFuture<>(igfsCtx.kernalContext());
     }
 
     /**
@@ -1715,7 +1715,7 @@ public final class IgfsImpl implements IgfsEx {
      * @param attrs Attributes.
      * @return {@code True} in case GGFS with the same name exists among provided attributes
      */
-    private boolean sameGgfs(IgfsAttributes[] attrs) {
+    private boolean sameIgfs(IgfsAttributes[] attrs) {
         if (attrs != null) {
             String ggfsName = name();
 
@@ -1802,7 +1802,7 @@ public final class IgfsImpl implements IgfsEx {
      */
     <T, R> IgniteInternalFuture<R> executeAsync(IgfsTask<T, R> task, @Nullable IgfsRecordResolver rslvr,
         Collection<IgfsPath> paths, boolean skipNonExistentFiles, long maxRangeLen, @Nullable T arg) {
-        return ggfsCtx.kernalContext().task().execute(task, new IgfsTaskArgsImpl<>(cfg.getName(), paths, rslvr,
+        return igfsCtx.kernalContext().task().execute(task, new IgfsTaskArgsImpl<>(cfg.getName(), paths, rslvr,
             skipNonExistentFiles, maxRangeLen, arg));
     }
 
@@ -1836,7 +1836,7 @@ public final class IgfsImpl implements IgfsEx {
     <T, R> IgniteInternalFuture<R> executeAsync(Class<? extends IgfsTask<T, R>> taskCls,
         @Nullable IgfsRecordResolver rslvr, Collection<IgfsPath> paths, boolean skipNonExistentFiles,
         long maxRangeLen, @Nullable T arg) {
-        return ggfsCtx.kernalContext().task().execute((Class<IgfsTask<T, R>>)taskCls,
+        return igfsCtx.kernalContext().task().execute((Class<IgfsTask<T, R>>)taskCls,
             new IgfsTaskArgsImpl<>(cfg.getName(), paths, rslvr, skipNonExistentFiles, maxRangeLen, arg));
     }
 
@@ -1997,7 +1997,7 @@ public final class IgfsImpl implements IgfsEx {
         IgfsEventAwareOutputStream(IgfsPath path, IgfsFileInfo fileInfo,
             IgniteUuid parentId, int bufSize, IgfsMode mode, @Nullable IgfsFileWorkerBatch batch)
             throws IgniteCheckedException {
-            super(ggfsCtx, path, fileInfo, parentId, bufSize, mode, batch, metrics);
+            super(igfsCtx, path, fileInfo, parentId, bufSize, mode, batch, metrics);
 
             metrics.incrementFilesOpenedForWrite();
         }
@@ -2065,13 +2065,13 @@ public final class IgfsImpl implements IgfsEx {
         private static final long serialVersionUID = 0L;
 
         /** GGFS name. */
-        private String ggfsName;
+        private String igfsName;
 
         /**
-         * @param ggfsName GGFS name.
+         * @param igfsName GGFS name.
          */
-        private IgfsGlobalSpaceTask(@Nullable String ggfsName) {
-            this.ggfsName = ggfsName;
+        private IgfsGlobalSpaceTask(@Nullable String igfsName) {
+            this.igfsName = igfsName;
         }
 
         /** {@inheritDoc} */
@@ -2085,7 +2085,7 @@ public final class IgfsImpl implements IgfsEx {
                     private Ignite g;
 
                     @Nullable @Override public IgniteBiTuple<Long, Long> execute() {
-                        IgniteFs ggfs = ((IgniteKernal)g).context().ggfs().ggfs(ggfsName);
+                        IgniteFs ggfs = ((IgniteKernal)g).context().igfs().igfs(igfsName);
 
                         if (ggfs == null)
                             return F.t(0L, 0L);
@@ -2133,14 +2133,14 @@ public final class IgfsImpl implements IgfsEx {
         /** {@inheritDoc} */
         @Override public void onMessage(UUID nodeId, Object msg) {
             if (msg instanceof IgfsDeleteMessage) {
-                ClusterNode node = ggfsCtx.kernalContext().discovery().node(nodeId);
+                ClusterNode node = igfsCtx.kernalContext().discovery().node(nodeId);
 
                 if (node != null) {
-                    if (sameGgfs((IgfsAttributes[])node.attribute(ATTR_GGFS))) {
+                    if (sameIgfs((IgfsAttributes[]) node.attribute(ATTR_IGFS))) {
                         IgfsDeleteMessage msg0 = (IgfsDeleteMessage)msg;
 
                         try {
-                            msg0.finishUnmarshal(ggfsCtx.kernalContext().config().getMarshaller(), null);
+                            msg0.finishUnmarshal(igfsCtx.kernalContext().config().getMarshaller(), null);
                         }
                         catch (IgniteCheckedException e) {
                             U.error(log, "Failed to unmarshal message (will ignore): " + msg0, e);
@@ -2175,7 +2175,7 @@ public final class IgfsImpl implements IgfsEx {
             DiscoveryEvent evt0 = (DiscoveryEvent)evt;
 
             if (evt0.eventNode() != null) {
-                if (sameGgfs((IgfsAttributes[])evt0.eventNode().attribute(ATTR_GGFS))) {
+                if (sameIgfs((IgfsAttributes[]) evt0.eventNode().attribute(ATTR_IGFS))) {
                     Collection<IgniteUuid> rmv = new HashSet<>();
 
                     for (Map.Entry<IgniteUuid, GridFutureAdapter<Object>> fut : delFuts.entrySet()) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/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 054210d..cfafa2a 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
@@ -51,7 +51,7 @@ class IgfsIpcHandler implements IgfsServerHandler {
     private final int bufSize; // Buffer size. Must not be less then file block size.
 
     /** Ggfs instance for this handler. */
-    private IgfsEx ggfs;
+    private IgfsEx igfs;
 
     /** Resource ID generator. */
     private AtomicLong rsrcIdGen = new AtomicLong();
@@ -62,16 +62,16 @@ class IgfsIpcHandler implements IgfsServerHandler {
     /**
      * Constructs GGFS IPC handler.
      *
-     * @param ggfsCtx Context.
+     * @param igfsCtx Context.
      */
-    IgfsIpcHandler(IgfsContext ggfsCtx) {
-        assert ggfsCtx != null;
+    IgfsIpcHandler(IgfsContext igfsCtx) {
+        assert igfsCtx != null;
 
-        ctx = ggfsCtx.kernalContext();
-        ggfs = ggfsCtx.igfs();
+        ctx = igfsCtx.kernalContext();
+        igfs = igfsCtx.igfs();
 
         // Keep buffer size multiple of block size so no extra byte array copies is performed.
-        bufSize = ggfsCtx.configuration().getBlockSize() * 2;
+        bufSize = igfsCtx.configuration().getBlockSize() * 2;
 
         log = ctx.log(IgfsIpcHandler.class);
     }
@@ -200,16 +200,16 @@ class IgfsIpcHandler implements IgfsServerHandler {
             throw new IgniteCheckedException("Failed to perform handshake because actual Grid name differs from expected " +
                 "[expected=" + req.gridName() + ", actual=" + ctx.gridName() + ']');
 
-        if (!F.eq(ggfs.name(), req.ggfsName()))
+        if (!F.eq(igfs.name(), req.igfsName()))
             throw new IgniteCheckedException("Failed to perform handshake because actual GGFS name differs from expected " +
-                "[expected=" + req.ggfsName() + ", actual=" + ggfs.name() + ']');
+                "[expected=" + req.igfsName() + ", actual=" + igfs.name() + ']');
 
         IgfsControlResponse res = new IgfsControlResponse();
 
-        ggfs.clientLogDirectory(req.logDirectory());
+        igfs.clientLogDirectory(req.logDirectory());
 
-        IgfsHandshakeResponse handshake = new IgfsHandshakeResponse(ggfs.name(), ggfs.proxyPaths(),
-            ggfs.groupBlockSize(), ggfs.globalSampling());
+        IgfsHandshakeResponse handshake = new IgfsHandshakeResponse(igfs.name(), igfs.proxyPaths(),
+            igfs.groupBlockSize(), igfs.globalSampling());
 
         res.handshake(handshake);
 
@@ -223,7 +223,7 @@ class IgfsIpcHandler implements IgfsServerHandler {
      * @throws IgniteCheckedException If failed.
      */
     private IgfsMessage processStatusRequest() throws IgniteCheckedException {
-        IgfsStatus status = ggfs.globalSpace();
+        IgfsStatus status = igfs.globalSpace();
 
         IgfsControlResponse res = new IgfsControlResponse();
 
@@ -246,81 +246,81 @@ class IgfsIpcHandler implements IgfsServerHandler {
         IgfsPathControlRequest req = (IgfsPathControlRequest)msg;
 
         if (log.isDebugEnabled())
-            log.debug("Processing path control request [igfsName=" + ggfs.name() + ", req=" + req + ']');
+            log.debug("Processing path control request [igfsName=" + igfs.name() + ", req=" + req + ']');
 
         IgfsControlResponse res = new IgfsControlResponse();
 
         try {
             switch (cmd) {
                 case EXISTS:
-                    res.response(ggfs.exists(req.path()));
+                    res.response(igfs.exists(req.path()));
 
                     break;
 
                 case INFO:
-                    res.response(ggfs.info(req.path()));
+                    res.response(igfs.info(req.path()));
 
                     break;
 
                 case PATH_SUMMARY:
-                    res.response(ggfs.summary(req.path()));
+                    res.response(igfs.summary(req.path()));
 
                     break;
 
                 case UPDATE:
-                    res.response(ggfs.update(req.path(), req.properties()));
+                    res.response(igfs.update(req.path(), req.properties()));
 
                     break;
 
                 case RENAME:
-                    ggfs.rename(req.path(), req.destinationPath());
+                    igfs.rename(req.path(), req.destinationPath());
 
                     res.response(true);
 
                     break;
 
                 case DELETE:
-                    res.response(ggfs.delete(req.path(), req.flag()));
+                    res.response(igfs.delete(req.path(), req.flag()));
 
                     break;
 
                 case MAKE_DIRECTORIES:
-                    ggfs.mkdirs(req.path(), req.properties());
+                    igfs.mkdirs(req.path(), req.properties());
 
                     res.response(true);
 
                     break;
 
                 case LIST_PATHS:
-                    res.paths(ggfs.listPaths(req.path()));
+                    res.paths(igfs.listPaths(req.path()));
 
                     break;
 
                 case LIST_FILES:
-                    res.files(ggfs.listFiles(req.path()));
+                    res.files(igfs.listFiles(req.path()));
 
                     break;
 
                 case SET_TIMES:
-                    ggfs.setTimes(req.path(), req.accessTime(), req.modificationTime());
+                    igfs.setTimes(req.path(), req.accessTime(), req.modificationTime());
 
                     res.response(true);
 
                     break;
 
                 case AFFINITY:
-                    res.locations(ggfs.affinity(req.path(), req.start(), req.length()));
+                    res.locations(igfs.affinity(req.path(), req.start(), req.length()));
 
                     break;
 
                 case OPEN_READ: {
-                    IgfsInputStreamAdapter ggfsIn = !req.flag() ? ggfs.open(req.path(), bufSize) :
-                        ggfs.open(req.path(), bufSize, req.sequentialReadsBeforePrefetch());
+                    IgfsInputStreamAdapter ggfsIn = !req.flag() ? igfs.open(req.path(), bufSize) :
+                        igfs.open(req.path(), bufSize, req.sequentialReadsBeforePrefetch());
 
                     long streamId = registerResource(ses, ggfsIn);
 
                     if (log.isDebugEnabled())
-                        log.debug("Opened GGFS input stream for file read [igfsName=" + ggfs.name() + ", path=" +
+                        log.debug("Opened GGFS input stream for file read [igfsName=" + igfs.name() + ", path=" +
                             req.path() + ", streamId=" + streamId + ", ses=" + ses + ']');
 
                     IgfsFileInfo info = new IgfsFileInfo(ggfsIn.fileInfo(), null,
@@ -332,7 +332,7 @@ class IgfsIpcHandler implements IgfsServerHandler {
                 }
 
                 case OPEN_CREATE: {
-                    long streamId = registerResource(ses, ggfs.create(
+                    long streamId = registerResource(ses, igfs.create(
                         req.path(),       // Path.
                         bufSize,          // Buffer size.
                         req.flag(),       // Overwrite if exists.
@@ -343,7 +343,7 @@ class IgfsIpcHandler implements IgfsServerHandler {
                     ));
 
                     if (log.isDebugEnabled())
-                        log.debug("Opened GGFS output stream for file create [igfsName=" + ggfs.name() + ", path=" +
+                        log.debug("Opened GGFS output stream for file create [igfsName=" + igfs.name() + ", path=" +
                             req.path() + ", streamId=" + streamId + ", ses=" + ses + ']');
 
                     res.response(streamId);
@@ -352,7 +352,7 @@ class IgfsIpcHandler implements IgfsServerHandler {
                 }
 
                 case OPEN_APPEND: {
-                    long streamId = registerResource(ses, ggfs.append(
+                    long streamId = registerResource(ses, igfs.append(
                         req.path(),        // Path.
                         bufSize,           // Buffer size.
                         req.flag(),        // Create if absent.
@@ -360,7 +360,7 @@ class IgfsIpcHandler implements IgfsServerHandler {
                     ));
 
                     if (log.isDebugEnabled())
-                        log.debug("Opened GGFS output stream for file append [igfsName=" + ggfs.name() + ", path=" +
+                        log.debug("Opened GGFS output stream for file append [igfsName=" + igfs.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 [igfsName=" + ggfs.name() + ", req=" + req +
+            log.debug("Finished processing path control request [igfsName=" + igfs.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 [igfsName=" + ggfs.name() + ", rsrcId=" + rsrcId +
+                    log.debug("Requested to close resource [igfsName=" + igfs.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 [igfsName=" + ggfs.name() + ", rsrcId=" + rsrcId +
+                assert success : "Failed to unregister resource [igfsName=" + igfs.name() + ", rsrcId=" + rsrcId +
                     ", res=" + res + ']';
 
                 if (log.isDebugEnabled())
-                    log.debug("Closed GGFS stream [igfsName=" + ggfs.name() + ", streamId=" + rsrcId +
+                    log.debug("Closed GGFS stream [igfsName=" + igfs.name() + ", streamId=" + rsrcId +
                         ", ses=" + ses + ']');
 
                 resp.response(true);
@@ -517,16 +517,16 @@ 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 [igfsName=" + ggfs.name() +
+                log.debug("Will not generate affinity key for path control request [igfsName=" + igfs.name() +
                     ", req=" + req + ']');
 
             return null;
         }
 
-        IgniteUuid key = ggfs.nextAffinityKey();
+        IgniteUuid key = igfs.nextAffinityKey();
 
         if (log.isDebugEnabled())
-            log.debug("Generated affinity key for path control request [igfsName=" + ggfs.name() +
+            log.debug("Generated affinity key for path control request [igfsName=" + igfs.name() +
                 ", req=" + req + ", key=" + key + ']');
 
         return key;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/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 c14c21e..f802c9d 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
@@ -49,12 +49,12 @@ public class IgfsNoopProcessor extends IgfsProcessorAdapter {
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<IgniteFs> ggfss() {
+    @Override public Collection<IgniteFs> igfss() {
         return Collections.emptyList();
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public IgniteFs ggfs(@Nullable String name) {
+    @Nullable @Override public IgniteFs igfs(@Nullable String name) {
         return null;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/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 133891a..5eb8625 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
@@ -167,12 +167,12 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public Collection<IgniteFs> ggfss() {
+    @Override public Collection<IgniteFs> igfss() {
         return F.viewReadOnly(ggfsCache.values(), CTX_TO_GGFS);
     }
 
     /** {@inheritDoc} */
-    @Override @Nullable public IgniteFs ggfs(@Nullable String name) {
+    @Override @Nullable public IgniteFs igfs(@Nullable String name) {
         IgfsContext ggfsCtx = ggfsCache.get(maskName(name));
 
         return ggfsCtx == null ? null : ggfsCtx.igfs();
@@ -242,7 +242,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
                 ggfsCfg.isFragmentizerEnabled()));
         }
 
-        attrs.put(ATTR_GGFS, attrVals.toArray(new IgfsAttributes[attrVals.size()]));
+        attrs.put(ATTR_IGFS, attrVals.toArray(new IgfsAttributes[attrVals.size()]));
     }
 
     /**
@@ -347,8 +347,8 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
      * @throws IgniteCheckedException If check failed.
      */
     private void checkGgfsOnRemoteNode(ClusterNode rmtNode) throws IgniteCheckedException {
-        IgfsAttributes[] locAttrs = ctx.discovery().localNode().attribute(IgniteNodeAttributes.ATTR_GGFS);
-        IgfsAttributes[] rmtAttrs = rmtNode.attribute(IgniteNodeAttributes.ATTR_GGFS);
+        IgfsAttributes[] locAttrs = ctx.discovery().localNode().attribute(IgniteNodeAttributes.ATTR_IGFS);
+        IgfsAttributes[] rmtAttrs = rmtNode.attribute(IgniteNodeAttributes.ATTR_IGFS);
 
         if (F.isEmpty(locAttrs) || F.isEmpty(rmtAttrs))
             return;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/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 9e49c64..5a33f09 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
@@ -46,7 +46,7 @@ public abstract class IgfsProcessorAdapter extends GridProcessorAdapter {
      *
      * @return Collection of GGFS instances.
      */
-    public abstract Collection<IgniteFs> ggfss();
+    public abstract Collection<IgniteFs> igfss();
 
     /**
      * Gets GGFS instance.
@@ -54,7 +54,7 @@ public abstract class IgfsProcessorAdapter extends GridProcessorAdapter {
      * @param name (Nullable) GGFS name.
      * @return GGFS instance.
      */
-    @Nullable public abstract IgniteFs ggfs(@Nullable String name);
+    @Nullable public abstract IgniteFs igfs(@Nullable String name);
 
     /**
      * Gets server endpoints for particular GGFS.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
index 65a9d44..8ed7580 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
@@ -102,7 +102,7 @@ public class VisorNodeDataCollectorJob extends VisorJob<VisorNodeDataCollectorTa
             for (GridCache cache : ignite.cachesx()) {
                 String cacheName = cache.name();
 
-                if (arg.systemCaches() || !(isSystemCache(cacheName) || isGgfsCache(cfg, cacheName))) {
+                if (arg.systemCaches() || !(isSystemCache(cacheName) || isIgfsCache(cfg, cacheName))) {
                     long start0 = U.currentTimeMillis();
 
                     try {
@@ -123,9 +123,9 @@ public class VisorNodeDataCollectorJob extends VisorJob<VisorNodeDataCollectorTa
     /** Collect GGFS. */
     private void ggfs(VisorNodeDataCollectorJobResult res) {
         try {
-            IgfsProcessorAdapter ggfsProc = ((IgniteKernal)ignite).context().ggfs();
+            IgfsProcessorAdapter ggfsProc = ((IgniteKernal)ignite).context().igfs();
 
-            for (IgniteFs ggfs : ggfsProc.ggfss()) {
+            for (IgniteFs ggfs : ggfsProc.igfss()) {
                 long start0 = U.currentTimeMillis();
 
                 try {


Mime
View raw message