ignite-commits mailing list archives

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

Branch: refs/heads/sprint-1
Commit: 5dad54e8adb79d0ac061a893fccda8ffb8bf31ce
Parents: 141f828
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Fri Feb 13 14:34:54 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Fri Feb 13 14:34:56 2015 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/ignite/IgniteFs.java   |   2 +-
 .../ignite/configuration/IgfsConfiguration.java |   2 +-
 .../java/org/apache/ignite/igfs/IgfsFile.java   |   2 +-
 .../java/org/apache/ignite/igfs/IgfsPath.java   |   2 +-
 .../ignite/internal/IgniteNodeAttributes.java   |   2 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |   4 +-
 .../ignite/internal/igfs/common/IgfsLogger.java |   2 +-
 .../processors/cache/GridCacheAdapter.java      |   2 +-
 .../processors/cache/GridCacheMapEntry.java     |   2 +-
 .../processors/cache/GridCacheProjectionEx.java |   2 +-
 .../cache/GridCacheProjectionImpl.java          |   4 +-
 .../processors/cache/GridCacheProxyImpl.java    |   4 +-
 .../preloader/GridDhtPartitionDemandPool.java   |   2 +-
 .../distributed/near/GridNearCacheAdapter.java  |   4 +-
 .../closure/GridClosureProcessor.java           |   2 +-
 .../internal/processors/igfs/IgfsAsyncImpl.java | 102 +++++++++----------
 .../internal/processors/igfs/IgfsContext.java   |  10 +-
 .../processors/igfs/IgfsDataManager.java        |  36 +++----
 .../processors/igfs/IgfsDeleteWorker.java       |   4 +-
 .../igfs/IgfsFragmentizerManager.java           |   4 +-
 .../internal/processors/igfs/IgfsHelper.java    |   2 +-
 .../processors/igfs/IgfsHelperImpl.java         |   2 +-
 .../internal/processors/igfs/IgfsImpl.java      |   2 +-
 .../processors/igfs/IgfsIpcHandler.java         |   2 +-
 .../internal/processors/igfs/IgfsJobImpl.java   |  14 +--
 .../processors/igfs/IgfsMetaManager.java        |   4 +-
 .../processors/igfs/IgfsNoopHelper.java         |   2 +-
 .../internal/processors/igfs/IgfsProcessor.java |  10 +-
 .../internal/processors/igfs/IgfsServer.java    |   6 +-
 .../internal/processors/igfs/IgfsThread.java    |   2 +-
 .../visor/ggfs/VisorIgfsProfilerClearTask.java  |   2 +-
 .../visor/ggfs/VisorIgfsProfilerTask.java       |   2 +-
 .../visor/node/VisorGridConfiguration.java      |  12 +--
 .../visor/node/VisorIgfsConfiguration.java      |   6 +-
 .../visor/node/VisorNodeDataCollectorJob.java   |   2 +-
 .../internal/visor/util/VisorTaskUtils.java     |  10 +-
 .../ignite/igfs/IgfsEventsAbstractSelfTest.java |   2 +-
 .../igfs/IgfsFragmentizerAbstractSelfTest.java  |   6 +-
 .../ignite/igfs/IgfsFragmentizerSelfTest.java   |  10 +-
 .../igfs/IgfsFragmentizerTopologySelfTest.java  |   2 +-
 .../apache/ignite/igfs/IgfsPathSelfTest.java    |   6 +-
 .../processors/cache/GridCacheLeakTest.java     |   2 +-
 ...heIgfsPerBlockLruEvictionPolicySelfTest.java |   4 +-
 .../processors/igfs/IgfsAbstractSelfTest.java   |  16 +--
 .../processors/igfs/IgfsCacheSelfTest.java      |   2 +-
 .../igfs/IgfsDataManagerSelfTest.java           |  16 +--
 .../igfs/IgfsMetaManagerSelfTest.java           |   6 +-
 .../processors/igfs/IgfsMetricsSelfTest.java    |   4 +-
 .../processors/igfs/IgfsModesSelfTest.java      |  12 +--
 .../processors/igfs/IgfsProcessorSelfTest.java  |   4 +-
 .../igfs/IgfsProcessorValidationSelfTest.java   |   2 +-
 ...IpcEndpointRegistrationAbstractSelfTest.java |   2 +-
 .../processors/igfs/IgfsSizeSelfTest.java       |  14 +--
 .../processors/igfs/IgfsStreamsSelfTest.java    |  12 +--
 .../processors/igfs/IgfsTaskSelfTest.java       |   4 +-
 .../IgfsAbstractRecordResolverSelfTest.java     |   4 +-
 .../ipc/shmem/IpcSharedMemoryNodeStartup.java   |   2 +-
 .../igfs/hadoop/IgfsHadoopParameters.java       |  34 +++----
 .../igfs/hadoop/v1/IgfsHadoopFileSystem.java    |  16 +--
 .../igfs/hadoop/v2/IgfsHadoopFileSystem.java    |  16 +--
 .../igfs/hadoop/IgfsHadoopEndpoint.java         |   2 +-
 .../internal/igfs/hadoop/IgfsHadoopUtils.java   |   6 +-
 .../GridHadoopDefaultMapReducePlanner.java      |   2 +-
 .../GridHadoopClientProtocolSelfTest.java       |   2 +-
 .../apache/ignite/igfs/IgfsEventsTestSuite.java |  10 +-
 .../IgfsHadoop20FileSystemAbstractSelfTest.java |  14 +--
 ...doop20FileSystemLoopbackPrimarySelfTest.java |   2 +-
 ...sHadoop20FileSystemShmemPrimarySelfTest.java |   2 +-
 .../igfs/IgfsHadoopDualAbstractSelfTest.java    |  14 +--
 .../IgfsHadoopFileSystemAbstractSelfTest.java   |  24 ++---
 .../IgfsHadoopFileSystemClientSelfTest.java     |   4 +-
 .../IgfsHadoopFileSystemHandshakeSelfTest.java  |  12 +--
 .../IgfsHadoopFileSystemIpcCacheSelfTest.java   |  10 +-
 .../IgfsHadoopFileSystemLoggerSelfTest.java     |   6 +-
 ...IgfsHadoopFileSystemLoggerStateSelfTest.java |  14 +--
 ...fsHadoopFileSystemSecondaryModeSelfTest.java |  14 +--
 .../java/org/apache/ignite/igfs/IgfsLoad.java   |   8 +-
 .../igfs/IgfsNearOnlyMultiNodeSelfTest.java     |   4 +-
 .../hadoop/GridHadoopAbstractSelfTest.java      |   6 +-
 .../hadoop/GridHadoopCommandLineTest.java       |   2 +-
 ...idHadoopDefaultMapReducePlannerSelfTest.java |   4 +-
 .../processors/hadoop/GridHadoopStartup.java    |   6 +-
 .../hadoop/GridHadoopTaskExecutionSelfTest.java |  22 ++--
 ...GridHadoopExternalTaskExecutionSelfTest.java |   8 +-
 .../ggfs/IgfsPerformanceBenchmark.java          |   2 +-
 85 files changed, 336 insertions(+), 336 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/main/java/org/apache/ignite/IgniteFs.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteFs.java b/modules/core/src/main/java/org/apache/ignite/IgniteFs.java
