ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [09/50] [abbrv] incubator-ignite git commit: # IGNITE-226: WIP.
Date Fri, 13 Feb 2015 22:36:07 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 0929cf8..ec8ef6e 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
@@ -28,7 +28,7 @@ public class IgfsHandshakeRequest extends IgfsMessage {
     /** Expected Grid name. */
     private String gridName;
 
-    /** Expected GGFS name. */
+    /** Expected IGFS name. */
     private String igfsName;
 
     /** Logger directory. */
@@ -59,14 +59,14 @@ public class IgfsHandshakeRequest extends IgfsMessage {
     }
 
     /**
-     * @return GGFS name.
+     * @return IGFS name.
      */
     public String igfsName() {
         return igfsName;
     }
 
     /**
-     * @param igfsName GGFS name.
+     * @param igfsName IGFS name.
      */
     public void igfsName(String igfsName) {
         this.igfsName = igfsName;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsIpcCommand.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsIpcCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsIpcCommand.java
index cd38e67..f92d9cc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsIpcCommand.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsIpcCommand.java
@@ -26,7 +26,7 @@ public enum IgfsIpcCommand {
     /** Handshake command which will send information necessary for client to handle requests correctly. */
     HANDSHAKE,
 
-    /** GGFS status (free/used space). */
+    /** IGFS status (free/used space). */
     STATUS,
 
     /** Check specified path exists in the file system. */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 eb7b854..d75d221 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
@@ -29,7 +29,7 @@ import java.util.concurrent.atomic.*;
 import java.util.concurrent.locks.*;
 
 /**
- * GGFS client logger writing data to the file.
+ * IGFS client logger writing data to the file.
  */
 public final class IgfsLogger {
     /** Field delimiter. */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 104b6d9..11af716 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
@@ -28,7 +28,7 @@ import java.util.*;
 import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.*;
 
 /**
- * Implementation of GGFS client message marshaller.
+ * Implementation of IGFS client message marshaller.
  */
 public class IgfsMarshaller {
     /** Packet header size. */
@@ -183,7 +183,7 @@ public class IgfsMarshaller {
             }
         }
         catch (IOException e) {
-            throw new IgniteCheckedException("Failed to send message to GGFS data node (is data node up and running?)", e);
+            throw new IgniteCheckedException("Failed to send message to IGFS data node (is data node up and running?)", e);
         }
     }
 
@@ -310,7 +310,7 @@ public class IgfsMarshaller {
     }
 
     /**
-     * Writes GGFS path to given data output. Can write {@code null} values.
+     * Writes IGFS path to given data output. Can write {@code null} values.
      *
      * @param out Data output.
      * @param path Path to write.
@@ -324,7 +324,7 @@ public class IgfsMarshaller {
     }
 
     /**
-     * Reads GGFS path from data input that was written by {@link #writePath(ObjectOutput, org.apache.ignite.igfs.IgfsPath)}
+     * Reads IGFS path from data input that was written by {@link #writePath(ObjectOutput, org.apache.ignite.igfs.IgfsPath)}
      * method.
      *
      * @param in Data input.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMessage.java
index 2f010f6..54c8d5b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMessage.java
@@ -18,11 +18,11 @@
 package org.apache.ignite.internal.igfs.common;
 
 /**
- * Abstract class for all messages sent between GGFS client (Hadoop File System implementation) and
- * GGFS server (Ignite data node).
+ * Abstract class for all messages sent between IGFS client (Hadoop File System implementation) and
+ * IGFS server (Ignite data node).
  */
 public abstract class IgfsMessage {
-    /** GGFS command. */
+    /** IGFS command. */
     private IgfsIpcCommand cmd;
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsStatusRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsStatusRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsStatusRequest.java
index 44e7710..0f632f6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsStatusRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsStatusRequest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.igfs.common;
 import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.*;
 
 /**
- * GGFS status (total/used/free space) request.
+ * IGFS status (total/used/free space) request.
  */
 public class IgfsStatusRequest extends IgfsMessage {
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 36b7b4e..70f8a5a 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
@@ -168,7 +168,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
     /** Affinity impl. */
     private CacheAffinity<K> aff;
 
-    /** Whether this cache is GGFS data cache. */
+    /** Whether this cache is IGFS data cache. */
     private boolean igfsDataCache;
 
     /** Whether this cache is Mongo data cache. */
@@ -179,10 +179,10 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
     @SuppressWarnings("UnusedDeclaration")
     private boolean mongoMetaCache;
 
-    /** Current GGFS data cache size. */
+    /** Current IGFS data cache size. */
     private LongAdder igfsDataCacheSize;
 
-    /** Max space for GGFS. */
+    /** Max space for IGFS. */
     private long igfsDataSpaceMax;
 
     /** Asynchronous operations limit semaphore. */
@@ -4781,7 +4781,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
     }
 
     /**
-     * Callback invoked when data is added to GGFS cache.
+     * Callback invoked when data is added to IGFS cache.
      *
      * @param delta Size delta.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 b908c19..2f8bb62 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
@@ -194,7 +194,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V>
     protected void value(@Nullable V val, @Nullable byte[] valBytes) {
         assert Thread.holdsLock(this);
 
-        // In case we deal with GGFS cache, count updated data
+        // In case we deal with IGFS cache, count updated data
         if (cctx.cache().isIgfsDataCache() && cctx.kernalContext().igfsHelper().isIgfsBlockKey(key())) {
             int newSize = valueLength((byte[])val, valBytes != null ? GridCacheValueBytes.marshaled(valBytes) :
                 GridCacheValueBytes.nil());
@@ -257,7 +257,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V>
     }
 
     /**
-     * Isolated method to get length of GGFS block.
+     * Isolated method to get length of IGFS block.
      *
      * @param val Value.
      * @param valBytes Value bytes.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 5b2ac77..ce7ec24 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
@@ -333,23 +333,23 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> {
     public IgniteInternalFuture<Map<K, V>> getAllOutTxAsync(List<K> keys);
 
     /**
-     * Checks whether this cache is GGFS data cache.
+     * Checks whether this cache is IGFS data cache.
      *
-     * @return {@code True} in case this cache is GGFS data cache.
+     * @return {@code True} in case this cache is IGFS data cache.
      */
     public boolean isIgfsDataCache();
 
     /**
-     * Get current amount of used GGFS space in bytes.
+     * Get current amount of used IGFS space in bytes.
      *
-     * @return Amount of used GGFS space in bytes.
+     * @return Amount of used IGFS space in bytes.
      */
     public long igfsDataSpaceUsed();
 
     /**
-     * Get maximum space available for GGFS.
+     * Get maximum space available for IGFS.
      *
-     * @return Amount of space available for GGFS in bytes.
+     * @return Amount of space available for IGFS in bytes.
      */
     public long igfsDataSpaceMax();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 8093496..6a1f7a1 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
@@ -494,7 +494,7 @@ public class GridDhtPartitionDemandPool<K, V> {
 
                     if (cctx.dht().isIgfsDataCache() &&
                         cctx.dht().igfsDataSpaceUsed() > cctx.dht().igfsDataSpaceMax()) {
-                        LT.error(log, null, "Failed to preload GGFS data cache (GGFS space size exceeded maximum " +
+                        LT.error(log, null, "Failed to preload IGFS data cache (IGFS space size exceeded maximum " +
                             "value, will ignore preload entries): " + name());
 
                         if (cached.markObsoleteIfEmpty(null))

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAttributes.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAttributes.java
index a897e92..8e4dbbb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAttributes.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAttributes.java
@@ -24,15 +24,15 @@ import java.io.*;
 import java.util.*;
 
 /**
- * GGFS attributes.
+ * IGFS attributes.
  * <p>
- * This class contains information on a single GGFS configured on some node.
+ * This class contains information on a single IGFS configured on some node.
  */
 public class IgfsAttributes implements Externalizable {
     /** */
     private static final long serialVersionUID = 0L;
 
-    /** GGFS name. */
+    /** IGFS name. */
     private String igfsName;
 
     /** File's data block size (bytes). */
@@ -57,7 +57,7 @@ public class IgfsAttributes implements Externalizable {
     private Map<String, IgfsMode> pathModes;
 
     /**
-     * @param igfsName GGFS name.
+     * @param igfsName IGFS name.
      * @param blockSize File's data block size (bytes).
      * @param grpSize Size of the group figured in {@link org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper}.
      * @param metaCacheName Meta cache name.
@@ -85,7 +85,7 @@ public class IgfsAttributes implements Externalizable {
     }
 
     /**
-     * @return GGFS name.
+     * @return IGFS name.
      */
     public String igfsName() {
         return igfsName;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java
index 90d244a..3880b18 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java
@@ -26,7 +26,7 @@ import java.nio.*;
 import java.util.*;
 
 /**
- * GGFS write blocks message.
+ * IGFS write blocks message.
  */
 public class IgfsBlocksMessage extends IgfsCommunicationMessage {
     /** */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsClientSession.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsClientSession.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsClientSession.java
index 5da444d..084d546 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsClientSession.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsClientSession.java
@@ -25,7 +25,7 @@ import java.util.*;
 import java.util.concurrent.*;
 
 /**
- * GGFS client session. Effectively used to manage lifecycle of opened resources and close them on
+ * IGFS client session. Effectively used to manage lifecycle of opened resources and close them on
  * connection close.
  */
 public class IgfsClientSession {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java
index ee629c1..04ce635 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.*;
 import java.nio.*;
 
 /**
- * Base class for all GGFS communication messages sent between nodes.
+ * Base class for all IGFS communication messages sent between nodes.
  */
 public abstract class IgfsCommunicationMessage extends MessageAdapter {
     /** */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 82c2770..34ebc2d 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
@@ -30,7 +30,7 @@ import java.util.*;
 import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 
 /**
- * GGFS context holding all required components for GGFS instance.
+ * IGFS context holding all required components for IGFS instance.
  */
 public class IgfsContext {
     /** Kernal context. */
@@ -54,12 +54,12 @@ public class IgfsContext {
     /** Fragmentizer manager. */
     private final IgfsFragmentizerManager fragmentizerMgr;
 
-    /** GGFS instance. */
+    /** IGFS instance. */
     private final IgfsEx igfs;
 
     /**
      * @param ctx Kernal context.
-     * @param cfg GGFS configuration.
+     * @param cfg IGFS configuration.
      * @param metaMgr Meta manager.
      * @param dataMgr Data manager.
      * @param srvMgr Server manager.
@@ -86,7 +86,7 @@ public class IgfsContext {
     }
 
     /**
-     * @return GGFS instance.
+     * @return IGFS instance.
      */
     public IgfsEx igfs() {
         return igfs;
@@ -100,7 +100,7 @@ public class IgfsContext {
     }
 
     /**
-     * @return GGFS configuration.
+     * @return IGFS configuration.
      */
     public IgfsConfiguration configuration() {
         return cfg;
@@ -172,10 +172,10 @@ public class IgfsContext {
     }
 
     /**
-     * Checks if given node is a GGFS node.
+     * Checks if given node is a IGFS node.
      *
      * @param node Node to check.
-     * @return {@code True} if node has GGFS with this name, {@code false} otherwise.
+     * @return {@code True} if node has IGFS with this name, {@code false} otherwise.
      */
     public boolean igfsNode(ClusterNode node) {
         assert node != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 aa11708..cf2b5c8 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
@@ -63,7 +63,7 @@ import static org.apache.ignite.transactions.IgniteTxIsolation.*;
  * Cache based file's data container.
  */
 public class IgfsDataManager extends IgfsManager {
-    /** GGFS. */
+    /** IGFS. */
     private IgfsEx igfs;
 
     /** Data cache projection. */
@@ -75,7 +75,7 @@ public class IgfsDataManager extends IgfsManager {
     /** */
     private IgniteInternalFuture<?> dataCacheStartFut;
 
-    /** Local GGFS metrics. */
+    /** Local IGFS metrics. */
     private IgfsLocalMetrics metrics;
 
     /** Group block size. */
@@ -102,7 +102,7 @@ public class IgfsDataManager extends IgfsManager {
     /** Request ID counter for write messages. */
     private AtomicLong reqIdCtr = new AtomicLong();
 
-    /** GGFS communication topic. */
+    /** IGFS communication topic. */
     private Object topic;
 
     /** Async file delete worker. */
@@ -212,7 +212,7 @@ public class IgfsDataManager extends IgfsManager {
         else {
             int coresCnt = Runtime.getRuntime().availableProcessors();
 
-            // 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.
             putExecSvc = new IgniteThreadPoolExecutor(coresCnt, coresCnt, 0, new LinkedBlockingDeque<Runnable>());
 
             putExecSvcShutdown = true;
@@ -256,7 +256,7 @@ public class IgfsDataManager extends IgfsManager {
     }
 
     /**
-     * @return Maximum number of bytes for GGFS data cache.
+     * @return Maximum number of bytes for IGFS data cache.
      */
     public long maxSpaceSize() {
         return dataCachePrj.igfsDataSpaceMax();
@@ -1099,7 +1099,7 @@ public class IgfsDataManager extends IgfsManager {
                 }
 
                 IgfsOutOfSpaceException e = new IgfsOutOfSpaceException("Failed to write data block " +
-                    "(GGFS maximum data size exceeded) [used=" + dataCachePrj.igfsDataSpaceUsed() +
+                    "(IGFS maximum data size exceeded) [used=" + dataCachePrj.igfsDataSpaceUsed() +
                     ", allowed=" + dataCachePrj.igfsDataSpaceMax() + ']');
 
                 completionFut.onDone(new IgniteCheckedException("Failed to write data (not enough space on node): " +
@@ -1157,7 +1157,7 @@ public class IgfsDataManager extends IgfsManager {
     }
 
     /**
-     * Executes callable in GGFS executor service. If execution rejected, callable will be executed
+     * Executes callable in IGFS executor service. If execution rejected, callable will be executed
      * in caller thread.
      *
      * @param c Callable to execute.
@@ -1173,7 +1173,7 @@ public class IgfsDataManager extends IgfsManager {
                 c.call();
             }
             catch (Exception e) {
-                log.warning("Failed to execute GGFS callable: " + c, e);
+                log.warning("Failed to execute IGFS callable: " + c, e);
             }
         }
     }
@@ -1199,7 +1199,7 @@ public class IgfsDataManager extends IgfsManager {
                 curPendingPuts += data.length;
             }
             catch (InterruptedException ignore) {
-                throw new IgniteCheckedException("Failed to put GGFS data block into cache due to interruption: " + key);
+                throw new IgniteCheckedException("Failed to put IGFS data block into cache due to interruption: " + key);
             }
             finally {
                 pendingPutsLock.unlock();
@@ -1212,7 +1212,7 @@ public class IgfsDataManager extends IgfsManager {
                     dataCachePrj.putx(key, data);
                 }
                 catch (IgniteCheckedException e) {
-                    U.warn(log, "Failed to put GGFS data block into cache [key=" + key + ", err=" + e + ']');
+                    U.warn(log, "Failed to put IGFS data block into cache [key=" + key + ", err=" + e + ']');
                 }
                 finally {
                     if (maxPendingPuts > 0) {
@@ -1259,7 +1259,7 @@ public class IgfsDataManager extends IgfsManager {
                 // Additional size check.
                 if (dataCachePrj.igfsDataSpaceUsed() >= dataCachePrj.igfsDataSpaceMax())
                     return new GridFinishedFuture<Object>(igfsCtx.kernalContext(),
-                        new IgfsOutOfSpaceException("Failed to write data block (GGFS maximum data size " +
+                        new IgfsOutOfSpaceException("Failed to write data block (IGFS maximum data size " +
                             "exceeded) [used=" + dataCachePrj.igfsDataSpaceUsed() +
                             ", allowed=" + dataCachePrj.igfsDataSpaceMax() + ']'));
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 0ae46b9..dbe63a5 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
@@ -37,7 +37,7 @@ import static org.apache.ignite.internal.GridTopic.*;
 import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.*;
 
 /**
- * GGFS worker for removal from the trash directory.
+ * IGFS worker for removal from the trash directory.
  */
 public class IgfsDeleteWorker extends IgfsThread {
     /** Awake frequency, */
@@ -46,7 +46,7 @@ public class IgfsDeleteWorker extends IgfsThread {
     /** How many files/folders to delete at once (i.e in a single transaction). */
     private static final int MAX_DELETE_BATCH = 100;
 
-    /** GGFS context. */
+    /** IGFS context. */
     private final IgfsContext igfsCtx;
 
     /** Metadata manager. */
@@ -79,7 +79,7 @@ public class IgfsDeleteWorker extends IgfsThread {
     /**
      * Constructor.
      *
-     * @param igfsCtx GGFS context.
+     * @param igfsCtx IGFS context.
      */
     IgfsDeleteWorker(IgfsContext igfsCtx) {
         super("igfs-delete-worker%" + igfsCtx.igfs().name() + "%" + igfsCtx.kernalContext().localNodeId() + "%");
@@ -164,7 +164,7 @@ public class IgfsDeleteWorker extends IgfsThread {
                 IgniteUuid fileId = entry.getValue().fileId();
 
                 if (log.isDebugEnabled())
-                    log.debug("Deleting GGFS trash entry [name=" + entry.getKey() + ", fileId=" + fileId + ']');
+                    log.debug("Deleting IGFS trash entry [name=" + entry.getKey() + ", fileId=" + fileId + ']');
 
                 try {
                     if (!cancelled) {
@@ -305,7 +305,7 @@ public class IgfsDeleteWorker extends IgfsThread {
                     fut.get();
                 }
                 catch (IgniteFutureCancelledCheckedException ignore) {
-                    // This future can be cancelled only due to GGFS shutdown.
+                    // This future can be cancelled only due to IGFS shutdown.
                     cancelled = true;
 
                     return;
@@ -337,7 +337,7 @@ public class IgfsDeleteWorker extends IgfsThread {
                 igfsCtx.send(node, topic, msg, GridIoPolicy.SYSTEM_POOL);
             }
             catch (IgniteCheckedException e) {
-                U.warn(log, "Failed to send GGFS delete message to node [nodeId=" + node.id() +
+                U.warn(log, "Failed to send IGFS delete message to node [nodeId=" + node.id() +
                     ", msg=" + msg + ", err=" + e.getMessage() + ']');
             }
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDirectoryNotEmptyException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDirectoryNotEmptyException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDirectoryNotEmptyException.java
index 6f63f43..48b9b39 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDirectoryNotEmptyException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDirectoryNotEmptyException.java
@@ -34,7 +34,7 @@ public class IgfsDirectoryNotEmptyException extends IgfsException {
     }
 
     /**
-     * Creates an instance of GGFS exception caused by nested exception.
+     * Creates an instance of IGFS exception caused by nested exception.
      *
      * @param cause Exception cause.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEx.java
index c190d7f..e067e78 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEx.java
@@ -30,12 +30,12 @@ import java.net.*;
  */
 public interface IgfsEx extends IgniteFs {
     /**
-     * Stops GGFS cleaning all used resources.
+     * Stops IGFS cleaning all used resources.
      */
     public void stop();
 
     /**
-     * @return GGFS context.
+     * @return IGFS context.
      */
     public IgfsContext context();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileWorker.java
index f1afe3d..67ade2f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileWorker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileWorker.java
@@ -21,7 +21,7 @@ import java.util.concurrent.*;
 import java.util.concurrent.locks.*;
 
 /**
- * GGFS file worker for DUAL modes.
+ * IGFS file worker for DUAL modes.
  */
 public class IgfsFileWorker extends IgfsThread {
     /** Time during which thread remains alive since it's last batch is finished. */
@@ -43,7 +43,7 @@ public class IgfsFileWorker extends IgfsThread {
     private volatile boolean cancelled;
 
     /**
-     * Creates {@code GGFS} file worker.
+     * Creates {@code IGFS} file worker.
      *
      * @param name Worker name.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileWorkerTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileWorkerTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileWorkerTask.java
index d2b4368..ba788b4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileWorkerTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileWorkerTask.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.igfs;
 import org.apache.ignite.*;
 
 /**
- * Generic GGFS worker task which could potentially throw an exception.
+ * Generic IGFS worker task which could potentially throw an exception.
  */
 public interface IgfsFileWorkerTask {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 8f17f7f..61949d7 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
@@ -43,7 +43,7 @@ import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
 import static org.apache.ignite.internal.processors.igfs.IgfsFileAffinityRange.*;
 
 /**
- * GGFS fragmentizer manager.
+ * IGFS fragmentizer manager.
  */
 public class IgfsFragmentizerManager extends IgfsManager {
     /** Message offer wait interval. */
@@ -208,7 +208,7 @@ public class IgfsFragmentizerManager extends IgfsManager {
 
                 if (locNode.order() == minNodeOrder) {
                     if (log.isDebugEnabled())
-                        log.debug("Detected local node to be the eldest GGFS node in topology, starting fragmentizer " +
+                        log.debug("Detected local node to be the eldest IGFS node in topology, starting fragmentizer " +
                             "coordinator thread [discoEvt=" + discoEvt + ", locNode=" + locNode + ']');
 
                     synchronized (this) {
@@ -797,11 +797,11 @@ public class IgfsFragmentizerManager extends IgfsManager {
             catch (IgniteCheckedException e) {
                 if (e.hasCause(ClusterTopologyCheckedException.class)) {
                     if (log.isDebugEnabled())
-                        log.debug("Failed to send sync response to GGFS fragmentizer coordinator " +
+                        log.debug("Failed to send sync response to IGFS fragmentizer coordinator " +
                             "(originating node left the grid): " + nodeId);
                 }
                 else
-                    U.error(log, "Failed to send sync response to GGFS fragmentizer coordinator: " + nodeId, e);
+                    U.error(log, "Failed to send sync response to IGFS fragmentizer coordinator: " + nodeId, e);
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java
index 6c7f93b..aaf7c2f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java
@@ -28,7 +28,7 @@ import java.nio.*;
 import java.util.*;
 
 /**
- * Fragmentizer request. Sent from coordinator to other GGFS nodes when colocated part of file
+ * Fragmentizer request. Sent from coordinator to other IGFS nodes when colocated part of file
  * should be fragmented.
  */
 public class IgfsFragmentizerRequest extends IgfsCommunicationMessage {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 929aac0..61efe32 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
@@ -28,7 +28,7 @@ public class IgfsHandshakeResponse implements Externalizable {
     /** */
     private static final long serialVersionUID = 0L;
 
-    /** GGFS name. */
+    /** IGFS name. */
     private String igfsName;
 
     /** SECONDARY paths. */
@@ -63,7 +63,7 @@ public class IgfsHandshakeResponse implements Externalizable {
     }
 
     /**
-     * @return GGFS name.
+     * @return IGFS name.
      */
     public String igfsName() {
         return igfsName;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 84ab0ba..8378619 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
@@ -21,7 +21,7 @@ import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 
 /**
- * GGFS utility processor adapter.
+ * IGFS utility processor adapter.
  */
 public interface IgfsHelper {
     /**
@@ -32,7 +32,7 @@ public interface IgfsHelper {
     public abstract void preProcessCacheConfiguration(CacheConfiguration cfg);
 
     /**
-     * Validate cache configuration for GGFS.
+     * Validate cache configuration for IGFS.
      *
      * @param cfg Cache configuration.
      * @throws IgniteCheckedException If validation failed.
@@ -43,7 +43,7 @@ public interface IgfsHelper {
      * Check whether object is of type {@code GridGgfsBlockKey}
      *
      * @param key Key.
-     * @return {@code True} if GGFS block key.
+     * @return {@code True} if IGFS block key.
      */
     public abstract boolean isIgfsBlockKey(Object key);
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 17210b0..f068aa7 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
@@ -23,7 +23,7 @@ import org.apache.ignite.cache.eviction.igfs.*;
 import org.apache.ignite.configuration.*;
 
 /**
- * GGFS utils processor.
+ * IGFS utils processor.
  */
 public class IgfsHelperImpl implements IgfsHelper {
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 fb54932..9f92850 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
@@ -52,7 +52,7 @@ import static org.apache.ignite.internal.GridTopic.*;
 import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.*;
 
 /**
- * Cache-based GGFS implementation.
+ * Cache-based IGFS implementation.
  */
 public final class IgfsImpl implements IgfsEx {
     /** Default permissions for file system entry. */
@@ -119,7 +119,7 @@ public final class IgfsImpl implements IgfsEx {
     private CacheIgfsPerBlockLruEvictionPolicy evictPlc;
 
     /**
-     * Creates GGFS instance with given context.
+     * Creates IGFS instance with given context.
      *
      * @param igfsCtx Context.
      * @throws IgniteCheckedException In case of error.
@@ -136,7 +136,7 @@ public final class IgfsImpl implements IgfsEx {
         data = igfsCtx.data();
         secondaryFs = cfg.getSecondaryFileSystem();
 
-        /* Default GGFS mode. */
+        /* Default IGFS mode. */
         IgfsMode dfltMode;
 
         if (secondaryFs == null) {
@@ -193,7 +193,7 @@ public final class IgfsImpl implements IgfsEx {
         secondaryPaths = new IgfsPaths(secondaryFs == null ? null : secondaryFs.properties(), dfltMode,
             modeRslvr.modesOrdered());
 
-        // Check whether GGFS LRU eviction policy is set on data cache.
+        // Check whether IGFS LRU eviction policy is set on data cache.
         String dataCacheName = igfsCtx.configuration().getDataCacheName();
 
         for (CacheConfiguration cacheCfg : igfsCtx.kernalContext().config().getCacheConfiguration()) {
@@ -307,7 +307,7 @@ public final class IgfsImpl implements IgfsEx {
             }
         }
         else
-            throw new IgniteCheckedException("Cannot create new output stream to the secondary file system because GGFS is " +
+            throw new IgniteCheckedException("Cannot create new output stream to the secondary file system because IGFS is " +
                 "stopping: " + path);
     }
 
@@ -479,7 +479,7 @@ public final class IgfsImpl implements IgfsEx {
             IgfsMode mode = modeRslvr.resolveMode(path);
 
             if (mode == PROXY)
-                throw new IgniteException("PROXY mode cannot be used in GGFS directly: " + path);
+                throw new IgniteException("PROXY mode cannot be used in IGFS directly: " + path);
 
             boolean res = false;
 
@@ -521,7 +521,7 @@ public final class IgfsImpl implements IgfsEx {
                 IgfsMode mode = modeRslvr.resolveMode(path);
 
                 if (mode == PROXY)
-                    throw new IgniteException("PROXY mode cannot be used in GGFS directly: " + path);
+                    throw new IgniteException("PROXY mode cannot be used in IGFS directly: " + path);
 
                 IgfsFileInfo info = resolveFileInfo(path, mode);
 
@@ -586,7 +586,7 @@ public final class IgfsImpl implements IgfsEx {
                 IgfsMode mode = modeRslvr.resolveMode(path);
 
                 if (mode == PROXY)
-                    throw new IgniteException("PROXY mode cannot be used in GGFS directly: " + path);
+                    throw new IgniteException("PROXY mode cannot be used in IGFS directly: " + path);
                 else if (mode != PRIMARY) {
                     assert mode == DUAL_SYNC || mode == DUAL_ASYNC;
 
@@ -645,7 +645,7 @@ public final class IgfsImpl implements IgfsEx {
                 Set<IgfsMode> childrenModes = modeRslvr.resolveChildrenModes(src);
 
                 if (mode == PROXY)
-                    throw new IgniteException("PROXY mode cannot be used in GGFS directly: " + src);
+                    throw new IgniteException("PROXY mode cannot be used in IGFS directly: " + src);
 
                 if (src.equals(dest))
                     return; // Rename to itself is a no-op.
@@ -756,7 +756,7 @@ public final class IgfsImpl implements IgfsEx {
                 Set<IgfsMode> childrenModes = modeRslvr.resolveChildrenModes(path);
 
                 if (mode == PROXY)
-                    throw new IgniteException("PROXY mode cannot be used in GGFS directly: " + path);
+                    throw new IgniteException("PROXY mode cannot be used in IGFS directly: " + path);
 
                 boolean res = false;
 
@@ -862,7 +862,7 @@ public final class IgfsImpl implements IgfsEx {
                 IgfsMode mode = modeRslvr.resolveMode(path);
 
                 if (mode == PROXY)
-                    throw new IgniteException("PROXY mode cannot be used in GGFS directly: " + path);
+                    throw new IgniteException("PROXY mode cannot be used in IGFS directly: " + path);
                 else if (mode != PRIMARY) {
                     assert mode == DUAL_SYNC || mode == DUAL_ASYNC;
 
@@ -949,7 +949,7 @@ public final class IgfsImpl implements IgfsEx {
                 IgfsMode mode = modeRslvr.resolveMode(path);
 
                 if (mode == PROXY)
-                    throw new IgniteException("PROXY mode cannot be used in GGFS directly: " + path);
+                    throw new IgniteException("PROXY mode cannot be used in IGFS directly: " + path);
 
                 Set<IgfsMode> childrenModes = modeRslvr.resolveChildrenModes(path);
 
@@ -1003,7 +1003,7 @@ public final class IgfsImpl implements IgfsEx {
                 IgfsMode mode = modeRslvr.resolveMode(path);
 
                 if (mode == PROXY)
-                    throw new IgniteException("PROXY mode cannot be used in GGFS directly: " + path);
+                    throw new IgniteException("PROXY mode cannot be used in IGFS directly: " + path);
 
                 Set<IgfsMode> childrenModes = modeRslvr.resolveChildrenModes(path);
 
@@ -1098,7 +1098,7 @@ public final class IgfsImpl implements IgfsEx {
                 IgfsMode mode = modeRslvr.resolveMode(path);
 
                 if (mode == PROXY)
-                    throw new IgniteException("PROXY mode cannot be used in GGFS directly: " + path);
+                    throw new IgniteException("PROXY mode cannot be used in IGFS directly: " + path);
                 else if (mode != PRIMARY) {
                     assert mode == DUAL_SYNC || mode == DUAL_ASYNC;
 
@@ -1196,7 +1196,7 @@ public final class IgfsImpl implements IgfsEx {
                 IgfsFileWorkerBatch batch = null;
 
                 if (mode == PROXY)
-                    throw new IgniteException("PROXY mode cannot be used in GGFS directly: " + path);
+                    throw new IgniteException("PROXY mode cannot be used in IGFS directly: " + path);
                 else if (mode != PRIMARY) {
                     assert mode == DUAL_SYNC || mode == DUAL_ASYNC;
 
@@ -1308,7 +1308,7 @@ public final class IgfsImpl implements IgfsEx {
                 IgfsFileWorkerBatch batch = null;
 
                 if (mode == PROXY)
-                    throw new IgniteException("PROXY mode cannot be used in GGFS directly: " + path);
+                    throw new IgniteException("PROXY mode cannot be used in IGFS directly: " + path);
                 else if (mode != PRIMARY) {
                     assert mode == DUAL_SYNC || mode == DUAL_ASYNC;
 
@@ -1441,7 +1441,7 @@ public final class IgfsImpl implements IgfsEx {
                 IgfsMode mode = modeRslvr.resolveMode(path);
 
                 if (mode == PROXY)
-                    throw new IgniteException("PROXY mode cannot be used in GGFS directly: " + path);
+                    throw new IgniteException("PROXY mode cannot be used in IGFS directly: " + path);
 
                 // Check memory first.
                 IgniteUuid fileId = meta.fileId(path);
@@ -1710,10 +1710,10 @@ public final class IgfsImpl implements IgfsEx {
     }
 
     /**
-     * Check whether GGFS with the same name exists among provided attributes.
+     * Check whether IGFS with the same name exists among provided attributes.
      *
      * @param attrs Attributes.
-     * @return {@code True} in case GGFS with the same name exists among provided attributes
+     * @return {@code True} in case IGFS with the same name exists among provided attributes
      */
     private boolean sameIgfs(IgfsAttributes[] attrs) {
         if (attrs != null) {
@@ -1773,7 +1773,7 @@ public final class IgfsImpl implements IgfsEx {
     }
 
     /**
-     * Executes GGFS task asynchronously.
+     * Executes IGFS task asynchronously.
      *
      * @param task Task to execute.
      * @param rslvr Optional resolver to control split boundaries.
@@ -1787,7 +1787,7 @@ public final class IgfsImpl implements IgfsEx {
     }
 
     /**
-     * Executes GGFS task with overridden maximum range length (see
+     * Executes IGFS task with overridden maximum range length (see
      * {@link org.apache.ignite.configuration.IgfsConfiguration#getMaximumTaskRangeLength()} for more information).
      *
      * @param task Task to execute.
@@ -1796,7 +1796,7 @@ public final class IgfsImpl implements IgfsEx {
      * @param skipNonExistentFiles Whether to skip non existent files. If set to {@code true} non-existent files will
      *     be ignored. Otherwise an exception will be thrown.
      * @param maxRangeLen Optional maximum range length. If {@code 0}, then by default all consecutive
-     *      GGFS blocks will be included.
+     *      IGFS blocks will be included.
      * @param arg Optional task argument.
      * @return Execution future.
      */
@@ -1807,7 +1807,7 @@ public final class IgfsImpl implements IgfsEx {
     }
 
     /**
-     * Executes GGFS task asynchronously.
+     * Executes IGFS task asynchronously.
      *
      * @param taskCls Task class to execute.
      * @param rslvr Optional resolver to control split boundaries.
@@ -1821,7 +1821,7 @@ public final class IgfsImpl implements IgfsEx {
     }
 
     /**
-     * Executes GGFS task asynchronously with overridden maximum range length (see
+     * Executes IGFS task asynchronously with overridden maximum range length (see
      * {@link org.apache.ignite.configuration.IgfsConfiguration#getMaximumTaskRangeLength()} for more information).
      *
      * @param taskCls Task class to execute.
@@ -1977,7 +1977,7 @@ public final class IgfsImpl implements IgfsEx {
     }
 
     /**
-     * GGFS output stream extension that fires events.
+     * IGFS output stream extension that fires events.
      */
     private class IgfsEventAwareOutputStream extends IgfsOutputStreamImpl {
         /** Close guard. */
@@ -1990,7 +1990,7 @@ public final class IgfsImpl implements IgfsEx {
          * @param fileInfo File info.
          * @param parentId Parent ID.
          * @param bufSize The size of the buffer to be used.
-         * @param mode GGFS mode.
+         * @param mode IGFS mode.
          * @param batch Optional secondary file system batch.
          * @throws IgniteCheckedException In case of error.
          */
@@ -2017,7 +2017,7 @@ public final class IgfsImpl implements IgfsEx {
     }
 
     /**
-     * GGFS input stream extension that fires events.
+     * IGFS input stream extension that fires events.
      */
     private class IgfsEventAwareInputStream extends IgfsInputStreamImpl {
         /** Close guard. */
@@ -2026,7 +2026,7 @@ public final class IgfsImpl implements IgfsEx {
         /**
          * Constructor.
          *
-         * @param ggfsCtx GGFS context.
+         * @param ggfsCtx IGFS context.
          * @param path Path to stored file.
          * @param fileInfo File info.
          * @param prefetchBlocks Prefetch blocks.
@@ -2064,11 +2064,11 @@ public final class IgfsImpl implements IgfsEx {
         /** */
         private static final long serialVersionUID = 0L;
 
-        /** GGFS name. */
+        /** IGFS name. */
         private String igfsName;
 
         /**
-         * @param igfsName GGFS name.
+         * @param igfsName IGFS name.
          */
         private IgfsGlobalSpaceTask(@Nullable String igfsName) {
             this.igfsName = igfsName;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamDescriptor.java
index e64ed46..7a98fb9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamDescriptor.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.igfs;
 import java.io.*;
 
 /**
- * GGFS input stream descriptor - includes stream id and length.
+ * IGFS input stream descriptor - includes stream id and length.
  */
 public class IgfsInputStreamDescriptor implements Externalizable {
     /** */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
index e06d41e..7939b3b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
@@ -101,13 +101,13 @@ public class IgfsInputStreamImpl extends IgfsInputStreamAdapter {
     /**
      * Constructs file output stream.
      *
-     * @param ggfsCtx GGFS context.
+     * @param ggfsCtx IGFS context.
      * @param path Path to stored file.
      * @param fileInfo File info to write binary data to.
      * @param prefetchBlocks Number of blocks to prefetch.
      * @param seqReadsBeforePrefetch Amount of sequential reads before prefetch is triggered.
      * @param secReader Optional secondary file system reader.
-     * @param metrics Local GGFS metrics.
+     * @param metrics Local IGFS metrics.
      */
     IgfsInputStreamImpl(IgfsContext ggfsCtx, IgfsPath path, IgfsFileInfo fileInfo, int prefetchBlocks,
         int seqReadsBeforePrefetch, @Nullable IgfsReader secReader, IgfsLocalMetrics metrics) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 cfafa2a..da0c608 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
@@ -34,7 +34,7 @@ import java.util.*;
 import java.util.concurrent.atomic.*;
 
 /**
- * GGFS IPC handler.
+ * IGFS IPC handler.
  */
 class IgfsIpcHandler implements IgfsServerHandler {
     /** For test purposes only. */
@@ -60,7 +60,7 @@ class IgfsIpcHandler implements IgfsServerHandler {
     private volatile boolean stopping;
 
     /**
-     * Constructs GGFS IPC handler.
+     * Constructs IGFS IPC handler.
      *
      * @param igfsCtx Context.
      */
@@ -143,7 +143,7 @@ class IgfsIpcHandler implements IgfsServerHandler {
     }
 
     /**
-     * Execute GGFS command.
+     * Execute IGFS command.
      *
      * @param ses Client connection session.
      * @param cmd Command to execute.
@@ -201,7 +201,7 @@ class IgfsIpcHandler implements IgfsServerHandler {
                 "[expected=" + req.gridName() + ", actual=" + ctx.gridName() + ']');
 
         if (!F.eq(igfs.name(), req.igfsName()))
-            throw new IgniteCheckedException("Failed to perform handshake because actual GGFS name differs from expected " +
+            throw new IgniteCheckedException("Failed to perform handshake because actual IGFS name differs from expected " +
                 "[expected=" + req.igfsName() + ", actual=" + igfs.name() + ']');
 
         IgfsControlResponse res = new IgfsControlResponse();
@@ -320,7 +320,7 @@ class IgfsIpcHandler implements IgfsServerHandler {
                     long streamId = registerResource(ses, ggfsIn);
 
                     if (log.isDebugEnabled())
-                        log.debug("Opened GGFS input stream for file read [igfsName=" + igfs.name() + ", path=" +
+                        log.debug("Opened IGFS input stream for file read [igfsName=" + igfs.name() + ", path=" +
                             req.path() + ", streamId=" + streamId + ", ses=" + ses + ']');
 
                     IgfsFileInfo info = new IgfsFileInfo(ggfsIn.fileInfo(), null,
@@ -343,7 +343,7 @@ class IgfsIpcHandler implements IgfsServerHandler {
                     ));
 
                     if (log.isDebugEnabled())
-                        log.debug("Opened GGFS output stream for file create [igfsName=" + igfs.name() + ", path=" +
+                        log.debug("Opened IGFS output stream for file create [igfsName=" + igfs.name() + ", path=" +
                             req.path() + ", streamId=" + streamId + ", ses=" + ses + ']');
 
                     res.response(streamId);
@@ -360,7 +360,7 @@ class IgfsIpcHandler implements IgfsServerHandler {
                     ));
 
                     if (log.isDebugEnabled())
-                        log.debug("Opened GGFS output stream for file append [igfsName=" + igfs.name() + ", path=" +
+                        log.debug("Opened IGFS output stream for file append [igfsName=" + igfs.name() + ", path=" +
                             req.path() + ", streamId=" + streamId + ", ses=" + ses + ']');
 
                     res.response(streamId);
@@ -434,7 +434,7 @@ class IgfsIpcHandler implements IgfsServerHandler {
                     ", res=" + res + ']';
 
                 if (log.isDebugEnabled())
-                    log.debug("Closed GGFS stream [igfsName=" + igfs.name() + ", streamId=" + rsrcId +
+                    log.debug("Closed IGFS stream [igfsName=" + igfs.name() + ", streamId=" + rsrcId +
                         ", ses=" + ses + ']');
 
                 resp.response(true);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 14fb138..f6b17bf 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
@@ -27,19 +27,19 @@ import org.apache.ignite.resources.*;
 import java.io.*;
 
 /**
- * GGFS job implementation.
+ * IGFS job implementation.
  */
 public class IgfsJobImpl implements ComputeJob, GridInternalWrapper<IgfsJob> {
     /** */
     private static final long serialVersionUID = 0L;
 
-    /** GGFS job. */
+    /** IGFS job. */
     private IgfsJob job;
 
-    /** GGFS name. */
+    /** IGFS name. */
     private String igfsName;
 
-    /** GGFS path. */
+    /** IGFS path. */
     private IgfsPath path;
 
     /** Start. */
@@ -60,12 +60,12 @@ public class IgfsJobImpl implements ComputeJob, GridInternalWrapper<IgfsJob> {
     private IgniteLogger log;
 
     /**
-     * @param job GGFS job.
-     * @param igfsName GGFS name.
+     * @param job IGFS job.
+     * @param igfsName IGFS name.
      * @param path Split path.
      * @param start Split start offset.
      * @param len Split length.
-     * @param rslvr GGFS split resolver.
+     * @param rslvr IGFS split resolver.
      */
     public IgfsJobImpl(IgfsJob job, String igfsName, IgfsPath path, long start, long len,
         IgfsRecordResolver rslvr) {
@@ -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 [igfsName=" + igfsName +
+            throw new IgniteException("Failed to execute IGFS job for file split [igfsName=" + igfsName +
                 ", path=" + path + ", start=" + start + ", len=" + len + ']', e);
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsLocalMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsLocalMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsLocalMetrics.java
index 74f793d..fda1ef9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsLocalMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsLocalMetrics.java
@@ -22,7 +22,7 @@ import org.apache.ignite.lang.*;
 import org.jdk8.backport.*;
 
 /**
- * Value object holding all local GGFS metrics which cannot be determined using file system traversal.
+ * Value object holding all local IGFS metrics which cannot be determined using file system traversal.
  */
 public class IgfsLocalMetrics {
     /** Block reads. First value - total reads, second value - reads delegated to the secondary file system. */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsManager.java
index 3fc1d0a..d2007b7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsManager.java
@@ -22,10 +22,10 @@ import org.apache.ignite.*;
 import java.util.concurrent.atomic.*;
 
 /**
- * Abstract class for GGFS managers.
+ * Abstract class for IGFS managers.
  */
 public abstract class IgfsManager {
-    /** GGFS context. */
+    /** IGFS context. */
     protected IgfsContext igfsCtx;
 
     /** Logger. */
@@ -35,9 +35,9 @@ public abstract class IgfsManager {
     private AtomicBoolean starting = new AtomicBoolean();
 
     /**
-     * Called when GGFS processor is started.
+     * Called when IGFS processor is started.
      *
-     * @param ggfsCtx GGFS context.
+     * @param ggfsCtx IGFS context.
      */
     public void start(IgfsContext ggfsCtx) throws IgniteCheckedException {
         if (!starting.compareAndSet(false, true))

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 d06ff4f..caa727e 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
@@ -50,7 +50,7 @@ import static org.apache.ignite.transactions.IgniteTxIsolation.*;
  */
 @SuppressWarnings("all")
 public class IgfsMetaManager extends IgfsManager {
-    /** GGFS configuration. */
+    /** IGFS configuration. */
     private IgfsConfiguration cfg;
 
     /** Metadata cache. */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsAdapter.java
index f37688a..41e296e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsAdapter.java
@@ -23,7 +23,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
 import java.io.*;
 
 /**
- * GGFS metrics adapter.
+ * IGFS metrics adapter.
  */
 public class IgfsMetricsAdapter implements IgfsMetrics, Externalizable {
     /** */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsModeResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsModeResolver.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsModeResolver.java
index 94b5627..fd0c485 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsModeResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsModeResolver.java
@@ -44,7 +44,7 @@ public class IgfsModeResolver {
     private Map<IgfsPath, Set<IgfsMode>> childrenModesCache;
 
     /**
-     * @param dfltMode Default GGFS mode.
+     * @param dfltMode Default IGFS mode.
      * @param modes List of configured modes.
      */
     public IgfsModeResolver(IgfsMode dfltMode, @Nullable List<T2<IgfsPath, IgfsMode>> modes) {
@@ -71,10 +71,10 @@ public class IgfsModeResolver {
     }
 
     /**
-     * Resolves GGFS mode for the given path.
+     * Resolves IGFS mode for the given path.
      *
-     * @param path GGFS path.
-     * @return GGFS mode.
+     * @param path IGFS path.
+     * @return IGFS mode.
      */
     public IgfsMode resolveMode(IgfsPath path) {
         assert path != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 f802c9d..1bc463d 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
@@ -44,7 +44,7 @@ public class IgfsNoopProcessor extends IgfsProcessorAdapter {
     /** {@inheritDoc} */
     @Override public void printMemoryStats() {
         X.println(">>>");
-        X.println(">>> GGFS processor memory stats [grid=" + ctx.gridName() + ']');
+        X.println(">>> IGFS processor memory stats [grid=" + ctx.gridName() + ']');
         X.println(">>>   ggfsCacheSize: " + 0);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
index 4436191..0f9f5a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
@@ -39,7 +39,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStreamAdapter {
     /** Maximum number of blocks in buffer. */
     private static final int MAX_BLOCKS_CNT = 16;
 
-    /** GGFS context. */
+    /** IGFS context. */
     private IgfsContext ggfsCtx;
 
     /** Meta info manager. */
@@ -71,7 +71,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStreamAdapter {
     /** Write completion future. */
     private final IgniteInternalFuture<Boolean> writeCompletionFut;
 
-    /** GGFS mode. */
+    /** IGFS mode. */
     private final IgfsMode mode;
 
     /** File worker batch. */
@@ -80,7 +80,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStreamAdapter {
     /** Ensures that onClose)_ routine is called no more than once. */
     private final AtomicBoolean onCloseGuard = new AtomicBoolean();
 
-    /** Local GGFS metrics. */
+    /** Local IGFS metrics. */
     private final IgfsLocalMetrics metrics;
 
     /** Affinity written by this output stream. */
@@ -89,11 +89,11 @@ class IgfsOutputStreamImpl extends IgfsOutputStreamAdapter {
     /**
      * Constructs file output stream.
      *
-     * @param ggfsCtx GGFS context.
+     * @param ggfsCtx IGFS context.
      * @param path Path to stored file.
      * @param fileInfo File info to write binary data to.
      * @param bufSize The size of the buffer to be used.
-     * @param mode Grid GGFS mode.
+     * @param mode Grid IGFS mode.
      * @param batch Optional secondary file system batch.
      * @param metrics Local GGFs metrics.
      * @throws IgniteCheckedException If stream creation failed.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPaths.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPaths.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPaths.java
index c5f8d97..d1dd576 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPaths.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPaths.java
@@ -35,7 +35,7 @@ public class IgfsPaths implements Externalizable {
     /** Additional secondary file system properties. */
     private Map<String, String> props;
 
-    /** Default GGFS mode. */
+    /** Default IGFS mode. */
     private IgfsMode dfltMode;
 
     /** Path modes. */
@@ -52,7 +52,7 @@ public class IgfsPaths implements Externalizable {
      * Constructor.
      *
      * @param props Additional secondary file system properties.
-     * @param dfltMode Default GGFS mode.
+     * @param dfltMode Default IGFS mode.
      * @param pathModes Path modes.
      */
     public IgfsPaths(Map<String, String> props, IgfsMode dfltMode, @Nullable List<T2<IgfsPath,
@@ -70,7 +70,7 @@ public class IgfsPaths implements Externalizable {
     }
 
     /**
-     * @return Default GGFS mode.
+     * @return Default IGFS mode.
      */
     public IgfsMode defaultMode() {
         return dfltMode;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 91c8bf1..3af4d57 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
@@ -47,10 +47,10 @@ import static org.apache.ignite.internal.IgniteNodeAttributes.*;
  * Fully operational Ignite file system processor.
  */
 public class IgfsProcessor extends IgfsProcessorAdapter {
-    /** Null GGFS name. */
+    /** Null IGFS name. */
     private static final String NULL_NAME = UUID.randomUUID().toString();
 
-    /** Converts context to GGFS. */
+    /** Converts context to IGFS. */
     private static final IgniteClosure<IgfsContext,IgniteFs> CTX_TO_IGFS = new C1<IgfsContext, IgniteFs>() {
         @Override public IgniteFs apply(IgfsContext ggfsCtx) {
             return ggfsCtx.igfs();
@@ -79,7 +79,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
 
         validateLocalGgfsConfigurations(cfgs);
 
-        // Start GGFS instances.
+        // Start IGFS instances.
         for (IgfsConfiguration cfg : cfgs) {
             IgfsContext ggfsCtx = new IgfsContext(
                 ctx,
@@ -97,7 +97,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
         }
 
         if (log.isDebugEnabled())
-            log.debug("GGFS processor started.");
+            log.debug("IGFS processor started.");
     }
 
     /** {@inheritDoc} */
@@ -117,7 +117,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
 
     /** {@inheritDoc} */
     @Override public void stop(boolean cancel) {
-        // Stop GGFS instances.
+        // Stop IGFS instances.
         for (IgfsContext ggfsCtx : igfsCache.values()) {
             if (log.isDebugEnabled())
                 log.debug("Stopping igfs: " + ggfsCtx.configuration().getName());
@@ -136,7 +136,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
         igfsCache.clear();
 
         if (log.isDebugEnabled())
-            log.debug("GGFS processor stopped.");
+            log.debug("IGFS processor stopped.");
     }
 
     /** {@inheritDoc} */
@@ -155,13 +155,13 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
         }
 
         if (log.isDebugEnabled())
-            log.debug("Finished executing GGFS processor onKernalStop() callback.");
+            log.debug("Finished executing IGFS processor onKernalStop() callback.");
     }
 
     /** {@inheritDoc} */
     @Override public void printMemoryStats() {
         X.println(">>>");
-        X.println(">>> GGFS processor memory stats [grid=" + ctx.gridName() + ']');
+        X.println(">>> IGFS processor memory stats [grid=" + ctx.gridName() + ']');
         X.println(">>>   ggfsCacheSize: " + igfsCache.size());
     }
 
@@ -198,9 +198,9 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
 
         IgniteConfiguration gridCfg = ctx.config();
 
-        // Node doesn't have GGFS if it:
+        // Node doesn't have IGFS if it:
         // is daemon;
-        // doesn't have configured GGFS;
+        // doesn't have configured IGFS;
         // doesn't have configured caches.
         if (gridCfg.isDaemon() || F.isEmpty(gridCfg.getIgfsConfiguration()) ||
             F.isEmpty(gridCfg.getCacheConfiguration()))
@@ -222,12 +222,12 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
             CacheConfiguration cacheCfg = cacheCfgs.get(ggfsCfg.getDataCacheName());
 
             if (cacheCfg == null)
-                continue; // No cache for the given GGFS configuration.
+                continue; // No cache for the given IGFS configuration.
 
             CacheAffinityKeyMapper affMapper = cacheCfg.getAffinityMapper();
 
             if (!(affMapper instanceof IgfsGroupDataBlocksKeyMapper))
-                // Do not create GGFS attributes for such a node nor throw error about invalid configuration.
+                // Do not create IGFS attributes for such a node nor throw error about invalid configuration.
                 // Configuration will be validated later, while starting GridGgfsProcessor.
                 continue;
 
@@ -254,9 +254,9 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
     }
 
     /**
-     * Validates local GGFS configurations. Compares attributes only for GGFSes with same name.
-     * @param cfgs GGFS configurations
-     * @throws IgniteCheckedException If any of GGFS configurations is invalid.
+     * Validates local IGFS configurations. Compares attributes only for IGFSes with same name.
+     * @param cfgs IGFS configurations
+     * @throws IgniteCheckedException If any of IGFS configurations is invalid.
      */
     private void validateLocalGgfsConfigurations(IgfsConfiguration[] cfgs) throws IgniteCheckedException {
         Collection<String> cfgNames = new HashSet<>();
@@ -265,30 +265,30 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
             String name = cfg.getName();
 
             if (cfgNames.contains(name))
-                throw new IgniteCheckedException("Duplicate GGFS name found (check configuration and " +
+                throw new IgniteCheckedException("Duplicate IGFS name found (check configuration and " +
                     "assign unique name to each): " + name);
 
             GridCacheAdapter<Object, Object> dataCache = ctx.cache().internalCache(cfg.getDataCacheName());
 
             if (dataCache == null)
-                throw new IgniteCheckedException("Data cache is not configured locally for GGFS: " + cfg);
+                throw new IgniteCheckedException("Data cache is not configured locally for IGFS: " + cfg);
 
             if (dataCache.configuration().isQueryIndexEnabled())
-                throw new IgniteCheckedException("GGFS data cache cannot start with enabled query indexing.");
+                throw new IgniteCheckedException("IGFS data cache cannot start with enabled query indexing.");
 
             GridCache<Object, Object> metaCache = ctx.cache().cache(cfg.getMetaCacheName());
 
             if (metaCache == null)
-                throw new IgniteCheckedException("Metadata cache is not configured locally for GGFS: " + cfg);
+                throw new IgniteCheckedException("Metadata cache is not configured locally for IGFS: " + cfg);
 
             if (metaCache.configuration().isQueryIndexEnabled())
-                throw new IgniteCheckedException("GGFS metadata cache cannot start with enabled query indexing.");
+                throw new IgniteCheckedException("IGFS metadata cache cannot start with enabled query indexing.");
 
             if (F.eq(cfg.getDataCacheName(), cfg.getMetaCacheName()))
                 throw new IgniteCheckedException("Cannot use same cache as both data and meta cache: " + cfg.getName());
 
             if (!(dataCache.configuration().getAffinityMapper() instanceof IgfsGroupDataBlocksKeyMapper))
-                throw new IgniteCheckedException("Invalid GGFS data cache configuration (key affinity mapper class should be " +
+                throw new IgniteCheckedException("Invalid IGFS data cache configuration (key affinity mapper class should be " +
                     IgfsGroupDataBlocksKeyMapper.class.getSimpleName() + "): " + cfg);
 
             long maxSpaceSize = cfg.getMaxSpaceSize();
@@ -300,11 +300,11 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
 
                 if (offHeapSize < 0 && maxSpaceSize > maxHeapSize)
                     // Offheap is disabled.
-                    throw new IgniteCheckedException("Maximum GGFS space size cannot be greater that size of available heap " +
+                    throw new IgniteCheckedException("Maximum IGFS space size cannot be greater that size of available heap " +
                         "memory [maxHeapSize=" + maxHeapSize + ", maxGgfsSpaceSize=" + maxSpaceSize + ']');
                 else if (offHeapSize > 0 && maxSpaceSize > maxHeapSize + offHeapSize)
                     // Offheap is enabled, but limited.
-                    throw new IgniteCheckedException("Maximum GGFS space size cannot be greater than size of available heap " +
+                    throw new IgniteCheckedException("Maximum IGFS space size cannot be greater than size of available heap " +
                         "memory and offheap storage [maxHeapSize=" + maxHeapSize + ", offHeapSize=" + offHeapSize +
                         ", maxGgfsSpaceSize=" + maxSpaceSize + ']');
             }
@@ -313,12 +313,12 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
                 int backups = dataCache.configuration().getBackups();
 
                 if (backups != 0)
-                    throw new IgniteCheckedException("GGFS data cache cannot be used with backups (set backup count " +
+                    throw new IgniteCheckedException("IGFS data cache cannot be used with backups (set backup count " +
                         "to 0 and restart the grid): " + cfg.getDataCacheName());
             }
 
             if (cfg.getMaxSpaceSize() == 0 && dataCache.configuration().getMemoryMode() == OFFHEAP_VALUES)
-                U.warn(log, "GGFS max space size is not specified but data cache values are stored off-heap (max " +
+                U.warn(log, "IGFS max space size is not specified but data cache values are stored off-heap (max " +
                     "space will be limited to 80% of max JVM heap size): " + cfg.getName());
 
             boolean secondary = cfg.getDefaultMode() == PROXY;
@@ -341,7 +341,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
     }
 
     /**
-     * Check GGFS config on remote node.
+     * Check IGFS config on remote node.
      *
      * @param rmtNode Remote node.
      * @throws IgniteCheckedException If check failed.
@@ -357,10 +357,10 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
 
         for (IgfsAttributes rmtAttr : rmtAttrs)
             for (IgfsAttributes locAttr : locAttrs) {
-                // Checking the use of different caches on the different GGFSes.
+                // Checking the use of different caches on the different IGFSes.
                 if (!F.eq(rmtAttr.igfsName(), locAttr.igfsName())) {
                     if (F.eq(rmtAttr.metaCacheName(), locAttr.metaCacheName()))
-                        throw new IgniteCheckedException("Meta cache names should be different for different GGFS instances " +
+                        throw new IgniteCheckedException("Meta cache names should be different for different IGFS instances " +
                             "configuration (fix configuration or set " +
                             "-D" + IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK + "=true system " +
                             "property) [metaCacheName=" + rmtAttr.metaCacheName() +
@@ -370,7 +370,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
                             ", rmtGgfsName=" + rmtAttr.igfsName() + ']');
 
                     if (F.eq(rmtAttr.dataCacheName(), locAttr.dataCacheName()))
-                        throw new IgniteCheckedException("Data cache names should be different for different GGFS instances " +
+                        throw new IgniteCheckedException("Data cache names should be different for different IGFS instances " +
                             "configuration (fix configuration or set " +
                             "-D" + IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK + "=true system " +
                             "property)[dataCacheName=" + rmtAttr.dataCacheName() +
@@ -382,7 +382,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
                     continue;
                 }
 
-                // Compare other attributes only for GGFSes with same name.
+                // Compare other attributes only for IGFSes with same name.
                 checkSame("Data block size", "BlockSize", rmtNode.id(), rmtAttr.blockSize(),
                     locAttr.blockSize(), rmtAttr.igfsName());
 
@@ -409,7 +409,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
     private void checkSame(String name, String propName, UUID rmtNodeId, Object rmtVal, Object locVal, String igfsName)
         throws IgniteCheckedException {
         if (!F.eq(rmtVal, locVal))
-            throw new IgniteCheckedException(name + " should be the same on all nodes in grid for GGFS configuration " +
+            throw new IgniteCheckedException(name + " should be the same on all nodes in grid for IGFS configuration " +
                 "(fix configuration or set " +
                 "-D" + IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK + "=true system " +
                 "property ) [rmtNodeId=" + rmtNodeId +

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 5a33f09..eca525f 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
@@ -42,33 +42,33 @@ public abstract class IgfsProcessorAdapter extends GridProcessorAdapter {
     }
 
     /**
-     * Gets all GGFS instances.
+     * Gets all IGFS instances.
      *
-     * @return Collection of GGFS instances.
+     * @return Collection of IGFS instances.
      */
     public abstract Collection<IgniteFs> igfss();
 
     /**
-     * Gets GGFS instance.
+     * Gets IGFS instance.
      *
-     * @param name (Nullable) GGFS name.
-     * @return GGFS instance.
+     * @param name (Nullable) IGFS name.
+     * @return IGFS instance.
      */
     @Nullable public abstract IgniteFs igfs(@Nullable String name);
 
     /**
-     * Gets server endpoints for particular GGFS.
+     * Gets server endpoints for particular IGFS.
      *
-     * @param name GGFS name.
-     * @return Collection of endpoints or {@code null} in case GGFS is not defined.
+     * @param name IGFS name.
+     * @return Collection of endpoints or {@code null} in case IGFS is not defined.
      */
     public abstract Collection<IpcServerEndpoint> endpoints(@Nullable String name);
 
     /**
-     * Create compute job for the given GGFS job.
+     * Create compute job for the given IGFS job.
      *
-     * @param job GGFS job.
-     * @param ggfsName GGFS name.
+     * @param job IGFS job.
+     * @param ggfsName IGFS name.
      * @param path Path.
      * @param start Start position.
      * @param length Length.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSamplingKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSamplingKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSamplingKey.java
index c91d0d0..439c8ce 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSamplingKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSamplingKey.java
@@ -24,19 +24,19 @@ import org.apache.ignite.internal.util.typedef.internal.*;
 import java.io.*;
 
 /**
- * Internal key used to track if sampling enabled or disabled for particular GGFS instance.
+ * Internal key used to track if sampling enabled or disabled for particular IGFS instance.
  */
 class IgfsSamplingKey implements GridCacheInternal, Externalizable {
     /** */
     private static final long serialVersionUID = 0L;
 
-    /** GGFS name. */
+    /** IGFS name. */
     private String name;
 
     /**
      * Default constructor.
      *
-     * @param name - GGFS name.
+     * @param name - IGFS name.
      */
     IgfsSamplingKey(String name) {
         this.name = name;
@@ -50,7 +50,7 @@ class IgfsSamplingKey implements GridCacheInternal, Externalizable {
     }
 
     /**
-     * @return GGFS name.
+     * @return IGFS name.
      */
     public String name() {
         return name;


Mime
View raw message