ignite-commits mailing list archives

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

Branch: refs/heads/ignite-226
Commit: 453d9ccdff6ac93735042dff07987834a1b47812
Parents: 5443bb3
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Fri Feb 13 15:04:53 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Fri Feb 13 15:04:53 2015 +0300

----------------------------------------------------------------------
 .../processors/igfs/IgfsDataManager.java        |  6 +-
 .../igfs/IgfsFragmentizerManager.java           |  4 +-
 .../internal/processors/igfs/IgfsImpl.java      |  4 +-
 .../internal/processors/igfs/IgfsProcessor.java | 26 +++---
 .../internal/processors/igfs/IgfsServer.java    | 30 +++----
 .../ignite/internal/visor/igfs/VisorIgfs.java   | 14 +--
 .../internal/visor/igfs/VisorIgfsEndpoint.java  | 20 ++---
 .../visor/igfs/VisorIgfsFormatTask.java         |  6 +-
 .../internal/visor/igfs/VisorIgfsProfiler.java  |  2 +-
 .../visor/igfs/VisorIgfsProfilerClearTask.java  |  4 +-
 .../visor/igfs/VisorIgfsProfilerTask.java       | 12 +--
 .../visor/igfs/VisorIgfsResetMetricsTask.java   |  8 +-
 .../visor/node/VisorNodeDataCollectorJob.java   | 18 ++--
 .../node/VisorNodeDataCollectorJobResult.java   |  8 +-
 .../visor/node/VisorNodeDataCollectorTask.java  | 12 +--
 .../node/VisorNodeDataCollectorTaskResult.java  |  6 +-
 ...heIgfsPerBlockLruEvictionPolicySelfTest.java | 90 ++++++++++----------
 .../igfs/IgfsDataManagerSelfTest.java           |  4 +-
 .../processors/igfs/IgfsMetricsSelfTest.java    | 12 +--
 19 files changed, 143 insertions(+), 143 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/453d9ccd/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 cf2719b..aa11708 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
