diff --git a/docs/core-site.ignite.xml b/docs/core-site.ignite.xml
index 7f218d2422384..9aab7738ec174 100644
--- a/docs/core-site.ignite.xml
+++ b/docs/core-site.ignite.xml
@@ -48,7 +48,7 @@
-->
fs.igfs.impl
- org.apache.ignite.igfs.hadoop.v1.GridGgfsHadoopFileSystem
+ org.apache.ignite.igfs.hadoop.v1.IgfsHadoopFileSystem
fs.AbstractFileSystem.igfs.impl
- org.apache.ignite.igfs.hadoop.v2.GridGgfsHadoopFileSystem
+ org.apache.ignite.igfs.hadoop.v2.IgfsHadoopFileSystem
fs.igfs.impl
- org.apache.ignite.igfs.hadoop.v1.GridGgfsHadoopFileSystem
+ org.apache.ignite.igfs.hadoop.v1.IgfsHadoopFileSystem
fs.AbstractFileSystem.igfs.impl
- org.apache.ignite.igfs.hadoop.v2.GridGgfsHadoopFileSystem
+ org.apache.ignite.igfs.hadoop.v2.IgfsHadoopFileSystem
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
index 6c22a656c553f..2f05a37cc6bdf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
@@ -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 igfss() {
/**
* @param igfss New igfss.
*/
- public void ggfss(Iterable igfss) {
+ public void igfss(Iterable igfss) {
this.igfss = igfss;
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
index a34834a9b7a28..0cf84bd7187e2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
@@ -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 props = secFs.properties();
@@ -146,26 +146,26 @@ 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 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 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;
}
@@ -173,17 +173,17 @@ public static VisorIgfsConfiguration from(IgfsConfiguration ggfs) {
/**
* Construct data transfer object for igfs configurations properties.
*
- * @param ggfss igfs configurations.
+ * @param igfss Igfs configurations.
* @return igfs configurations properties.
*/
- public static Iterable list(IgfsConfiguration[] ggfss) {
- if (ggfss == null)
+ public static Iterable list(IgfsConfiguration[] igfss) {
+ if (igfss == null)
return Collections.emptyList();
- final Collection cfgs = new ArrayList<>(ggfss.length);
+ final Collection cfgs = new ArrayList<>(igfss.length);
- for (IgfsConfiguration ggfs : ggfss)
- cfgs.add(from(ggfs));
+ for (IgfsConfiguration igfs : igfss)
+ cfgs.add(from(igfs));
return cfgs;
}
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 f1102f7ed008f..2bedf105ea873 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
@@ -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 endPoints = ggfsProc.endpoints(igfs.name());
+ Collection endPoints = igfsProc.endpoints(igfs.name());
if (endPoints != null) {
for (IpcServerEndpoint ep : endPoints)
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 31477265ae5b6..7d4d6650e051d 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
@@ -54,13 +54,13 @@ public class VisorNodeDataCollectorJobResult implements Serializable {
private Throwable cachesEx;
/** Node IGFSs. */
- private final Collection ggfss = new ArrayList<>();
+ private final Collection igfss = new ArrayList<>();
/** All IGFS endpoints collected from nodes. */
- private final Collection ggfsEndpoints = new ArrayList<>();
+ private final Collection igfsEndpoints = new ArrayList<>();
/** Exception while collecting node IGFSs. */
- private Throwable ggfssEx;
+ private Throwable igfssEx;
/** Node streamers. */
private final Collection streamers = new ArrayList<>();
@@ -129,19 +129,19 @@ public void cachesEx(Throwable cachesEx) {
}
public Collection igfss() {
- return ggfss;
+ return igfss;
}
public Collection 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 streamers() {
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 755e358235d17..0b3a95c1c648a 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
@@ -57,13 +57,13 @@ public class VisorNodeDataCollectorTaskResult implements Serializable {
private final Map cachesEx = new HashMap<>();
/** All IGFS collected from nodes. */
- private final Map> ggfss = new HashMap<>();
+ private final Map> igfss = new HashMap<>();
/** All IGFS endpoints collected from nodes. */
- private final Map> ggfsEndpoints = new HashMap<>();
+ private final Map> igfsEndpoints = new HashMap<>();
/** Exceptions caught during collecting IGFS from nodes. */
- private final Map ggfssEx = new HashMap<>();
+ private final Map igfssEx = new HashMap<>();
/** All streamers collected from nodes. */
private final Map> 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 cachesEx() {
* @return All IGFS collected from nodes.
*/
public Map> igfss() {
- return ggfss;
+ return igfss;
}
/**
* @return All IGFS endpoints collected from nodes.
*/
public Map> igfsEndpoints() {
- return ggfsEndpoints;
+ return igfsEndpoints;
}
/**
* @return Exceptions caught during collecting IGFS from nodes.
*/
public Map igfssEx() {
- return ggfssEx;
+ return igfssEx;
}
/**
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/IgfsNodeStartup.java b/modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsNodeStartup.java
similarity index 97%
rename from modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/IgfsNodeStartup.java
rename to modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsNodeStartup.java
index 2858603b5340b..8f67bcfafbd07 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/IgfsNodeStartup.java
+++ b/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.*;
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/IgfsPerformanceBenchmark.java b/modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsPerformanceBenchmark.java
similarity index 99%
rename from modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/IgfsPerformanceBenchmark.java
rename to modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsPerformanceBenchmark.java
index 108d38a1c28fd..d56448447443d 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/IgfsPerformanceBenchmark.java
+++ b/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.*;