index 956b09d..3ce03e8 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteFs.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteFs.java
@@ -58,7 +58,7 @@ import java.util.*;
  */
 public interface IgniteFs extends Igfs, IgniteAsyncSupport {
     /** GGFS scheme name. */
-    public static final String GGFS_SCHEME = "ggfs";
+    public static final String IGFS_SCHEME = "igfs";
 
     /** File property: prefer writes to local node. */
     public static final String PROP_PREFER_LOCAL_WRITES = "locWrite";

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/main/java/org/apache/ignite/configuration/IgfsConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgfsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgfsConfiguration.java
index 3a8cee6..303803c 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgfsConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgfsConfiguration.java
@@ -58,7 +58,7 @@ public class IgfsConfiguration {
     public static final int DFLT_GGFS_LOG_BATCH_SIZE = 100;
 
     /** Default {@code GGFS} log directory. */
-    public static final String DFLT_GGFS_LOG_DIR = "work/ggfs/log";
+    public static final String DFLT_GGFS_LOG_DIR = "work/igfs/log";
 
     /** Default per node buffer size. */
     public static final int DFLT_PER_NODE_BATCH_SIZE = 100;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFile.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFile.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFile.java
index c4a2776..d9854cd 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFile.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFile.java
@@ -28,7 +28,7 @@ import java.util.*;
  *     GridGgfsPath filePath = new GridGgfsPath("my/working/dir", "file.txt");
  *
  *     // Get metadata about file.
- *     GridGgfsFile file = ggfs.info(filePath);
+ *     GridGgfsFile file = igfs.info(filePath);
  * </pre>
  */
 public interface IgfsFile {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java
index 48ef047..2dbf0db 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java
@@ -34,7 +34,7 @@ import java.util.*;
  *     GridGgfsPath filePath = new GridGgfsPath(dirPath, "file.txt");
  *
  *     // Get metadata about file.
- *     GridGgfsFile file = ggfs.info(filePath);
+ *     GridGgfsFile file = igfs.info(filePath);
  * </pre>
  */
 public final class IgfsPath implements Comparable<IgfsPath>, Externalizable {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/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 eab6b37..082908a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
@@ -64,7 +64,7 @@ public final class IgniteNodeAttributes {
     public static final String ATTR_TX_CONFIG = ATTR_PREFIX + ".tx";
 
     /** Internal attribute name constant. */
-    public static final String ATTR_GGFS = ATTR_PREFIX + ".ggfs";
+    public static final String ATTR_GGFS = ATTR_PREFIX + ".igfs";
 
     /** Internal attribute name constant. */
     public static final String ATTR_MONGO = ATTR_PREFIX + ".mongo";

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/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 af19ddf..59da2bd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1501,9 +1501,9 @@ public class IgnitionEx {
                 0,
                 new LinkedBlockingQueue<Runnable>());
 
-            // Note that we do not pre-start threads here as ggfs pool may not be needed.
+            // Note that we do not pre-start threads here as igfs pool may not be needed.
             ggfsExecSvc = new IgniteThreadPoolExecutor(
-                "ggfs-" + cfg.getGridName(),
+                "igfs-" + cfg.getGridName(),
                 cfg.getGgfsThreadPoolSize(),
                 cfg.getGgfsThreadPoolSize(),
                 0,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/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 c94d114..510d480 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java
@@ -220,7 +220,7 @@ 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, "ggfs-log-" + ggfsName + "-" + pid + ".csv");
+        file = new File(dirFile, "igfs-log-" + ggfsName + "-" + pid + ".csv");
 
         entries = new ConcurrentLinkedDeque8<>();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/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 e12e419..5c4b8a5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -4750,7 +4750,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
     }
 
     /** {@inheritDoc} */
-    @Override public long ggfsDataSpaceUsed() {
+    @Override public long igfsDataSpaceUsed() {
         assert ggfsDataCache;
 
         return ggfsDataCacheSize.longValue();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/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 0c8fa66..3fb8289 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().isGgfsDataCache() && cctx.kernalContext().ggfsHelper().isGgfsBlockKey(key())) {
+        if (cctx.cache().isGgfsDataCache() && cctx.kernalContext().ggfsHelper().isIgfsBlockKey(key())) {
             int newSize = valueLength((byte[])val, valBytes != null ? GridCacheValueBytes.marshaled(valBytes) :
                 GridCacheValueBytes.nil());
             int oldSize = valueLength((byte[])this.val, this.val == null ? valueBytesUnlocked() :

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java
index 05f198f..8a1a965 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java
@@ -344,7 +344,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> {
      *
      * @return Amount of used GGFS space in bytes.
      */
-    public long ggfsDataSpaceUsed();
+    public long igfsDataSpaceUsed();
 
     /**
      * Get maximum space available for GGFS.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
index 9986be7..6d65b3d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
@@ -713,8 +713,8 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V
     }
 
     /** {@inheritDoc} */
-    @Override public long ggfsDataSpaceUsed() {
-        return cache.ggfsDataSpaceUsed();
+    @Override public long igfsDataSpaceUsed() {
+        return cache.igfsDataSpaceUsed();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
index 542fd19..da2e30f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
@@ -565,11 +565,11 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali
     }
 
     /** {@inheritDoc} */
-    @Override public long ggfsDataSpaceUsed() {
+    @Override public long igfsDataSpaceUsed() {
         GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
 
         try {
-            return delegate.ggfsDataSpaceUsed();
+            return delegate.igfsDataSpaceUsed();
         }
         finally {
             gate.leave(prev);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
index 43d52ce..8322ca1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
@@ -493,7 +493,7 @@ public class GridDhtPartitionDemandPool<K, V> {
                         log.debug("Preloading key [key=" + entry.key() + ", part=" + p + ", node=" + pick.id() + ']');
 
                     if (cctx.dht().isGgfsDataCache() &&
-                        cctx.dht().ggfsDataSpaceUsed() > cctx.dht().ggfsDataSpaceMax()) {
+                        cctx.dht().igfsDataSpaceUsed() > cctx.dht().ggfsDataSpaceMax()) {
                         LT.error(log, null, "Failed to preload GGFS data cache (GGFS space size exceeded maximum " +
                             "value, will ignore preload entries): " + name());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
index c5fa33e..ab4a24e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
@@ -633,8 +633,8 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda
     }
 
     /** {@inheritDoc} */
-    @Override public long ggfsDataSpaceUsed() {
-        return dht().ggfsDataSpaceUsed();
+    @Override public long igfsDataSpaceUsed() {
+        return dht().igfsDataSpaceUsed();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/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 ba5d0a5..23b3aa8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
@@ -712,7 +712,7 @@ public class GridClosureProcessor extends GridProcessorAdapter {
                 return "system";
 
             case GGFS_POOL:
-                return "ggfs";
+                return "igfs";
 
             default:
                 throw new IllegalArgumentException("Invalid closure execution policy: " + plc);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java
index da37279..c89e3c1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java
@@ -34,21 +34,21 @@ import java.util.*;
  */
 public class IgfsAsyncImpl extends AsyncSupportAdapter<IgniteFs> implements IgfsEx {
     /** */
-    private final IgfsImpl ggfs;
+    private final IgfsImpl igfs;
 
     /**
-     * @param ggfs Ggfs.
+     * @param igfs Ggfs.
      */
-    public IgfsAsyncImpl(IgfsImpl ggfs) {
+    public IgfsAsyncImpl(IgfsImpl igfs) {
         super(true);
 
-        this.ggfs = ggfs;
+        this.igfs = igfs;
     }
 
     /** {@inheritDoc} */
     @Override public void format() {
         try {
-            saveOrGet(ggfs.formatAsync());
+            saveOrGet(igfs.formatAsync());
         }
         catch (IgniteCheckedException e) {
             throw U.convertException(e);
@@ -59,7 +59,7 @@ public class IgfsAsyncImpl extends AsyncSupportAdapter<IgniteFs> implements Igfs
     @Override public <T, R> R execute(IgfsTask<T, R> task, @Nullable IgfsRecordResolver rslvr,
         Collection<IgfsPath> paths, @Nullable T arg) {
         try {
-            return saveOrGet(ggfs.executeAsync(task, rslvr, paths, arg));
+            return saveOrGet(igfs.executeAsync(task, rslvr, paths, arg));
         }
         catch (IgniteCheckedException e) {
             throw U.convertException(e);
@@ -70,7 +70,7 @@ public class IgfsAsyncImpl extends AsyncSupportAdapter<IgniteFs> implements Igfs
     @Override public <T, R> R execute(IgfsTask<T, R> task, @Nullable IgfsRecordResolver rslvr,
         Collection<IgfsPath> paths, boolean skipNonExistentFiles, long maxRangeLen, @Nullable T arg) {
         try {
-            return saveOrGet(ggfs.executeAsync(task, rslvr, paths, skipNonExistentFiles, maxRangeLen, arg));
+            return saveOrGet(igfs.executeAsync(task, rslvr, paths, skipNonExistentFiles, maxRangeLen, arg));
         }
         catch (IgniteCheckedException e) {
             throw U.convertException(e);
@@ -81,7 +81,7 @@ public class IgfsAsyncImpl extends AsyncSupportAdapter<IgniteFs> implements Igfs
     @Override public <T, R> R execute(Class<? extends IgfsTask<T, R>> taskCls,
         @Nullable IgfsRecordResolver rslvr, Collection<IgfsPath> paths, @Nullable T arg) {
         try {
-            return saveOrGet(ggfs.executeAsync(taskCls, rslvr, paths, arg));
+            return saveOrGet(igfs.executeAsync(taskCls, rslvr, paths, arg));
         }
         catch (IgniteCheckedException e) {
             throw U.convertException(e);
@@ -93,7 +93,7 @@ public class IgfsAsyncImpl extends AsyncSupportAdapter<IgniteFs> implements Igfs
         @Nullable IgfsRecordResolver rslvr, Collection<IgfsPath> paths, boolean skipNonExistentFiles,
         long maxRangeLen, @Nullable T arg) {
         try {
-            return saveOrGet(ggfs.executeAsync(taskCls, rslvr, paths, skipNonExistentFiles, maxRangeLen, arg));
+            return saveOrGet(igfs.executeAsync(taskCls, rslvr, paths, skipNonExistentFiles, maxRangeLen, arg));
         }
         catch (IgniteCheckedException e) {
             throw U.convertException(e);
@@ -102,215 +102,215 @@ public class IgfsAsyncImpl extends AsyncSupportAdapter<IgniteFs> implements Igfs
 
     /** {@inheritDoc} */
     @Override public void stop() {
-        ggfs.stop();
+        igfs.stop();
     }
 
     /** {@inheritDoc} */
     @Override public IgfsContext context() {
-        return ggfs.context();
+        return igfs.context();
     }
 
     /** {@inheritDoc} */
     @Override public IgfsPaths proxyPaths() {
-        return ggfs.proxyPaths();
+        return igfs.proxyPaths();
     }
 
     /** {@inheritDoc} */
     @Override public IgfsInputStreamAdapter open(IgfsPath path, int bufSize,
         int seqReadsBeforePrefetch) {
-        return ggfs.open(path, bufSize, seqReadsBeforePrefetch);
+        return igfs.open(path, bufSize, seqReadsBeforePrefetch);
     }
 
     /** {@inheritDoc} */
     @Override public IgfsInputStreamAdapter open(IgfsPath path) {
-        return ggfs.open(path);
+        return igfs.open(path);
     }
 
     /** {@inheritDoc} */
     @Override public IgfsInputStreamAdapter open(IgfsPath path, int bufSize) {
-        return ggfs.open(path, bufSize);
+        return igfs.open(path, bufSize);
     }
 
     /** {@inheritDoc} */
     @Override public IgfsStatus globalSpace() throws IgniteCheckedException {
-        return ggfs.globalSpace();
+        return igfs.globalSpace();
     }
 
     /** {@inheritDoc} */
     @Override public void globalSampling(@Nullable Boolean val) throws IgniteCheckedException {
-        ggfs.globalSampling(val);
+        igfs.globalSampling(val);
     }
 
     /** {@inheritDoc} */
     @Nullable @Override public Boolean globalSampling() {
-        return ggfs.globalSampling();
+        return igfs.globalSampling();
     }
 
     /** {@inheritDoc} */
     @Override public IgfsLocalMetrics localMetrics() {
-        return ggfs.localMetrics();
+        return igfs.localMetrics();
     }
 
     /** {@inheritDoc} */
     @Override public long groupBlockSize() {
-        return ggfs.groupBlockSize();
+        return igfs.groupBlockSize();
     }
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<?> awaitDeletesAsync() throws IgniteCheckedException {
-        return ggfs.awaitDeletesAsync();
+        return igfs.awaitDeletesAsync();
     }
 
     /** {@inheritDoc} */
     @Nullable @Override public String clientLogDirectory() {
-        return ggfs.clientLogDirectory();
+        return igfs.clientLogDirectory();
     }
 
     /** {@inheritDoc} */
     @Override public void clientLogDirectory(String logDir) {
-        ggfs.clientLogDirectory(logDir);
+        igfs.clientLogDirectory(logDir);
     }
 
     /** {@inheritDoc} */
     @Override public boolean evictExclude(IgfsPath path, boolean primary) {
-        return ggfs.evictExclude(path, primary);
+        return igfs.evictExclude(path, primary);
     }
 
     /** {@inheritDoc} */
     @Override public IgniteUuid nextAffinityKey() {
-        return ggfs.nextAffinityKey();
+        return igfs.nextAffinityKey();
     }
 
     /** {@inheritDoc} */
     @Override public boolean isProxy(URI path) {
-        return ggfs.isProxy(path);
+        return igfs.isProxy(path);
     }
 
     /** {@inheritDoc} */
     @Nullable @Override public String name() {
-        return ggfs.name();
+        return igfs.name();
     }
 
     /** {@inheritDoc} */
     @Override public IgfsConfiguration configuration() {
-        return ggfs.configuration();
+        return igfs.configuration();
     }
 
     /** {@inheritDoc} */
     @Override public IgfsPathSummary summary(IgfsPath path) {
-        return ggfs.summary(path);
+        return igfs.summary(path);
     }
 
     /** {@inheritDoc} */
     @Override public IgfsOutputStream create(IgfsPath path, boolean overwrite) {
-        return ggfs.create(path, overwrite);
+        return igfs.create(path, overwrite);
     }
 
     /** {@inheritDoc} */
     @Override public IgfsOutputStream create(IgfsPath path, int bufSize, boolean overwrite, int replication,
         long blockSize, @Nullable Map<String, String> props) {
-        return ggfs.create(path, bufSize, overwrite, replication, blockSize, props);
+        return igfs.create(path, bufSize, overwrite, replication, blockSize, props);
     }
 
     /** {@inheritDoc} */
     @Override public IgfsOutputStream create(IgfsPath path, int bufSize, boolean overwrite,
         @Nullable IgniteUuid affKey, int replication, long blockSize, @Nullable Map<String, String> props) {
-        return ggfs.create(path, bufSize, overwrite, affKey, replication, blockSize, props);
+        return igfs.create(path, bufSize, overwrite, affKey, replication, blockSize, props);
     }
 
     /** {@inheritDoc} */
     @Override public IgfsOutputStream append(IgfsPath path, boolean create) {
-        return ggfs.append(path, create);
+        return igfs.append(path, create);
     }
 
     /** {@inheritDoc} */
     @Override public IgfsOutputStream append(IgfsPath path, int bufSize, boolean create,
         @Nullable Map<String, String> props) {
-        return ggfs.append(path, bufSize, create, props);
+        return igfs.append(path, bufSize, create, props);
     }
 
     /** {@inheritDoc} */
     @Override public void setTimes(IgfsPath path, long accessTime, long modificationTime) {
-        ggfs.setTimes(path, accessTime, modificationTime);
+        igfs.setTimes(path, accessTime, modificationTime);
     }
 
     /** {@inheritDoc} */
     @Override public Collection<IgfsBlockLocation> affinity(IgfsPath path, long start, long len) {
-        return ggfs.affinity(path, start, len);
+        return igfs.affinity(path, start, len);
     }
 
     /** {@inheritDoc} */
     @Override public Collection<IgfsBlockLocation> affinity(IgfsPath path, long start, long len, long maxLen) {
-        return ggfs.affinity(path, start, len, maxLen);
+        return igfs.affinity(path, start, len, maxLen);
     }
 
     /** {@inheritDoc} */
     @Override public IgfsMetrics metrics() {
-        return ggfs.metrics();
+        return igfs.metrics();
     }
 
     /** {@inheritDoc} */
     @Override public void resetMetrics() {
-        ggfs.resetMetrics();
+        igfs.resetMetrics();
     }
 
     /** {@inheritDoc} */
     @Override public long size(IgfsPath path) {
-        return ggfs.size(path);
+        return igfs.size(path);
     }
 
     /** {@inheritDoc} */
     @Override public boolean exists(IgfsPath path) {
-        return ggfs.exists(path);
+        return igfs.exists(path);
     }
 
     /** {@inheritDoc} */
     @Nullable @Override public IgfsFile update(IgfsPath path, Map<String, String> props) {
-        return ggfs.update(path, props);
+        return igfs.update(path, props);
     }
 
     /** {@inheritDoc} */
     @Override public void rename(IgfsPath src, IgfsPath dest) {
-        ggfs.rename(src, dest);
+        igfs.rename(src, dest);
     }
 
     /** {@inheritDoc} */
     @Override public boolean delete(IgfsPath path, boolean recursive) {
-        return ggfs.delete(path, recursive);
+        return igfs.delete(path, recursive);
     }
 
     /** {@inheritDoc} */
     @Override public void mkdirs(IgfsPath path) {
-        ggfs.mkdirs(path);
+        igfs.mkdirs(path);
     }
 
     /** {@inheritDoc} */
     @Override public void mkdirs(IgfsPath path, @Nullable Map<String, String> props) {
-        ggfs.mkdirs(path, props);
+        igfs.mkdirs(path, props);
     }
 
     /** {@inheritDoc} */
     @Override public Collection<IgfsPath> listPaths(IgfsPath path) {
-        return ggfs.listPaths(path);
+        return igfs.listPaths(path);
     }
 
     /** {@inheritDoc} */
     @Override public Collection<IgfsFile> listFiles(IgfsPath path) {
-        return ggfs.listFiles(path);
+        return igfs.listFiles(path);
     }
 
     /** {@inheritDoc} */
     @Nullable @Override public IgfsFile info(IgfsPath path) {
-        return ggfs.info(path);
+        return igfs.info(path);
     }
 
     /** {@inheritDoc} */
     @Override public long usedSpaceSize() {
-        return ggfs.usedSpaceSize();
+        return igfs.usedSpaceSize();
     }
 
     /** {@inheritDoc} */
     @Override public Map<String, String> properties() {
-        return ggfs.properties();
+        return igfs.properties();
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/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 89680d9..2304069 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java
@@ -55,7 +55,7 @@ public class IgfsContext {
     private final IgfsFragmentizerManager fragmentizerMgr;
 
     /** GGFS instance. */
-    private final IgfsEx ggfs;
+    private final IgfsEx igfs;
 
     /**
      * @param ctx Kernal context.
@@ -82,14 +82,14 @@ public class IgfsContext {
         this.srvMgr = add(srvMgr);
         this.fragmentizerMgr = add(fragmentizerMgr);
 
-        ggfs = new IgfsImpl(this);
+        igfs = new IgfsImpl(this);
     }
 
     /**
      * @return GGFS instance.
      */
-    public IgfsEx ggfs() {
-        return ggfs;
+    public IgfsEx igfs() {
+        return igfs;
     }
 
     /**
@@ -177,7 +177,7 @@ public class IgfsContext {
      * @param node Node to check.
      * @return {@code True} if node has GGFS with this name, {@code false} otherwise.
      */
-    public boolean ggfsNode(ClusterNode node) {
+    public boolean igfsNode(ClusterNode node) {
         assert node != null;
 
         IgfsAttributes[] ggfs = node.attribute(ATTR_GGFS);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/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 14fb6c5..089ab41 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
@@ -64,7 +64,7 @@ import static org.apache.ignite.transactions.IgniteTxIsolation.*;
  */
 public class IgfsDataManager extends IgfsManager {
     /** GGFS. */
-    private IgfsEx ggfs;
+    private IgfsEx igfs;
 
     /** Data cache projection. */
     private GridCacheProjectionEx<IgfsBlockKey, byte[]> dataCachePrj;
@@ -149,7 +149,7 @@ public class IgfsDataManager extends IgfsManager {
 
     /** {@inheritDoc} */
     @Override protected void start0() throws IgniteCheckedException {
-        ggfs = igfsCtx.ggfs();
+        igfs = igfsCtx.igfs();
 
         dataCachePrj = igfsCtx.kernalContext().cache().internalCache(igfsCtx.configuration().getDataCacheName());
         dataCache = igfsCtx.kernalContext().cache().internalCache(igfsCtx.configuration().getDataCacheName());
@@ -161,7 +161,7 @@ public class IgfsDataManager extends IgfsManager {
             throw new IgniteCheckedException("Data cache should be transactional: " +
                 igfsCtx.configuration().getDataCacheName());
 
-        metrics = igfsCtx.ggfs().localMetrics();
+        metrics = igfsCtx.igfs().localMetrics();
 
         assert dataCachePrj != null;
 
@@ -192,7 +192,7 @@ public class IgfsDataManager extends IgfsManager {
 
                 DiscoveryEvent discoEvt = (DiscoveryEvent)evt;
 
-                if (igfsCtx.ggfsNode(discoEvt.eventNode())) {
+                if (igfsCtx.igfsNode(discoEvt.eventNode())) {
                     for (WriteCompletionFuture future : pendingWrites.values()) {
                         future.onError(discoEvt.eventNode().id(),
                             new ClusterTopologyCheckedException("Node left grid before write completed: " + evt.node().id()));
@@ -221,7 +221,7 @@ public class IgfsDataManager extends IgfsManager {
         maxPendingPuts = igfsCtx.configuration().getDualModeMaxPendingPutsSize();
 
         delWorker = new AsyncDeleteWorker(igfsCtx.kernalContext().gridName(),
-            "ggfs-" + ggfsName + "-delete-worker", log);
+            "igfs-" + ggfsName + "-delete-worker", log);
     }
 
     /** {@inheritDoc} */
@@ -252,7 +252,7 @@ public class IgfsDataManager extends IgfsManager {
      * @return Number of bytes used to store files.
      */
     public long spaceSize() {
-        return dataCachePrj.ggfsDataSpaceUsed();
+        return dataCachePrj.igfsDataSpaceUsed();
     }
 
     /**
@@ -484,7 +484,7 @@ public class IgfsDataManager extends IgfsManager {
     }
 
     /**
-     * Registers write future in ggfs data manager.
+     * Registers write future in igfs data manager.
      *
      * @param fileInfo File info of file opened to write.
      * @return Future that will be completed when all ack messages are received or when write failed.
@@ -1077,16 +1077,16 @@ public class IgfsDataManager extends IgfsManager {
      */
     private void processPartialBlockWrite(IgniteUuid fileId, IgfsBlockKey colocatedKey, int startOff,
         byte[] data) throws IgniteCheckedException {
-        if (dataCachePrj.ggfsDataSpaceUsed() >= dataCachePrj.ggfsDataSpaceMax()) {
+        if (dataCachePrj.igfsDataSpaceUsed() >= dataCachePrj.ggfsDataSpaceMax()) {
             try {
-                ggfs.awaitDeletesAsync().get(trashPurgeTimeout);
+                igfs.awaitDeletesAsync().get(trashPurgeTimeout);
             }
             catch (IgniteFutureTimeoutCheckedException ignore) {
                 // Ignore.
             }
 
             // Additional size check.
-            if (dataCachePrj.ggfsDataSpaceUsed() >= dataCachePrj.ggfsDataSpaceMax()) {
+            if (dataCachePrj.igfsDataSpaceUsed() >= dataCachePrj.ggfsDataSpaceMax()) {
                 final WriteCompletionFuture completionFut = pendingWrites.get(fileId);
 
                 if (completionFut == null) {
@@ -1098,7 +1098,7 @@ public class IgfsDataManager extends IgfsManager {
                 }
 
                 IgfsOutOfSpaceException e = new IgfsOutOfSpaceException("Failed to write data block " +
-                    "(GGFS maximum data size exceeded) [used=" + dataCachePrj.ggfsDataSpaceUsed() +
+                    "(GGFS maximum data size exceeded) [used=" + dataCachePrj.igfsDataSpaceUsed() +
                     ", allowed=" + dataCachePrj.ggfsDataSpaceMax() + ']');
 
                 completionFut.onDone(new IgniteCheckedException("Failed to write data (not enough space on node): " +
@@ -1246,20 +1246,20 @@ public class IgfsDataManager extends IgfsManager {
     private IgniteInternalFuture<?> storeBlocksAsync(Map<IgfsBlockKey, byte[]> blocks) {
         assert !blocks.isEmpty();
 
-        if (dataCachePrj.ggfsDataSpaceUsed() >= dataCachePrj.ggfsDataSpaceMax()) {
+        if (dataCachePrj.igfsDataSpaceUsed() >= dataCachePrj.ggfsDataSpaceMax()) {
             try {
                 try {
-                    ggfs.awaitDeletesAsync().get(trashPurgeTimeout);
+                    igfs.awaitDeletesAsync().get(trashPurgeTimeout);
                 }
                 catch (IgniteFutureTimeoutCheckedException ignore) {
                     // Ignore.
                 }
 
                 // Additional size check.
-                if (dataCachePrj.ggfsDataSpaceUsed() >= dataCachePrj.ggfsDataSpaceMax())
+                if (dataCachePrj.igfsDataSpaceUsed() >= dataCachePrj.ggfsDataSpaceMax())
                     return new GridFinishedFuture<Object>(igfsCtx.kernalContext(),
                         new IgfsOutOfSpaceException("Failed to write data block (GGFS maximum data size " +
-                            "exceeded) [used=" + dataCachePrj.ggfsDataSpaceUsed() +
+                            "exceeded) [used=" + dataCachePrj.igfsDataSpaceUsed() +
                             ", allowed=" + dataCachePrj.ggfsDataSpaceMax() + ']'));
 
             }
@@ -1363,7 +1363,7 @@ public class IgfsDataManager extends IgfsManager {
         }
 
         // Check if we have enough free space to do colocated writes.
-        if (dataCachePrj.ggfsDataSpaceUsed() > dataCachePrj.ggfsDataSpaceMax() *
+        if (dataCachePrj.igfsDataSpaceUsed() > dataCachePrj.ggfsDataSpaceMax() *
             igfsCtx.configuration().getFragmentizerLocalWritesRatio()) {
             // Forbid further co-location.
             locRange.markDone();
@@ -1744,7 +1744,7 @@ public class IgfsDataManager extends IgfsManager {
                                 ldr.close(isCancelled());
                             }
                             catch (IgniteException e) {
-                                log.error("Failed to stop data loader while shutting down ggfs async delete thread.", e);
+                                log.error("Failed to stop data loader while shutting down igfs async delete thread.", e);
                             }
                             finally {
                                 fut.onDone(); // Complete future.
@@ -1755,7 +1755,7 @@ public class IgfsDataManager extends IgfsManager {
             }
             finally {
                 if (log.isDebugEnabled())
-                    log.debug("Stopping asynchronous ggfs file delete thread: " + name());
+                    log.debug("Stopping asynchronous igfs file delete thread: " + name());
 
                 IgniteBiTuple<GridFutureAdapter<Object>, IgfsFileInfo> req = delReqs.poll();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/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 02e44e4..14f87ad 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java
@@ -82,7 +82,7 @@ public class IgfsDeleteWorker extends IgfsThread {
      * @param ggfsCtx GGFS context.
      */
     IgfsDeleteWorker(IgfsContext ggfsCtx) {
-        super("ggfs-delete-worker%" + ggfsCtx.ggfs().name() + "%" + ggfsCtx.kernalContext().localNodeId() + "%");
+        super("igfs-delete-worker%" + ggfsCtx.igfs().name() + "%" + ggfsCtx.kernalContext().localNodeId() + "%");
 
         this.ggfsCtx = ggfsCtx;
 
@@ -91,7 +91,7 @@ public class IgfsDeleteWorker extends IgfsThread {
 
         evts = ggfsCtx.kernalContext().event();
 
-        String ggfsName = ggfsCtx.ggfs().name();
+        String ggfsName = ggfsCtx.igfs().name();
 
         topic = F.isEmpty(ggfsName) ? TOPIC_GGFS : TOPIC_GGFS.topic(ggfsName);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java
index c260f1f..65b309c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java
@@ -200,7 +200,7 @@ public class IgfsFragmentizerManager extends IgfsManager {
                 Collection<ClusterNode> nodes = discoEvt.topologyNodes();
 
                 for (ClusterNode node : nodes) {
-                    if (node.order() < minNodeOrder && igfsCtx.ggfsNode(node))
+                    if (node.order() < minNodeOrder && igfsCtx.igfsNode(node))
                         minNodeOrder = node.order();
                 }
 
@@ -556,7 +556,7 @@ public class IgfsFragmentizerManager extends IgfsManager {
                     F.node2id(),
                     new P1<ClusterNode>() {
                         @Override public boolean apply(ClusterNode n) {
-                            return igfsCtx.ggfsNode(n);
+                            return igfsCtx.igfsNode(n);
                         }
                     }));
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelper.java
index d9be110..84ab0ba 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelper.java
@@ -45,5 +45,5 @@ public interface IgfsHelper {
      * @param key Key.
      * @return {@code True} if GGFS block key.
      */
-    public abstract boolean isGgfsBlockKey(Object key);
+    public abstract boolean isIgfsBlockKey(Object key);
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java
index 532dca5..6314ec3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java
@@ -48,7 +48,7 @@ public class IgfsHelperImpl implements IgfsHelper {
     }
 
     /** {@inheritDoc} */
-    @Override public boolean isGgfsBlockKey(Object key) {
+    @Override public boolean isIgfsBlockKey(Object key) {
         return key instanceof IgfsBlockKey;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/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 70a2e06..eee0187 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
@@ -282,7 +282,7 @@ public final class IgfsImpl implements IgfsEx {
                             workerMap.remove(path, worker); // Worker is stopping. Remove it from map.
                     }
                     else {
-                        worker = new IgfsFileWorker("ggfs-file-worker-" + path) {
+                        worker = new IgfsFileWorker("igfs-file-worker-" + path) {
                             @Override protected void onFinish() {
                                 workerMap.remove(path, this);
                             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/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 a963bde..59c31b1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java
@@ -68,7 +68,7 @@ class IgfsIpcHandler implements IgfsServerHandler {
         assert ggfsCtx != null;
 
         ctx = ggfsCtx.kernalContext();
-        ggfs = ggfsCtx.ggfs();
+        ggfs = ggfsCtx.igfs();
 
         // Keep buffer size multiple of block size so no extra byte array copies is performed.
         bufSize = ggfsCtx.configuration().getBlockSize() * 2;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsJobImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsJobImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsJobImpl.java
index 3ccb404..85ffc2a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsJobImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsJobImpl.java
@@ -37,7 +37,7 @@ public class IgfsJobImpl implements ComputeJob, GridInternalWrapper<IgfsJob> {
     private IgfsJob job;
 
     /** GGFS name. */
-    private String ggfsName;
+    private String igfsName;
 
     /** GGFS path. */
     private IgfsPath path;
@@ -61,16 +61,16 @@ public class IgfsJobImpl implements ComputeJob, GridInternalWrapper<IgfsJob> {
 
     /**
      * @param job GGFS job.
-     * @param ggfsName GGFS name.
+     * @param igfsName GGFS name.
      * @param path Split path.
      * @param start Split start offset.
      * @param len Split length.
      * @param rslvr GGFS split resolver.
      */
-    public IgfsJobImpl(IgfsJob job, String ggfsName, IgfsPath path, long start, long len,
+    public IgfsJobImpl(IgfsJob job, String igfsName, IgfsPath path, long start, long len,
         IgfsRecordResolver rslvr) {
         this.job = job;
-        this.ggfsName = ggfsName;
+        this.igfsName = igfsName;
         this.path = path;
         this.start = start;
         this.len = len;
@@ -79,7 +79,7 @@ public class IgfsJobImpl implements ComputeJob, GridInternalWrapper<IgfsJob> {
 
     /** {@inheritDoc} */
     @Override public Object execute() {
-        IgniteFs fs = ignite.fileSystem(ggfsName);
+        IgniteFs fs = ignite.fileSystem(igfsName);
 
         try (IgfsInputStream in = fs.open(path)) {
             IgfsFileRange split = new IgfsFileRange(path, start, len);
@@ -89,7 +89,7 @@ public class IgfsJobImpl implements ComputeJob, GridInternalWrapper<IgfsJob> {
 
                 if (split == null) {
                     log.warning("No data found for split on local node after resolver is applied " +
-                        "[ggfsName=" + ggfsName + ", path=" + path + ", start=" + start + ", len=" + len + ']');
+                        "[ggfsName=" + igfsName + ", path=" + path + ", start=" + start + ", len=" + len + ']');
 
                     return null;
                 }
@@ -100,7 +100,7 @@ public class IgfsJobImpl implements ComputeJob, GridInternalWrapper<IgfsJob> {
             return job.execute(fs, new IgfsFileRange(path, split.start(), split.length()), in);
         }
         catch (IOException e) {
-            throw new IgniteException("Failed to execute GGFS job for file split [ggfsName=" + ggfsName +
+            throw new IgniteException("Failed to execute GGFS job for file split [ggfsName=" + igfsName +
                 ", path=" + path + ", start=" + start + ", len=" + len + ']', e);
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
index 34cbad5..d2e6c5a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
@@ -1665,7 +1665,7 @@ public class IgfsMetaManager extends IgfsManager {
                                     "the secondary file system because the path points to a directory: " + path);
 
                             IgfsFileInfo newInfo = new IgfsFileInfo(status.blockSize(), status.length(), affKey,
-                                IgniteUuid.randomUuid(), igfsCtx.ggfs().evictExclude(path, false), status.properties());
+                                IgniteUuid.randomUuid(), igfsCtx.igfs().evictExclude(path, false), status.properties());
 
                             // Add new file info to the listing optionally removing the previous one.
                             IgniteUuid oldId = putIfAbsentNonTx(parentInfo.id(), path.name(), newInfo);
@@ -2299,7 +2299,7 @@ public class IgfsMetaManager extends IgfsManager {
                 // Recreate the path locally.
                 IgfsFileInfo curInfo = status.isDirectory() ? new IgfsFileInfo(true, status.properties()) :
                     new IgfsFileInfo(igfsCtx.configuration().getBlockSize(), status.length(),
-                        igfsCtx.ggfs().evictExclude(curPath, false), status.properties());
+                        igfsCtx.igfs().evictExclude(curPath, false), status.properties());
 
                 IgniteUuid oldId = putIfAbsentNonTx(parentInfo.id(), components.get(i), curInfo);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopHelper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopHelper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopHelper.java
index 7f0a1ca..ca83145 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopHelper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopHelper.java
@@ -35,7 +35,7 @@ public class IgfsNoopHelper implements IgfsHelper {
     }
 
     /** {@inheritDoc} */
-    @Override public boolean isGgfsBlockKey(Object key) {
+    @Override public boolean isIgfsBlockKey(Object key) {
         return false;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/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 8508844..42ed3a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
@@ -53,7 +53,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
     /** Converts context to GGFS. */
     private static final IgniteClosure<IgfsContext,IgniteFs> CTX_TO_GGFS = new C1<IgfsContext, IgniteFs>() {
         @Override public IgniteFs apply(IgfsContext ggfsCtx) {
-            return ggfsCtx.ggfs();
+            return ggfsCtx.igfs();
         }
     };
 
@@ -120,7 +120,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
         // Stop GGFS instances.
         for (IgfsContext ggfsCtx : ggfsCache.values()) {
             if (log.isDebugEnabled())
-                log.debug("Stopping ggfs: " + ggfsCtx.configuration().getName());
+                log.debug("Stopping igfs: " + ggfsCtx.configuration().getName());
 
             List<IgfsManager> mgrs = ggfsCtx.managers();
 
@@ -130,7 +130,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
                 mgr.stop(cancel);
             }
 
-            ggfsCtx.ggfs().stop();
+            ggfsCtx.igfs().stop();
         }
 
         ggfsCache.clear();
@@ -143,7 +143,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
     @Override public void onKernalStop(boolean cancel) {
         for (IgfsContext ggfsCtx : ggfsCache.values()) {
             if (log.isDebugEnabled())
-                log.debug("Stopping ggfs: " + ggfsCtx.configuration().getName());
+                log.debug("Stopping igfs: " + ggfsCtx.configuration().getName());
 
             List<IgfsManager> mgrs = ggfsCtx.managers();
 
@@ -175,7 +175,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
     @Override @Nullable public IgniteFs ggfs(@Nullable String name) {
         IgfsContext ggfsCtx = ggfsCache.get(maskName(name));
 
-        return ggfsCtx == null ? null : ggfsCtx.ggfs();
+        return ggfsCtx == null ? null : ggfsCtx.igfs();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java
index 7ff573a..5e9fcb3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java
@@ -67,7 +67,7 @@ public class IgfsServer {
     private final boolean mgmt;
 
     /**
-     * Constructs ggfs server manager.
+     * Constructs igfs server manager.
      * @param ggfsCtx GGFS context.
      * @param endpointCfg Endpoint configuration to start.
      * @param mgmt Management flag - if true, server is intended to be started for Visor.
@@ -217,7 +217,7 @@ public class IgfsServer {
          * @throws IgniteCheckedException If endpoint output stream cannot be obtained.
          */
         protected ClientWorker(IpcEndpoint endpoint, int idx) throws IgniteCheckedException {
-            super(ggfsCtx.kernalContext().gridName(), "ggfs-client-worker-" + idx, log);
+            super(ggfsCtx.kernalContext().gridName(), "igfs-client-worker-" + idx, log);
 
             this.endpoint = endpoint;
 
@@ -384,7 +384,7 @@ public class IgfsServer {
          * Creates accept worker.
          */
         protected AcceptWorker() {
-            super(ggfsCtx.kernalContext().gridName(), "ggfs-accept-worker", log);
+            super(ggfsCtx.kernalContext().gridName(), "igfs-accept-worker", log);
         }
 
         /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsThread.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsThread.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsThread.java
index 533277f..4ada131 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsThread.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsThread.java
@@ -27,7 +27,7 @@ public abstract class IgfsThread extends Thread {
      * Creates {@code GGFS} add-hoc thread.
      */
     protected IgfsThread() {
-        super("ggfs-worker");
+        super("igfs-worker");
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/main/java/org/apache/ignite/internal/visor/ggfs/VisorIgfsProfilerClearTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/ggfs/VisorIgfsProfilerClearTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/ggfs/VisorIgfsProfilerClearTask.java
index 4b3f73b..0065cc8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/ggfs/VisorIgfsProfilerClearTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/ggfs/VisorIgfsProfilerClearTask.java
@@ -65,7 +65,7 @@ public class VisorIgfsProfilerClearTask extends VisorOneNodeTask<String, IgniteB
 
                 if (logsDir != null) {
                     PathMatcher matcher = FileSystems.getDefault().getPathMatcher(
-                        "glob:ggfs-log-" + arg + "-*.csv");
+                        "glob:igfs-log-" + arg + "-*.csv");
 
                     try (DirectoryStream<Path> dirStream = Files.newDirectoryStream(logsDir)) {
                         for (Path p : dirStream) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/main/java/org/apache/ignite/internal/visor/ggfs/VisorIgfsProfilerTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/ggfs/VisorIgfsProfilerTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/ggfs/VisorIgfsProfilerTask.java
index d7f15d5..254f541 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/ggfs/VisorIgfsProfilerTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/ggfs/VisorIgfsProfilerTask.java
@@ -474,7 +474,7 @@ public class VisorIgfsProfilerTask extends VisorOneNodeTask<String, Collection<V
             Collection<VisorIgfsProfilerEntry> parsedFiles = new ArrayList<>(512);
 
             try (DirectoryStream<Path> dirStream = Files.newDirectoryStream(logDir)) {
-                PathMatcher matcher = FileSystems.getDefault().getPathMatcher("glob:ggfs-log-" + ggfsName + "-*.csv");
+                PathMatcher matcher = FileSystems.getDefault().getPathMatcher("glob:igfs-log-" + ggfsName + "-*.csv");
 
                 for (Path p : dirStream) {
                     if (matcher.matches(p.getFileName())) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
index 7e688b1..1a3b8ec 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
@@ -75,7 +75,7 @@ public class VisorGridConfiguration implements Serializable {
     private Iterable<VisorCacheConfiguration> caches;
 
     /** Ggfss. */
-    private Iterable<VisorIgfsConfiguration> ggfss;
+    private Iterable<VisorIgfsConfiguration> igfss;
 
     /** Streamers. */
     private Iterable<VisorStreamerConfiguration> streamers;
@@ -301,15 +301,15 @@ public class VisorGridConfiguration implements Serializable {
     /**
      * @return Ggfss.
      */
-    public Iterable<VisorIgfsConfiguration> ggfss() {
-        return ggfss;
+    public Iterable<VisorIgfsConfiguration> igfss() {
+        return igfss;
     }
 
     /**
-     * @param ggfss New ggfss.
+     * @param igfss New igfss.
      */
-    public void ggfss(Iterable<VisorIgfsConfiguration> ggfss) {
-        this.ggfss = ggfss;
+    public void ggfss(Iterable<VisorIgfsConfiguration> igfss) {
+        this.igfss = igfss;
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
index f2f6408..4ac93aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
@@ -171,10 +171,10 @@ public class VisorIgfsConfiguration implements Serializable {
     }
 
     /**
-     * Construct data transfer object for ggfs configurations properties.
+     * Construct data transfer object for igfs configurations properties.
      *
-     * @param ggfss ggfs configurations.
-     * @return ggfs configurations properties.
+     * @param ggfss igfs configurations.
+     * @return igfs configurations properties.
      */
     public static Iterable<VisorIgfsConfiguration> list(IgfsConfiguration[] ggfss) {
         if (ggfss == null)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/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 f1b067f..33174ab 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
@@ -208,7 +208,7 @@ public class VisorNodeDataCollectorJob extends VisorJob<VisorNodeDataCollectorTa
         ggfs(res);
 
         if (debug)
-            start0 = log(ignite.log(), "Collected ggfs", getClass(), start0);
+            start0 = log(ignite.log(), "Collected igfs", getClass(), start0);
 
         streamers(res);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
index 057fa52..622a3c2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
@@ -599,16 +599,16 @@ public class VisorTaskUtils {
     /**
      * Resolve GGFS profiler logs directory.
      *
-     * @param ggfs GGFS instance to resolve logs dir for.
+     * @param igfs GGFS instance to resolve logs dir for.
      * @return {@link Path} to log dir or {@code null} if not found.
      * @throws IgniteCheckedException if failed to resolve.
      */
-    public static Path resolveGgfsProfilerLogsDir(IgniteFs ggfs) throws IgniteCheckedException {
+    public static Path resolveGgfsProfilerLogsDir(IgniteFs igfs) throws IgniteCheckedException {
         String logsDir;
 
-        if (ggfs instanceof IgfsEx)
-            logsDir = ((IgfsEx)ggfs).clientLogDirectory();
-        else if (ggfs == null)
+        if (igfs instanceof IgfsEx)
+            logsDir = ((IgfsEx)igfs).clientLogDirectory();
+        else if (igfs == null)
             throw new IgniteCheckedException("Failed to get profiler log folder (GGFS instance not found)");
         else
             throw new IgniteCheckedException("Failed to get profiler log folder (unexpected GGFS instance type)");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
index 360e5eb..733c176 100644
--- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
@@ -89,7 +89,7 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest
 
         ggfsCfg.setDataCacheName("dataCache");
         ggfsCfg.setMetaCacheName("metaCache");
-        ggfsCfg.setName("ggfs");
+        ggfsCfg.setName("igfs");
 
         ggfsCfg.setBlockSize(512 * 1024); // Together with group blocks mapper will yield 64M per node groups.
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java
index fbaa9ab..0f56897 100644
--- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java
@@ -65,7 +65,7 @@ public class IgfsFragmentizerAbstractSelfTest extends IgfsCommonAbstractTest {
 
         IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
-        ggfsCfg.setName("ggfs");
+        ggfsCfg.setName("igfs");
         ggfsCfg.setMetaCacheName(META_CACHE_NAME);
         ggfsCfg.setDataCacheName(DATA_CACHE_NAME);
         ggfsCfg.setBlockSize(GGFS_BLOCK_SIZE);
@@ -126,7 +126,7 @@ public class IgfsFragmentizerAbstractSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     protected void awaitFileFragmenting(int gridIdx, IgfsPath path) throws Exception {
-        IgfsEx ggfs = (IgfsEx)grid(gridIdx).fileSystem("ggfs");
+        IgfsEx ggfs = (IgfsEx)grid(gridIdx).fileSystem("igfs");
 
         IgfsMetaManager meta = ggfs.context().meta();
 
@@ -163,6 +163,6 @@ public class IgfsFragmentizerAbstractSelfTest extends IgfsCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        grid(0).fileSystem("ggfs").format();
+        grid(0).fileSystem("igfs").format();
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java
index a8b2901..f42d5a8 100644
--- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java
@@ -36,7 +36,7 @@ public class IgfsFragmentizerSelfTest extends IgfsFragmentizerAbstractSelfTest {
      * @throws Exception If failed.
      */
     public void testReadFragmentizing() throws Exception {
-        IgniteFs ggfs = grid(0).fileSystem("ggfs");
+        IgniteFs ggfs = grid(0).fileSystem("igfs");
 
         IgfsPath path = new IgfsPath("/someFile");
 
@@ -108,7 +108,7 @@ public class IgfsFragmentizerSelfTest extends IgfsFragmentizerAbstractSelfTest {
         int fileSize = 30 * GGFS_GROUP_SIZE * GGFS_BLOCK_SIZE;
 
         while (written < fileSize) {
-            IgniteFs ggfs = grid(ggfsIdx).fileSystem("ggfs");
+            IgniteFs ggfs = grid(ggfsIdx).fileSystem("igfs");
 
             try (IgfsOutputStream out = ggfs.append(path, true)) {
                 byte[] data = new byte[chunkSize];
@@ -131,7 +131,7 @@ public class IgfsFragmentizerSelfTest extends IgfsFragmentizerAbstractSelfTest {
             }
         }
 
-        IgniteFs ggfs = grid(0).fileSystem("ggfs");
+        IgniteFs ggfs = grid(0).fileSystem("igfs");
 
         try (IgfsInputStream in = ggfs.open(path)) {
             i = 0;
@@ -180,7 +180,7 @@ public class IgfsFragmentizerSelfTest extends IgfsFragmentizerAbstractSelfTest {
 
         int fileSize = 50 * GGFS_GROUP_SIZE * GGFS_BLOCK_SIZE;
 
-        IgniteFs ggfs = grid(0).fileSystem("ggfs");
+        IgniteFs ggfs = grid(0).fileSystem("igfs");
 
         byte[] chunk = new byte[chunkSize];
 
@@ -223,7 +223,7 @@ public class IgfsFragmentizerSelfTest extends IgfsFragmentizerAbstractSelfTest {
      * @throws Exception If failed.
      */
     public void testDeleteFragmentizing() throws Exception {
-        IgfsImpl ggfs = (IgfsImpl)grid(0).fileSystem("ggfs");
+        IgfsImpl ggfs = (IgfsImpl)grid(0).fileSystem("igfs");
 
         for (int i = 0; i < 30; i++) {
             IgfsPath path = new IgfsPath("/someFile" + i);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerTopologySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerTopologySelfTest.java
index 8ffe851..d2c44e2 100644
--- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerTopologySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerTopologySelfTest.java
@@ -33,7 +33,7 @@ public class IgfsFragmentizerTopologySelfTest extends IgfsFragmentizerAbstractSe
         try {
             IgfsPath path = new IgfsPath("/someFile");
 
-            IgniteFs ggfs = grid(1).fileSystem("ggfs");
+            IgniteFs ggfs = grid(1).fileSystem("igfs");
 
             try (IgfsOutputStream out = ggfs.create(path, true)) {
                 for (int i = 0; i < 10 * GGFS_GROUP_SIZE; i++)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/test/java/org/apache/ignite/igfs/IgfsPathSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsPathSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsPathSelfTest.java
index fa3149c..dec0bb6 100644
--- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsPathSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsPathSelfTest.java
@@ -38,7 +38,7 @@ public class IgfsPathSelfTest extends GridCommonAbstractTest {
     private final Marshaller marshaller = new OptimizedMarshaller();
 
     /**
-     * Test public methods of ggfs path.
+     * Test public methods of igfs path.
      *
      * @throws Exception In case of any exception.
      */
@@ -87,7 +87,7 @@ public class IgfsPathSelfTest extends GridCommonAbstractTest {
     }
 
     /**
-     * Test ggfs path constructors.
+     * Test igfs path constructors.
      *
      * @throws Exception In case of any exception.
      */
@@ -119,7 +119,7 @@ public class IgfsPathSelfTest extends GridCommonAbstractTest {
     }
 
     /**
-     * Validate ggfs path constructor fails with specified exception.
+     * Validate igfs path constructor fails with specified exception.
      *
      * @param cls Expected exception.
      * @param args Constructor arguments. Null-values are passed as Class instancies: null-string => String.class.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
index 23e8109..3903c6f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
@@ -42,7 +42,7 @@ public class GridCacheLeakTest extends GridCommonAbstractTest {
     private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
 
     /** Cache name. */
-    private static final String CACHE_NAME = "ggfs-data";
+    private static final String CACHE_NAME = "igfs-data";
 
     /** Atomicity mode. */
     private CacheAtomicityMode atomicityMode;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java
index 9e31ba8..3b5c38b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java
@@ -44,10 +44,10 @@ import static org.apache.ignite.igfs.IgfsMode.*;
 @SuppressWarnings({"ConstantConditions", "ThrowableResultOfMethodCallIgnored"})
 public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAbstractTest {
     /** Primary GGFS name. */
-    private static final String GGFS_PRIMARY = "ggfs-primary";
+    private static final String GGFS_PRIMARY = "igfs-primary";
 
     /** Primary GGFS name. */
-    private static final String GGFS_SECONDARY = "ggfs-secondary";
+    private static final String GGFS_SECONDARY = "igfs-secondary";
 
     /** Secondary file system REST endpoint configuration map. */
     private static final Map<String, String> SECONDARY_REST_CFG = new HashMap<String, String>() {{

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/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 e7a9883..bd0bb17 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
@@ -154,9 +154,9 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
 
         ggfsSecondary = (IgfsImpl) igniteSecondary.fileSystem("ignitefs-secondary");
 
-        Ignite ignite = startGridWithGgfs("ignite", "ggfs", mode, ggfsSecondary, PRIMARY_REST_CFG);
+        Ignite ignite = startGridWithGgfs("ignite", "igfs", mode, ggfsSecondary, PRIMARY_REST_CFG);
 
-        ggfs = (IgfsImpl) ignite.fileSystem("ggfs");
+        ggfs = (IgfsImpl) ignite.fileSystem("igfs");
     }
 
     /** {@inheritDoc} */
@@ -2282,9 +2282,9 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      */
     protected void checkExist(IgfsImpl ggfs, IgfsPath... paths) throws IgniteCheckedException {
         for (IgfsPath path : paths) {
-            assert ggfs.context().meta().fileId(path) != null : "Path doesn't exist [ggfs=" + ggfs.name() +
+            assert ggfs.context().meta().fileId(path) != null : "Path doesn't exist [igfs=" + ggfs.name() +
                 ", path=" + path + ']';
-            assert ggfs.exists(path) : "Path doesn't exist [ggfs=" + ggfs.name() + ", path=" + path + ']';
+            assert ggfs.exists(path) : "Path doesn't exist [igfs=" + ggfs.name() + ", path=" + path + ']';
         }
     }
 
@@ -2313,9 +2313,9 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      */
     protected void checkNotExist(IgfsImpl ggfs, IgfsPath... paths) throws Exception {
         for (IgfsPath path : paths) {
-            assert ggfs.context().meta().fileId(path) == null : "Path exists [ggfs=" + ggfs.name() + ", path=" +
+            assert ggfs.context().meta().fileId(path) == null : "Path exists [igfs=" + ggfs.name() + ", path=" +
                 path + ']';
-            assert !ggfs.exists(path) : "Path exists [ggfs=" + ggfs.name() + ", path=" + path + ']';
+            assert !ggfs.exists(path) : "Path exists [igfs=" + ggfs.name() + ", path=" + path + ']';
         }
     }
 
@@ -2364,7 +2364,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
 
                     is.readFully(0, buf);
 
-                    assert Arrays.equals(chunk, buf) : "Bad chunk [ggfs=" + ggfs.name() + ", chunkIdx=" + chunkIdx +
+                    assert Arrays.equals(chunk, buf) : "Bad chunk [igfs=" + ggfs.name() + ", chunkIdx=" + chunkIdx +
                         ", expected=" + Arrays.toString(chunk) + ", actual=" + Arrays.toString(buf) + ']';
 
                     chunkIdx++;
@@ -2447,7 +2447,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
             U.join(entry.getValue());
         }
 
-        // Clear ggfs.
+        // Clear igfs.
         ggfs.format();
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java
index b0df8ec..25070e2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java
@@ -60,7 +60,7 @@ public class IgfsCacheSelfTest extends IgfsCommonAbstractTest {
 
         ggfsCfg.setMetaCacheName(META_CACHE_NAME);
         ggfsCfg.setDataCacheName(DATA_CACHE_NAME);
-        ggfsCfg.setName("ggfs");
+        ggfsCfg.setName("igfs");
 
         cfg.setGgfsConfiguration(ggfsCfg);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
index 22aba48..3d03b75 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
@@ -78,7 +78,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
-        IgfsEx ggfs = (IgfsEx)grid(0).fileSystem("ggfs");
+        IgfsEx ggfs = (IgfsEx)grid(0).fileSystem("igfs");
 
         mgr = ggfs.context().data();
     }
@@ -95,15 +95,15 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
 
         cfg.setDiscoverySpi(discoSpi);
 
-        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
+        IgfsConfiguration igfsCfg = new IgfsConfiguration();
 
-        ggfsCfg.setMetaCacheName(META_CACHE_NAME);
-        ggfsCfg.setDataCacheName(DATA_CACHE_NAME);
-        ggfsCfg.setBlockSize(GGFS_BLOCK_SIZE);
-        ggfsCfg.setName("ggfs");
-        ggfsCfg.setBlockSize(BLOCK_SIZE);
+        igfsCfg.setMetaCacheName(META_CACHE_NAME);
+        igfsCfg.setDataCacheName(DATA_CACHE_NAME);
+        igfsCfg.setBlockSize(GGFS_BLOCK_SIZE);
+        igfsCfg.setName("igfs");
+        igfsCfg.setBlockSize(BLOCK_SIZE);
 
-        cfg.setGgfsConfiguration(ggfsCfg);
+        cfg.setGgfsConfiguration(igfsCfg);
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/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 84fdafe..3830cdf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
@@ -58,7 +58,7 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
-        IgfsEx ggfs = (IgfsEx)grid(0).fileSystem("ggfs");
+        IgfsEx ggfs = (IgfsEx)grid(0).fileSystem("igfs");
 
         mgr = ggfs.context().meta();
     }
@@ -79,7 +79,7 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
 
         ggfsCfg.setMetaCacheName(META_CACHE_NAME);
         ggfsCfg.setDataCacheName(DATA_CACHE_NAME);
-        ggfsCfg.setName("ggfs");
+        ggfsCfg.setName("igfs");
 
         cfg.setGgfsConfiguration(ggfsCfg);
 
@@ -111,7 +111,7 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        mgr.igfsCtx.ggfs().format();
+        mgr.igfsCtx.igfs().format();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dad54e8/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 c383138..d282f11 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java
@@ -38,10 +38,10 @@ import static org.apache.ignite.igfs.IgfsMode.*;
  */
 public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
     /** Primary GGFS name. */
-    private static final String GGFS_PRIMARY = "ggfs-primary";
+    private static final String GGFS_PRIMARY = "igfs-primary";
 
     /** Primary GGFS name. */
-    private static final String GGFS_SECONDARY = "ggfs-secondary";
+    private static final String GGFS_SECONDARY = "igfs-secondary";
 
     /** Secondary file system REST endpoint configuration map. */
     private static final Map<String, String> SECONDARY_REST_CFG = new HashMap<String, String>(){{


Mime
View raw message