# IGNITE-226: WIP.

docs/core-site.ignite.xml

@@ -48,15 +48,15 @@
     -->
     <property>
         <name>fs.igfs.impl</name>
-        <value>org.apache.ignite.igfs.hadoop.v1.GridGgfsHadoopFileSystem</value>
+        <value>org.apache.ignite.igfs.hadoop.v1.IgfsHadoopFileSystem</value>
     </property>
 
     <!--
         Set Hadoop 2.* file system implementation class for IgniteFS.
     -->
     <property>
         <name>fs.AbstractFileSystem.igfs.impl</name>
-        <value>org.apache.ignite.igfs.hadoop.v2.GridGgfsHadoopFileSystem</value>
+        <value>org.apache.ignite.igfs.hadoop.v2.IgfsHadoopFileSystem</value>
     </property>
 
     <!--

examples/config/filesystem/core-site.xml

@@ -31,12 +31,12 @@
     <property>
         <!-- FS driver class for the 'igfs://' URIs. -->
         <name>fs.igfs.impl</name>
-        <value>org.apache.ignite.igfs.hadoop.v1.GridGgfsHadoopFileSystem</value>
+        <value>org.apache.ignite.igfs.hadoop.v1.IgfsHadoopFileSystem</value>
     </property>
 
     <property>
         <!-- FS driver class for the 'igfs://' URIs in Hadoop2.x -->
         <name>fs.AbstractFileSystem.igfs.impl</name>
-        <value>org.apache.ignite.igfs.hadoop.v2.GridGgfsHadoopFileSystem</value>
+        <value>org.apache.ignite.igfs.hadoop.v2.IgfsHadoopFileSystem</value>
     </property>
 </configuration>

modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java