@@ -173,9 +173,9 @@ public class IgfsDataManager extends IgfsManager {
 
         grpBlockSize = igfsCtx.configuration().getBlockSize() * grpSize;
 
-        String ggfsName = igfsCtx.configuration().getName();
+        String igfsName = igfsCtx.configuration().getName();
 
-        topic = F.isEmpty(ggfsName) ? TOPIC_IGFS : TOPIC_IGFS.topic(ggfsName);
+        topic = F.isEmpty(igfsName) ? TOPIC_IGFS : TOPIC_IGFS.topic(igfsName);
 
         igfsCtx.kernalContext().io().addMessageListener(topic, new GridMessageListener() {
             @Override public void onMessage(UUID nodeId, Object msg) {
@@ -221,7 +221,7 @@ public class IgfsDataManager extends IgfsManager {
         maxPendingPuts = igfsCtx.configuration().getDualModeMaxPendingPutsSize();
 
         delWorker = new AsyncDeleteWorker(igfsCtx.kernalContext().gridName(),
-            "igfs-" + ggfsName + "-delete-worker", log);
+            "igfs-" + igfsName + "-delete-worker", log);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/453d9ccd/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 b999ecc..8f17f7f 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
@@ -95,9 +95,9 @@ public class IgfsFragmentizerManager extends IgfsManager {
 
         fragmentizerWorker = new FragmentizerWorker();
 
-        String ggfsName = igfsCtx.configuration().getName();
+        String igfsName = igfsCtx.configuration().getName();
 
-        topic = F.isEmpty(ggfsName) ? TOPIC_IGFS : TOPIC_IGFS.topic(ggfsName);
+        topic = F.isEmpty(igfsName) ? TOPIC_IGFS : TOPIC_IGFS.topic(igfsName);
 
         igfsCtx.kernalContext().io().addMessageListener(topic, fragmentizerWorker);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/453d9ccd/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 a04afa9..fb54932 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
@@ -1717,10 +1717,10 @@ public final class IgfsImpl implements IgfsEx {
      */
     private boolean sameIgfs(IgfsAttributes[] attrs) {
         if (attrs != null) {
-            String ggfsName = name();
+            String igfsName = name();
 
             for (IgfsAttributes attr : attrs) {
-                if (F.eq(ggfsName, attr.igfsName()))
+                if (F.eq(igfsName, attr.igfsName()))
                     return true;
             }
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/453d9ccd/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 5eb8625..a5512f4 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
@@ -58,7 +58,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
     };
 
     /** */
-    private final ConcurrentMap<String, IgfsContext> ggfsCache =
+    private final ConcurrentMap<String, IgfsContext> igfsCache =
         new ConcurrentHashMap8<>();
 
     /**
@@ -93,7 +93,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
             for (IgfsManager mgr : ggfsCtx.managers())
                 mgr.start(ggfsCtx);
 
-            ggfsCache.put(maskName(cfg.getName()), ggfsCtx);
+            igfsCache.put(maskName(cfg.getName()), ggfsCtx);
         }
 
         if (log.isDebugEnabled())
@@ -110,7 +110,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
                 checkGgfsOnRemoteNode(n);
         }
 
-        for (IgfsContext ggfsCtx : ggfsCache.values())
+        for (IgfsContext ggfsCtx : igfsCache.values())
             for (IgfsManager mgr : ggfsCtx.managers())
                 mgr.onKernalStart();
     }
@@ -118,7 +118,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
     /** {@inheritDoc} */
     @Override public void stop(boolean cancel) {
         // Stop GGFS instances.
-        for (IgfsContext ggfsCtx : ggfsCache.values()) {
+        for (IgfsContext ggfsCtx : igfsCache.values()) {
             if (log.isDebugEnabled())
                 log.debug("Stopping igfs: " + ggfsCtx.configuration().getName());
 
@@ -133,7 +133,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
             ggfsCtx.igfs().stop();
         }
 
-        ggfsCache.clear();
+        igfsCache.clear();
 
         if (log.isDebugEnabled())
             log.debug("GGFS processor stopped.");
@@ -141,7 +141,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
 
     /** {@inheritDoc} */
     @Override public void onKernalStop(boolean cancel) {
-        for (IgfsContext ggfsCtx : ggfsCache.values()) {
+        for (IgfsContext ggfsCtx : igfsCache.values()) {
             if (log.isDebugEnabled())
                 log.debug("Stopping igfs: " + ggfsCtx.configuration().getName());
 
@@ -162,27 +162,27 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
     @Override public void printMemoryStats() {
         X.println(">>>");
         X.println(">>> GGFS processor memory stats [grid=" + ctx.gridName() + ']');
-        X.println(">>>   ggfsCacheSize: " + ggfsCache.size());
+        X.println(">>>   ggfsCacheSize: " + igfsCache.size());
     }
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
     @Override public Collection<IgniteFs> igfss() {
-        return F.viewReadOnly(ggfsCache.values(), CTX_TO_GGFS);
+        return F.viewReadOnly(igfsCache.values(), CTX_TO_GGFS);
     }
 
     /** {@inheritDoc} */
     @Override @Nullable public IgniteFs igfs(@Nullable String name) {
-        IgfsContext ggfsCtx = ggfsCache.get(maskName(name));
+        IgfsContext ggfsCtx = igfsCache.get(maskName(name));
 
         return ggfsCtx == null ? null : ggfsCtx.igfs();
     }
 
     /** {@inheritDoc} */
     @Override @Nullable public Collection<IpcServerEndpoint> endpoints(@Nullable String name) {
-        IgfsContext ggfsCtx = ggfsCache.get(maskName(name));
+        IgfsContext igfsCtx = igfsCache.get(maskName(name));
 
-        return ggfsCtx == null ? Collections.<IpcServerEndpoint>emptyList() : ggfsCtx.server().endpoints();
+        return igfsCtx == null ? Collections.<IpcServerEndpoint>emptyList() : igfsCtx.server().endpoints();
     }
 
     /** {@inheritDoc} */
@@ -406,7 +406,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
             }
     }
 
-    private void checkSame(String name, String propName, UUID rmtNodeId, Object rmtVal, Object locVal, String ggfsName)
+    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 " +
@@ -415,6 +415,6 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
                 "property ) [rmtNodeId=" + rmtNodeId +
                 ", rmt" + propName + "=" + rmtVal +
                 ", loc" + propName + "=" + locVal +
-                ", ggfName=" + ggfsName + ']');
+                ", ggfName=" + igfsName + ']');
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/453d9ccd/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 038d084..59a9d71 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
@@ -40,7 +40,7 @@ import static org.apache.ignite.spi.IgnitePortProtocol.*;
  */
 public class IgfsServer {
     /** GGFS context. */
-    private final IgfsContext ggfsCtx;
+    private final IgfsContext igfsCtx;
 
     /** Logger. */
     private final IgniteLogger log;
@@ -68,19 +68,19 @@ public class IgfsServer {
 
     /**
      * Constructs igfs server manager.
-     * @param ggfsCtx GGFS context.
+     * @param igfsCtx GGFS context.
      * @param endpointCfg Endpoint configuration to start.
      * @param mgmt Management flag - if true, server is intended to be started for Visor.
      */
-    public IgfsServer(IgfsContext ggfsCtx, Map<String, String> endpointCfg, boolean mgmt) {
-        assert ggfsCtx != null;
+    public IgfsServer(IgfsContext igfsCtx, Map<String, String> endpointCfg, boolean mgmt) {
+        assert igfsCtx != null;
         assert endpointCfg != null;
 
         this.endpointCfg = endpointCfg;
-        this.ggfsCtx = ggfsCtx;
+        this.igfsCtx = igfsCtx;
         this.mgmt = mgmt;
 
-        log = ggfsCtx.kernalContext().log(IgfsServer.class);
+        log = igfsCtx.kernalContext().log(IgfsServer.class);
 
         marsh = new IgfsMarshaller();
     }
@@ -105,7 +105,7 @@ public class IgfsServer {
 
             if (srvEndpoint0.getHost() == null) {
                 if (mgmt) {
-                    String locHostName = ggfsCtx.kernalContext().config().getLocalHost();
+                    String locHostName = igfsCtx.kernalContext().config().getLocalHost();
 
                     try {
                         srvEndpoint0.setHost(U.resolveLocalHost(locHostName).getHostAddress());
@@ -120,15 +120,15 @@ public class IgfsServer {
             }
         }
 
-        ggfsCtx.kernalContext().resource().injectGeneric(srvEndpoint);
+        igfsCtx.kernalContext().resource().injectGeneric(srvEndpoint);
 
         srvEndpoint.start();
 
         // IpcServerEndpoint.getPort contract states return -1 if there is no port to be registered.
         if (srvEndpoint.getPort() >= 0)
-            ggfsCtx.kernalContext().ports().registerPort(srvEndpoint.getPort(), TCP, srvEndpoint.getClass());
+            igfsCtx.kernalContext().ports().registerPort(srvEndpoint.getPort(), TCP, srvEndpoint.getClass());
 
-        hnd = new IgfsIpcHandler(ggfsCtx);
+        hnd = new IgfsIpcHandler(igfsCtx);
 
         // Start client accept worker.
         acceptWorker = new AcceptWorker();
@@ -174,10 +174,10 @@ public class IgfsServer {
 
         // IpcServerEndpoint.getPort contract states return -1 if there is no port to be registered.
         if (srvEndpoint.getPort() >= 0)
-            ggfsCtx.kernalContext().ports().deregisterPort(srvEndpoint.getPort(), TCP, srvEndpoint.getClass());
+            igfsCtx.kernalContext().ports().deregisterPort(srvEndpoint.getPort(), TCP, srvEndpoint.getClass());
 
         try {
-            ggfsCtx.kernalContext().resource().cleanupGeneric(srvEndpoint);
+            igfsCtx.kernalContext().resource().cleanupGeneric(srvEndpoint);
         }
         catch (IgniteCheckedException e) {
             U.error(log, "Failed to cleanup server endpoint.", e);
@@ -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(), "igfs-client-worker-" + idx, log);
+            super(igfsCtx.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(), "igfs-accept-worker", log);
+            super(igfsCtx.kernalContext().gridName(), "igfs-accept-worker", log);
         }
 
         /** {@inheritDoc} */
@@ -394,7 +394,7 @@ public class IgfsServer {
                     IpcEndpoint client = srvEndpoint.accept();
 
                     if (log.isDebugEnabled())
-                        log.debug("GGFS client connected [igfsName=" + ggfsCtx.kernalContext().gridName() +
+                        log.debug("GGFS client connected [igfsName=" + igfsCtx.kernalContext().gridName() +
                             ", client=" + client + ']');
 
                     ClientWorker worker = new ClientWorker(client, acceptCnt++);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/453d9ccd/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfs.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfs.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfs.java
index aa6e06e..e91fa57 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfs.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfs.java
@@ -63,18 +63,18 @@ public class VisorIgfs implements Serializable {
     }
 
     /**
-     * @param ggfs Source GGFS.
+     * @param igfs Source GGFS.
      * @return Data transfer object for given GGFS.
      * @throws IgniteCheckedException
      */
-    public static VisorIgfs from(IgniteFs ggfs) throws IgniteCheckedException {
-        assert ggfs != null;
+    public static VisorIgfs from(IgniteFs igfs) throws IgniteCheckedException {
+        assert igfs != null;
 
         return new VisorIgfs(
-            ggfs.name(),
-            ggfs.configuration().getDefaultMode(),
-            VisorIgfsMetrics.from(ggfs.metrics()),
-            ggfs.configuration().getSecondaryFileSystem() != null
+            igfs.name(),
+            igfs.configuration().getDefaultMode(),
+            VisorIgfsMetrics.from(igfs.metrics()),
+            igfs.configuration().getSecondaryFileSystem() != null
         );
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/453d9ccd/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsEndpoint.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsEndpoint.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsEndpoint.java
index 557c966..47bfff9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsEndpoint.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsEndpoint.java
@@ -30,7 +30,7 @@ public class VisorIgfsEndpoint implements Serializable{
     private static final long  serialVersionUID = 0L;
 
     /** GGFS name. */
-    private final String ggfsName;
+    private final String igfsName;
 
     /** Grid name. */
     private final String gridName;
@@ -43,13 +43,13 @@ public class VisorIgfsEndpoint implements Serializable{
 
     /**
      * Create GGFS endpoint descriptor with given parameters.
-     * @param ggfsName GGFS name.
+     * @param igfsName GGFS name.
      * @param gridName Grid name.
      * @param hostName Host address / name.
      * @param port Port number.
      */
-    public VisorIgfsEndpoint(@Nullable String ggfsName, String gridName, @Nullable String hostName, int port) {
-        this.ggfsName = ggfsName;
+    public VisorIgfsEndpoint(@Nullable String igfsName, String gridName, @Nullable String hostName, int port) {
+        this.igfsName = igfsName;
         this.gridName = gridName;
         this.hostName = hostName;
         this.port = port;
@@ -58,8 +58,8 @@ public class VisorIgfsEndpoint implements Serializable{
     /**
      * @return GGFS name.
      */
-    @Nullable public String ggfsName() {
-        return ggfsName;
+    @Nullable public String igfsName() {
+        return igfsName;
     }
 
     /**
@@ -89,14 +89,14 @@ public class VisorIgfsEndpoint implements Serializable{
     public String authority() {
         String addr = hostName + ":" + port;
 
-        if (ggfsName == null && gridName == null)
+        if (igfsName == null && gridName == null)
             return addr;
-        else if (ggfsName == null)
+        else if (igfsName == null)
             return gridName + "@" + addr;
         else if (gridName == null)
-            return ggfsName + "@" + addr;
+            return igfsName + "@" + addr;
         else
-            return ggfsName + ":" + gridName + "@" + addr;
+            return igfsName + ":" + gridName + "@" + addr;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/453d9ccd/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsFormatTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsFormatTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsFormatTask.java
index 8c4e39f..2b5a39d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsFormatTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsFormatTask.java
@@ -51,12 +51,12 @@ public class VisorIgfsFormatTask extends VisorOneNodeTask<String, Void> {
         }
 
         /** {@inheritDoc} */
-        @Override protected Void run(String ggfsName) {
+        @Override protected Void run(String igfsName) {
             try {
-                ignite.fileSystem(ggfsName).format();
+                ignite.fileSystem(igfsName).format();
             }
             catch (IllegalArgumentException iae) {
-                throw new IgniteException("Failed to format IgniteFs: " + ggfsName, iae);
+                throw new IgniteException("Failed to format IgniteFs: " + igfsName, iae);
             }
 
             return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/453d9ccd/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfiler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfiler.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfiler.java
index 0de960a..61751e3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfiler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfiler.java
@@ -38,7 +38,7 @@ public class VisorIgfsProfiler {
      * @param entries Entries to sum.
      * @return Single aggregated entry.
      */
-    public static VisorIgfsProfilerEntry aggregateGgfsProfilerEntries(List<VisorIgfsProfilerEntry> entries) {
+    public static VisorIgfsProfilerEntry aggregateIgfsProfilerEntries(List<VisorIgfsProfilerEntry> entries) {
         assert !F.isEmpty(entries);
 
         if (entries.size() == 1)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/453d9ccd/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerClearTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerClearTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerClearTask.java
index b9a08b1..06041ae 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerClearTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerClearTask.java
@@ -59,9 +59,9 @@ public class VisorIgfsProfilerClearTask extends VisorOneNodeTask<String, IgniteB
             int notDeleted = 0;
 
             try {
-                IgniteFs ggfs = ignite.fileSystem(arg);
+                IgniteFs igfs = ignite.fileSystem(arg);
 
-                Path logsDir = resolveIgfsProfilerLogsDir(ggfs);
+                Path logsDir = resolveIgfsProfilerLogsDir(igfs);
 
                 if (logsDir != null) {
                     PathMatcher matcher = FileSystems.getDefault().getPathMatcher(

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/453d9ccd/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerTask.java
index 6400f4b..6395d41 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerTask.java
@@ -131,7 +131,7 @@ public class VisorIgfsProfilerTask extends VisorOneNodeTask<String, Collection<V
         private static final int LOG_COL_THREAD_ID = 1;
         private static final int LOG_COL_ENTRY_TYPE = 3;
         private static final int LOG_COL_PATH = 4;
-        private static final int LOG_COL_GGFS_MODE = 5;
+        private static final int LOG_COL_IGFS_MODE = 5;
         private static final int LOG_COL_STREAM_ID = 6;
         private static final int LOG_COL_DATA_LEN = 8;
         private static final int LOG_COL_OVERWRITE = 10;
@@ -250,7 +250,7 @@ public class VisorIgfsProfilerTask extends VisorOneNodeTask<String, Collection<V
          * @param ix Index of array item to parse.
          * @return Parsed GGFS mode or {@code null} if string is empty.
          */
-        private IgfsMode parseGgfsMode(String[] ss, int ix) {
+        private IgfsMode parseIgfsMode(String[] ss, int ix) {
             if (ss.length <= ix)
                 return null;
             else {
@@ -280,7 +280,7 @@ public class VisorIgfsProfilerTask extends VisorOneNodeTask<String, Collection<V
                         parseLong(ss, LOG_COL_TIMESTAMP, 0),
                         entryType,
                         parseString(ss, LOG_COL_PATH),
-                        parseGgfsMode(ss, LOG_COL_GGFS_MODE),
+                        parseIgfsMode(ss, LOG_COL_IGFS_MODE),
                         streamId,
                         parseLong(ss, LOG_COL_DATA_LEN, 0),
                         parseBoolean(ss, LOG_COL_OVERWRITE),
@@ -459,7 +459,7 @@ public class VisorIgfsProfilerTask extends VisorOneNodeTask<String, Collection<V
             Collection<VisorIgfsProfilerEntry> res = new ArrayList<>(byPath.size());
 
             for (List<VisorIgfsProfilerEntry> lst : byPath.values())
-                res.add(VisorIgfsProfiler.aggregateGgfsProfilerEntries(lst));
+                res.add(VisorIgfsProfiler.aggregateIgfsProfilerEntries(lst));
 
             return res;
         }
@@ -470,11 +470,11 @@ public class VisorIgfsProfilerTask extends VisorOneNodeTask<String, Collection<V
          * @param logDir Folder were log files located.
          * @return List of line with aggregated information by files.
          */
-        private Collection<VisorIgfsProfilerEntry> parse(Path logDir, String ggfsName) throws IOException {
+        private Collection<VisorIgfsProfilerEntry> parse(Path logDir, String igfsName) throws IOException {
             Collection<VisorIgfsProfilerEntry> parsedFiles = new ArrayList<>(512);
 
             try (DirectoryStream<Path> dirStream = Files.newDirectoryStream(logDir)) {
-                PathMatcher matcher = FileSystems.getDefault().getPathMatcher("glob:igfs-log-" + ggfsName + "-*.csv");
+                PathMatcher matcher = FileSystems.getDefault().getPathMatcher("glob:igfs-log-" + igfsName + "-*.csv");
 
                 for (Path p : dirStream) {
                     if (matcher.matches(p.getFileName())) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/453d9ccd/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsResetMetricsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsResetMetricsTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsResetMetricsTask.java
index db9f07f..4be5066 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsResetMetricsTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsResetMetricsTask.java
@@ -53,13 +53,13 @@ public class VisorIgfsResetMetricsTask extends VisorOneNodeTask<Set<String>, Voi
         }
 
         /** {@inheritDoc} */
-        @Override protected Void run(Set<String> ggfsNames) {
-            for (String ggfsName: ggfsNames)
+        @Override protected Void run(Set<String> igfsNames) {
+            for (String igfsName: igfsNames)
                 try {
-                    ignite.fileSystem(ggfsName).resetMetrics();
+                    ignite.fileSystem(igfsName).resetMetrics();
                 }
                 catch (IllegalArgumentException iae) {
-                    throw new IgniteException("Failed to reset metrics for GGFS: " + ggfsName, iae);
+                    throw new IgniteException("Failed to reset metrics for IGFS: " + igfsName, iae);
                 }
 
             return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/453d9ccd/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 8ed7580..ba47c8c 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
@@ -121,33 +121,33 @@ public class VisorNodeDataCollectorJob extends VisorJob<VisorNodeDataCollectorTa
     }
 
     /** Collect GGFS. */
-    private void ggfs(VisorNodeDataCollectorJobResult res) {
+    private void igfs(VisorNodeDataCollectorJobResult res) {
         try {
             IgfsProcessorAdapter ggfsProc = ((IgniteKernal)ignite).context().igfs();
 
-            for (IgniteFs ggfs : ggfsProc.igfss()) {
+            for (IgniteFs igfs : ggfsProc.igfss()) {
                 long start0 = U.currentTimeMillis();
 
                 try {
-                    Collection<IpcServerEndpoint> endPoints = ggfsProc.endpoints(ggfs.name());
+                    Collection<IpcServerEndpoint> endPoints = ggfsProc.endpoints(igfs.name());
 
                     if (endPoints != null) {
                         for (IpcServerEndpoint ep : endPoints)
                             if (ep.isManagement())
-                                res.ggfsEndpoints().add(new VisorIgfsEndpoint(ggfs.name(), ignite.name(),
+                                res.igfsEndpoints().add(new VisorIgfsEndpoint(igfs.name(), ignite.name(),
                                     ep.getHost(), ep.getPort()));
                     }
 
-                    res.ggfss().add(VisorIgfs.from(ggfs));
+                    res.igfss().add(VisorIgfs.from(igfs));
                 }
                 finally {
                     if (debug)
-                        log(ignite.log(), "Collected GGFS: " + ggfs.name(), getClass(), start0);
+                        log(ignite.log(), "Collected IGFS: " + igfs.name(), getClass(), start0);
                 }
             }
         }
-        catch (Throwable ggfssEx) {
-            res.ggfssEx(ggfssEx);
+        catch (Throwable igfssEx) {
+            res.igfssEx(igfssEx);
         }
     }
 
@@ -205,7 +205,7 @@ public class VisorNodeDataCollectorJob extends VisorJob<VisorNodeDataCollectorTa
         if (debug)
             start0 = log(ignite.log(), "Collected caches", getClass(), start0);
 
-        ggfs(res);
+        igfs(res);
 
         if (debug)
             start0 = log(ignite.log(), "Collected igfs", getClass(), start0);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/453d9ccd/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
index a07232b..c807857 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
@@ -128,19 +128,19 @@ public class VisorNodeDataCollectorJobResult implements Serializable {
         this.cachesEx = cachesEx;
     }
 
-    public Collection<VisorIgfs> ggfss() {
+    public Collection<VisorIgfs> igfss() {
         return ggfss;
     }
 
-    public Collection<VisorIgfsEndpoint> ggfsEndpoints() {
+    public Collection<VisorIgfsEndpoint> igfsEndpoints() {
         return ggfsEndpoints;
     }
 
-    public Throwable ggfssEx() {
+    public Throwable igfssEx() {
         return ggfssEx;
     }
 
-    public void ggfssEx(Throwable ggfssEx) {
+    public void igfssEx(Throwable ggfssEx) {
         this.ggfssEx = ggfssEx;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/453d9ccd/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
index 1f1568c..bcc2874 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
@@ -116,13 +116,13 @@ public class VisorNodeDataCollectorTask extends VisorMultiNodeTask<VisorNodeData
         if (jobResult.streamersEx() != null)
             taskResult.streamersEx().put(nid, jobResult.streamersEx());
 
-        if (!jobResult.ggfss().isEmpty())
-            taskResult.ggfss().put(nid, jobResult.ggfss());
+        if (!jobResult.igfss().isEmpty())
+            taskResult.igfss().put(nid, jobResult.igfss());
 
-        if (!jobResult.ggfsEndpoints().isEmpty())
-            taskResult.ggfsEndpoints().put(nid, jobResult.ggfsEndpoints());
+        if (!jobResult.igfsEndpoints().isEmpty())
+            taskResult.igfsEndpoints().put(nid, jobResult.igfsEndpoints());
 
-        if (jobResult.ggfssEx() != null)
-            taskResult.ggfssEx().put(nid, jobResult.ggfssEx());
+        if (jobResult.igfssEx() != null)
+            taskResult.igfssEx().put(nid, jobResult.igfssEx());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/453d9ccd/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
index b63f531..bd86895 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
@@ -150,21 +150,21 @@ public class VisorNodeDataCollectorTaskResult implements Serializable {
     /**
      * @return All GGFS collected from nodes.
      */
-    public Map<UUID, Collection<VisorIgfs>> ggfss() {
+    public Map<UUID, Collection<VisorIgfs>> igfss() {
         return ggfss;
     }
 
     /**
      * @return All GGFS endpoints collected from nodes.
      */
-    public Map<UUID, Collection<VisorIgfsEndpoint>> ggfsEndpoints() {
+    public Map<UUID, Collection<VisorIgfsEndpoint>> igfsEndpoints() {
         return ggfsEndpoints;
     }
 
     /**
      * @return Exceptions caught during collecting GGFS from nodes.
      */
-    public Map<UUID, Throwable> ggfssEx() {
+    public Map<UUID, Throwable> igfssEx() {
         return ggfssEx;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/453d9ccd/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 b0d5d86..07d3af3 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 = "igfs-primary";
+    private static final String IGFS_PRIMARY = "igfs-primary";
 
     /** Primary GGFS name. */
-    private static final String GGFS_SECONDARY = "igfs-secondary";
+    private static final String IGFS_SECONDARY = "igfs-secondary";
 
     /** Secondary file system REST endpoint configuration map. */
     private static final Map<String, String> SECONDARY_REST_CFG = new HashMap<String, String>() {{
@@ -62,7 +62,7 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb
     public static final IgfsPath FILE_RMT = new IgfsPath("/fileRemote");
 
     /** Primary GGFS instances. */
-    private static IgfsImpl ggfsPrimary;
+    private static IgfsImpl igfsPrimary;
 
     /** Secondary GGFS instance. */
     private static IgniteFs secondaryFs;
@@ -79,22 +79,22 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb
      * @throws Exception If failed.
      */
     private void startPrimary() throws Exception {
-        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
+        IgfsConfiguration igfsCfg = new IgfsConfiguration();
 
-        ggfsCfg.setDataCacheName("dataCache");
-        ggfsCfg.setMetaCacheName("metaCache");
-        ggfsCfg.setName(GGFS_PRIMARY);
-        ggfsCfg.setBlockSize(512);
-        ggfsCfg.setDefaultMode(PRIMARY);
-        ggfsCfg.setPrefetchBlocks(1);
-        ggfsCfg.setSequentialReadsBeforePrefetch(Integer.MAX_VALUE);
-        ggfsCfg.setSecondaryFileSystem(secondaryFs);
+        igfsCfg.setDataCacheName("dataCache");
+        igfsCfg.setMetaCacheName("metaCache");
+        igfsCfg.setName(IGFS_PRIMARY);
+        igfsCfg.setBlockSize(512);
+        igfsCfg.setDefaultMode(PRIMARY);
+        igfsCfg.setPrefetchBlocks(1);
+        igfsCfg.setSequentialReadsBeforePrefetch(Integer.MAX_VALUE);
+        igfsCfg.setSecondaryFileSystem(secondaryFs);
 
         Map<String, IgfsMode> pathModes = new HashMap<>();
 
         pathModes.put(FILE_RMT.toString(), DUAL_SYNC);
 
-        ggfsCfg.setPathModes(pathModes);
+        igfsCfg.setPathModes(pathModes);
 
         CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
 
@@ -130,17 +130,17 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb
 
         cfg.setDiscoverySpi(discoSpi);
         cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg);
-        cfg.setIgfsConfiguration(ggfsCfg);
+        cfg.setIgfsConfiguration(igfsCfg);
 
         cfg.setLocalHost("127.0.0.1");
         cfg.setConnectorConfiguration(null);
 
         Ignite g = G.start(cfg);
 
-        ggfsPrimary = (IgfsImpl)g.fileSystem(GGFS_PRIMARY);
+        igfsPrimary = (IgfsImpl)g.fileSystem(IGFS_PRIMARY);
 
-        dataCache = ggfsPrimary.context().kernalContext().cache().internalCache(
-            ggfsPrimary.context().configuration().getDataCacheName());
+        dataCache = igfsPrimary.context().kernalContext().cache().internalCache(
+            igfsPrimary.context().configuration().getDataCacheName());
     }
 
     /**
@@ -149,14 +149,14 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb
      * @throws Exception If failed.
      */
     private void startSecondary() throws Exception {
-        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
+        IgfsConfiguration igfsCfg = new IgfsConfiguration();
 
-        ggfsCfg.setDataCacheName("dataCache");
-        ggfsCfg.setMetaCacheName("metaCache");
-        ggfsCfg.setName(GGFS_SECONDARY);
-        ggfsCfg.setBlockSize(512);
-        ggfsCfg.setDefaultMode(PRIMARY);
-        ggfsCfg.setIpcEndpointConfiguration(SECONDARY_REST_CFG);
+        igfsCfg.setDataCacheName("dataCache");
+        igfsCfg.setMetaCacheName("metaCache");
+        igfsCfg.setName(IGFS_SECONDARY);
+        igfsCfg.setBlockSize(512);
+        igfsCfg.setDefaultMode(PRIMARY);
+        igfsCfg.setIpcEndpointConfiguration(SECONDARY_REST_CFG);
 
         CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
 
@@ -188,21 +188,21 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb
 
         cfg.setDiscoverySpi(discoSpi);
         cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg);
-        cfg.setIgfsConfiguration(ggfsCfg);
+        cfg.setIgfsConfiguration(igfsCfg);
 
         cfg.setLocalHost("127.0.0.1");
         cfg.setConnectorConfiguration(null);
 
         Ignite g = G.start(cfg);
 
-        secondaryFs = g.fileSystem(GGFS_SECONDARY);
+        secondaryFs = g.fileSystem(IGFS_SECONDARY);
     }
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
         try {
             // Cleanup.
-            ggfsPrimary.format();
+            igfsPrimary.format();
 
             while (!dataCache.isEmpty())
                 U.sleep(100);
@@ -237,11 +237,11 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb
         start();
 
         // Create file in primary mode. It must not be propagated to eviction policy.
-        ggfsPrimary.create(FILE, true).close();
+        igfsPrimary.create(FILE, true).close();
 
         checkEvictionPolicy(0, 0);
 
-        int blockSize = ggfsPrimary.info(FILE).blockSize();
+        int blockSize = igfsPrimary.info(FILE).blockSize();
 
         append(FILE, blockSize);
 
@@ -260,11 +260,11 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb
     public void testFileDual() throws Exception {
         start();
 
-        ggfsPrimary.create(FILE_RMT, true).close();
+        igfsPrimary.create(FILE_RMT, true).close();
 
         checkEvictionPolicy(0, 0);
 
-        int blockSize = ggfsPrimary.info(FILE_RMT).blockSize();
+        int blockSize = igfsPrimary.info(FILE_RMT).blockSize();
 
         // File write.
         append(FILE_RMT, blockSize);
@@ -293,11 +293,11 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb
         evictPlc.setExcludePaths(Collections.singleton(FILE_RMT.toString()));
 
         // Create file in primary mode. It must not be propagated to eviction policy.
-        ggfsPrimary.create(FILE_RMT, true).close();
+        igfsPrimary.create(FILE_RMT, true).close();
 
         checkEvictionPolicy(0, 0);
 
-        int blockSize = ggfsPrimary.info(FILE_RMT).blockSize();
+        int blockSize = igfsPrimary.info(FILE_RMT).blockSize();
 
         append(FILE_RMT, blockSize);
 
@@ -319,7 +319,7 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb
 
         GridTestUtils.assertThrows(log, new Callable<Object>() {
             @Override public Object call() throws Exception {
-                ggfsPrimary.rename(FILE, FILE_RMT);
+                igfsPrimary.rename(FILE, FILE_RMT);
 
                 return null;
             }
@@ -328,7 +328,7 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb
 
         GridTestUtils.assertThrows(log, new Callable<Object>() {
             @Override public Object call() throws Exception {
-                ggfsPrimary.rename(FILE_RMT, FILE);
+                igfsPrimary.rename(FILE_RMT, FILE);
 
                 return null;
             }
@@ -348,11 +348,11 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb
 
         evictPlc.setMaxBlocks(blockCnt);
 
-        ggfsPrimary.create(FILE_RMT, true).close();
+        igfsPrimary.create(FILE_RMT, true).close();
 
         checkEvictionPolicy(0, 0);
 
-        int blockSize = ggfsPrimary.info(FILE_RMT).blockSize();
+        int blockSize = igfsPrimary.info(FILE_RMT).blockSize();
 
         // Write blocks up to the limit.
         append(FILE_RMT, blockSize * blockCnt);
@@ -379,10 +379,10 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb
     public void testDataSizeEviction() throws Exception {
         start();
 
-        ggfsPrimary.create(FILE_RMT, true).close();
+        igfsPrimary.create(FILE_RMT, true).close();
 
         int blockCnt = 3;
-        int blockSize = ggfsPrimary.info(FILE_RMT).blockSize();
+        int blockSize = igfsPrimary.info(FILE_RMT).blockSize();
 
         evictPlc.setMaxSize(blockSize * blockCnt);
 
@@ -392,7 +392,7 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb
         checkEvictionPolicy(blockCnt, blockCnt * blockSize);
 
         // Reset metrics.
-        ggfsPrimary.resetMetrics();
+        igfsPrimary.resetMetrics();
 
         // Read the first block what should cause reordering.
         read(FILE_RMT, 0, blockSize);
@@ -427,7 +427,7 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb
      * @throws Exception If failed.
      */
     private void read(IgfsPath path, int off, int len) throws Exception {
-        IgfsInputStream is = ggfsPrimary.open(path);
+        IgfsInputStream is = igfsPrimary.open(path);
 
         is.readFully(off, new byte[len]);
 
@@ -442,7 +442,7 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb
      * @throws Exception If failed.
      */
     private void append(IgfsPath path, int len) throws Exception {
-        IgfsOutputStream os = ggfsPrimary.append(path, false);
+        IgfsOutputStream os = igfsPrimary.append(path, false);
 
         os.write(new byte[len]);
 
@@ -459,13 +459,13 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb
     public void checkMetrics(final long blocksRead, final long blocksReadRmt) throws Exception {
         assert GridTestUtils.waitForCondition(new GridAbsPredicate() {
             @Override public boolean apply() {
-                IgfsMetrics metrics = ggfsPrimary.metrics();
+                IgfsMetrics metrics = igfsPrimary.metrics();
 
                 return metrics.blocksReadTotal() == blocksRead && metrics.blocksReadRemote() == blocksReadRmt;
             }
         }, 5000) : "Unexpected metrics [expectedBlocksReadTotal=" + blocksRead + ", actualBlocksReadTotal=" +
-            ggfsPrimary.metrics().blocksReadTotal() + ", expectedBlocksReadRemote=" + blocksReadRmt +
-            ", actualBlocksReadRemote=" + ggfsPrimary.metrics().blocksReadRemote() + ']';
+            igfsPrimary.metrics().blocksReadTotal() + ", expectedBlocksReadRemote=" + blocksReadRmt +
+            ", actualBlocksReadRemote=" + igfsPrimary.metrics().blocksReadRemote() + ']';
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/453d9ccd/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 1482bd0..639cf2e 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,9 +78,9 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
-        IgfsEx ggfs = (IgfsEx)grid(0).fileSystem("igfs");
+        IgfsEx igfs = (IgfsEx)grid(0).fileSystem("igfs");
 
-        mgr = ggfs.context().data();
+        mgr = igfs.context().data();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/453d9ccd/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 68829e2..a99fbbc 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 = "igfs-primary";
+    private static final String IGFS_PRIMARY = "igfs-primary";
 
     /** Primary GGFS name. */
-    private static final String GGFS_SECONDARY = "igfs-secondary";
+    private static final String IGFS_SECONDARY = "igfs-secondary";
 
     /** Secondary file system REST endpoint configuration map. */
     private static final Map<String, String> SECONDARY_REST_CFG = new HashMap<String, String>(){{
@@ -89,7 +89,7 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
         for (int i = 0; i < NODES_CNT; i++) {
             Ignite g = G.start(primaryConfiguration(i));
 
-            ggfsPrimary[i] = g.fileSystem(GGFS_PRIMARY);
+            ggfsPrimary[i] = g.fileSystem(IGFS_PRIMARY);
         }
     }
 
@@ -105,7 +105,7 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
 
         ggfsCfg.setDataCacheName("dataCache");
         ggfsCfg.setMetaCacheName("metaCache");
-        ggfsCfg.setName(GGFS_PRIMARY);
+        ggfsCfg.setName(IGFS_PRIMARY);
         ggfsCfg.setBlockSize(PRIMARY_BLOCK_SIZE);
         ggfsCfg.setDefaultMode(PRIMARY);
         ggfsCfg.setSecondaryFileSystem(ggfsSecondary);
@@ -163,7 +163,7 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
 
         ggfsCfg.setDataCacheName("dataCache");
         ggfsCfg.setMetaCacheName("metaCache");
-        ggfsCfg.setName(GGFS_SECONDARY);
+        ggfsCfg.setName(IGFS_SECONDARY);
         ggfsCfg.setBlockSize(SECONDARY_BLOCK_SIZE);
         ggfsCfg.setDefaultMode(PRIMARY);
         ggfsCfg.setIpcEndpointConfiguration(SECONDARY_REST_CFG);
@@ -204,7 +204,7 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
 
         Ignite g = G.start(cfg);
 
-        ggfsSecondary = g.fileSystem(GGFS_SECONDARY);
+        ggfsSecondary = g.fileSystem(IGFS_SECONDARY);
     }
 
     /** @throws Exception If failed. */


Mime
View raw message