@@ -108,7 +108,7 @@ public VisorGridConfiguration from(IgniteEx ignite) {
         rest(VisorRestConfiguration.from(c));
         userAttributes(c.getUserAttributes());
         caches(VisorCacheConfiguration.list(ignite, c.getCacheConfiguration()));
-        ggfss(VisorIgfsConfiguration.list(c.getIgfsConfiguration()));
+        igfss(VisorIgfsConfiguration.list(c.getIgfsConfiguration()));
         streamers(VisorStreamerConfiguration.list(c.getStreamerConfiguration()));
         env(new HashMap<>(getenv()));
         systemProperties(getProperties());
@@ -308,7 +308,7 @@ public Iterable<VisorIgfsConfiguration> igfss() {
     /**
      * @param igfss New igfss.
      */
-    public void ggfss(Iterable<VisorIgfsConfiguration> igfss) {
+    public void igfss(Iterable<VisorIgfsConfiguration> igfss) {
         this.igfss = igfss;
     }
 

modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java

@@ -122,22 +122,22 @@ public class VisorIgfsConfiguration implements Serializable {
     private long trashPurgeTimeout;
 
     /**
-     * @param ggfs IGFS configuration.
+     * @param igfs IGFS configuration.
      * @return Data transfer object for IGFS configuration properties.
      */
-    public static VisorIgfsConfiguration from(IgfsConfiguration ggfs) {
+    public static VisorIgfsConfiguration from(IgfsConfiguration igfs) {
         VisorIgfsConfiguration cfg = new VisorIgfsConfiguration();
 
-        cfg.name(ggfs.getName());
-        cfg.metaCacheName(ggfs.getMetaCacheName());
-        cfg.dataCacheName(ggfs.getDataCacheName());
-        cfg.blockSize(ggfs.getBlockSize());
-        cfg.prefetchBlocks(ggfs.getPrefetchBlocks());
-        cfg.streamBufferSize(ggfs.getStreamBufferSize());
-        cfg.perNodeBatchSize(ggfs.getPerNodeBatchSize());
-        cfg.perNodeParallelBatchCount(ggfs.getPerNodeParallelBatchCount());
+        cfg.name(igfs.getName());
+        cfg.metaCacheName(igfs.getMetaCacheName());
+        cfg.dataCacheName(igfs.getDataCacheName());
+        cfg.blockSize(igfs.getBlockSize());
+        cfg.prefetchBlocks(igfs.getPrefetchBlocks());
+        cfg.streamBufferSize(igfs.getStreamBufferSize());
+        cfg.perNodeBatchSize(igfs.getPerNodeBatchSize());
+        cfg.perNodeParallelBatchCount(igfs.getPerNodeParallelBatchCount());
 
-        Igfs secFs = ggfs.getSecondaryFileSystem();
+        Igfs secFs = igfs.getSecondaryFileSystem();
 
         if (secFs != null) {
             Map<String, String> props = secFs.properties();
@@ -146,44 +146,44 @@ public static VisorIgfsConfiguration from(IgfsConfiguration ggfs) {
             cfg.secondaryHadoopFileSystemConfigPath(props.get(SECONDARY_FS_CONFIG_PATH));
         }
 
-        cfg.defaultMode(ggfs.getDefaultMode());
-        cfg.pathModes(ggfs.getPathModes());
-        cfg.dualModePutExecutorService(compactClass(ggfs.getDualModePutExecutorService()));
-        cfg.dualModePutExecutorServiceShutdown(ggfs.getDualModePutExecutorServiceShutdown());
-        cfg.dualModeMaxPendingPutsSize(ggfs.getDualModeMaxPendingPutsSize());
-        cfg.maxTaskRangeLength(ggfs.getMaximumTaskRangeLength());
-        cfg.fragmentizerConcurrentFiles(ggfs.getFragmentizerConcurrentFiles());
-        cfg.fragmentizerLocalWritesRatio(ggfs.getFragmentizerLocalWritesRatio());
-        cfg.fragmentizerEnabled(ggfs.isFragmentizerEnabled());
-        cfg.fragmentizerThrottlingBlockLength(ggfs.getFragmentizerThrottlingBlockLength());
-        cfg.fragmentizerThrottlingDelay(ggfs.getFragmentizerThrottlingDelay());
-
-        Map<String, String> endpointCfg = ggfs.getIpcEndpointConfiguration();
+        cfg.defaultMode(igfs.getDefaultMode());
+        cfg.pathModes(igfs.getPathModes());
+        cfg.dualModePutExecutorService(compactClass(igfs.getDualModePutExecutorService()));
+        cfg.dualModePutExecutorServiceShutdown(igfs.getDualModePutExecutorServiceShutdown());
+        cfg.dualModeMaxPendingPutsSize(igfs.getDualModeMaxPendingPutsSize());
+        cfg.maxTaskRangeLength(igfs.getMaximumTaskRangeLength());
+        cfg.fragmentizerConcurrentFiles(igfs.getFragmentizerConcurrentFiles());
+        cfg.fragmentizerLocalWritesRatio(igfs.getFragmentizerLocalWritesRatio());
+        cfg.fragmentizerEnabled(igfs.isFragmentizerEnabled());
+        cfg.fragmentizerThrottlingBlockLength(igfs.getFragmentizerThrottlingBlockLength());
+        cfg.fragmentizerThrottlingDelay(igfs.getFragmentizerThrottlingDelay());
+
+        Map<String, String> endpointCfg = igfs.getIpcEndpointConfiguration();
         cfg.ipcEndpointConfiguration(endpointCfg != null ? endpointCfg.toString() : null);
 
-        cfg.ipcEndpointEnabled(ggfs.isIpcEndpointEnabled());
-        cfg.maxSpace(ggfs.getMaxSpaceSize());
-        cfg.managementPort(ggfs.getManagementPort());
-        cfg.sequenceReadsBeforePrefetch(ggfs.getSequentialReadsBeforePrefetch());
-        cfg.trashPurgeTimeout(ggfs.getTrashPurgeTimeout());
+        cfg.ipcEndpointEnabled(igfs.isIpcEndpointEnabled());
+        cfg.maxSpace(igfs.getMaxSpaceSize());
+        cfg.managementPort(igfs.getManagementPort());
+        cfg.sequenceReadsBeforePrefetch(igfs.getSequentialReadsBeforePrefetch());
+        cfg.trashPurgeTimeout(igfs.getTrashPurgeTimeout());
 
         return cfg;
     }
 
     /**
      * Construct data transfer object for igfs configurations properties.
      *
-     * @param ggfss igfs configurations.
+     * @param igfss Igfs configurations.
      * @return igfs configurations properties.
      */
-    public static Iterable<VisorIgfsConfiguration> list(IgfsConfiguration[] ggfss) {
-        if (ggfss == null)
+    public static Iterable<VisorIgfsConfiguration> list(IgfsConfiguration[] igfss) {
+        if (igfss == null)
             return Collections.emptyList();
 
-        final Collection<VisorIgfsConfiguration> cfgs = new ArrayList<>(ggfss.length);
+        final Collection<VisorIgfsConfiguration> cfgs = new ArrayList<>(igfss.length);
 
-        for (IgfsConfiguration ggfs : ggfss)
-            cfgs.add(from(ggfs));
+        for (IgfsConfiguration igfs : igfss)
+            cfgs.add(from(igfs));
 
         return cfgs;
     }

modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java

@@ -123,13 +123,13 @@ private void caches(VisorNodeDataCollectorJobResult res, VisorNodeDataCollectorT
     /** Collect IGFS. */
     private void igfs(VisorNodeDataCollectorJobResult res) {
         try {
-            IgfsProcessorAdapter ggfsProc = ((IgniteKernal)ignite).context().igfs();
+            IgfsProcessorAdapter igfsProc = ((IgniteKernal)ignite).context().igfs();
 
-            for (IgniteFs igfs : ggfsProc.igfss()) {
+            for (IgniteFs igfs : igfsProc.igfss()) {
                 long start0 = U.currentTimeMillis();
 
                 try {
-                    Collection<IpcServerEndpoint> endPoints = ggfsProc.endpoints(igfs.name());
+                    Collection<IpcServerEndpoint> endPoints = igfsProc.endpoints(igfs.name());
 
                     if (endPoints != null) {
                         for (IpcServerEndpoint ep : endPoints)

modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java

@@ -54,13 +54,13 @@ public class VisorNodeDataCollectorJobResult implements Serializable {
     private Throwable cachesEx;
 
     /** Node IGFSs. */
-    private final Collection<VisorIgfs> ggfss = new ArrayList<>();
+    private final Collection<VisorIgfs> igfss = new ArrayList<>();
 
     /** All IGFS endpoints collected from nodes. */
-    private final Collection<VisorIgfsEndpoint> ggfsEndpoints = new ArrayList<>();
+    private final Collection<VisorIgfsEndpoint> igfsEndpoints = new ArrayList<>();
 
     /** Exception while collecting node IGFSs. */
-    private Throwable ggfssEx;
+    private Throwable igfssEx;
 
     /** Node streamers. */
     private final Collection<VisorStreamer> streamers = new ArrayList<>();
@@ -129,19 +129,19 @@ public void cachesEx(Throwable cachesEx) {
     }
 
     public Collection<VisorIgfs> igfss() {
-        return ggfss;
+        return igfss;
     }
 
     public Collection<VisorIgfsEndpoint> igfsEndpoints() {
-        return ggfsEndpoints;
+        return igfsEndpoints;
     }
 
     public Throwable igfssEx() {
-        return ggfssEx;
+        return igfssEx;
     }
 
-    public void igfssEx(Throwable ggfssEx) {
-        this.ggfssEx = ggfssEx;
+    public void igfssEx(Throwable igfssEx) {
+        this.igfssEx = igfssEx;
     }
 
     public Collection<VisorStreamer> streamers() {

modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java

@@ -57,13 +57,13 @@ public class VisorNodeDataCollectorTaskResult implements Serializable {
     private final Map<UUID, Throwable> cachesEx = new HashMap<>();
 
     /** All IGFS collected from nodes. */
-    private final Map<UUID, Collection<VisorIgfs>> ggfss = new HashMap<>();
+    private final Map<UUID, Collection<VisorIgfs>> igfss = new HashMap<>();
 
     /** All IGFS endpoints collected from nodes. */
-    private final Map<UUID, Collection<VisorIgfsEndpoint>> ggfsEndpoints = new HashMap<>();
+    private final Map<UUID, Collection<VisorIgfsEndpoint>> igfsEndpoints = new HashMap<>();
 
     /** Exceptions caught during collecting IGFS from nodes. */
-    private final Map<UUID, Throwable> ggfssEx = new HashMap<>();
+    private final Map<UUID, Throwable> igfssEx = new HashMap<>();
 
     /** All streamers collected from nodes. */
     private final Map<UUID, Collection<VisorStreamer>> streamers = new HashMap<>();
@@ -84,9 +84,9 @@ public boolean isEmpty() {
                 eventsEx.isEmpty() &&
                 caches.isEmpty() &&
                 cachesEx.isEmpty() &&
-                ggfss.isEmpty() &&
-                ggfsEndpoints.isEmpty() &&
-                ggfssEx.isEmpty() &&
+                igfss.isEmpty() &&
+                igfsEndpoints.isEmpty() &&
+                igfssEx.isEmpty() &&
                 streamers.isEmpty() &&
                 streamersEx.isEmpty();
     }
@@ -151,21 +151,21 @@ public Map<UUID, Throwable> cachesEx() {
      * @return All IGFS collected from nodes.
      */
     public Map<UUID, Collection<VisorIgfs>> igfss() {
-        return ggfss;
+        return igfss;
     }
 
     /**
      * @return All IGFS endpoints collected from nodes.
      */
     public Map<UUID, Collection<VisorIgfsEndpoint>> igfsEndpoints() {
-        return ggfsEndpoints;
+        return igfsEndpoints;
     }
 
     /**
      * @return Exceptions caught during collecting IGFS from nodes.
      */
     public Map<UUID, Throwable> igfssEx() {
-        return ggfssEx;
+        return igfssEx;
     }
 
     /**

modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/IgfsNodeStartup.java → modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsNodeStartup.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.loadtests.ggfs;
+package org.apache.ignite.loadtests.igfs;
 
 import org.apache.ignite.*;
 import org.apache.ignite.internal.util.typedef.*;

modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/IgfsPerformanceBenchmark.java → modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsPerformanceBenchmark.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.loadtests.ggfs;
+package org.apache.ignite.loadtests.igfs;
 
 import org.apache.hadoop.conf.*;
 import org.apache.hadoop.fs.*;