ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [58/76] [abbrv] incubator-ignite git commit: # IGNITE-226: WIP.
Date Fri, 13 Feb 2015 18:04:04 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d6347db/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
index 02eef2c..7ff93a2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
@@ -59,7 +59,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
     protected final SecureRandom rnd = new SecureRandom();
 
     /** File system. */
-    protected IgniteFs ggfs;
+    protected IgniteFs igfs;
 
     /** Meta cache. */
     private GridCache<Object, Object> metaCache;
@@ -71,7 +71,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
     @Override protected void beforeTest() throws Exception {
         IgniteEx grid = grid(0);
 
-        ggfs = grid.fileSystem(ggfsName());
+        igfs = grid.fileSystem(igfsName());
 
         IgfsConfiguration[] cfgs = grid.configuration().getIgfsConfiguration();
 
@@ -86,7 +86,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
     @Override protected void afterTest() throws Exception {
         super.afterTest();
 
-        ggfs.format();
+        igfs.format();
     }
 
     /** {@inheritDoc} */
@@ -111,13 +111,13 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
 
         cfg.setDiscoverySpi(discoSpi);
 
-        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
+        IgfsConfiguration igfsCfg = new IgfsConfiguration();
 
-        ggfsCfg.setMetaCacheName(META_CACHE_NAME);
-        ggfsCfg.setDataCacheName(DATA_CACHE_NAME);
-        ggfsCfg.setName("igfs");
+        igfsCfg.setMetaCacheName(META_CACHE_NAME);
+        igfsCfg.setDataCacheName(DATA_CACHE_NAME);
+        igfsCfg.setName("igfs");
 
-        cfg.setIgfsConfiguration(ggfsCfg);
+        cfg.setIgfsConfiguration(igfsCfg);
 
         return cfg;
     }
@@ -151,15 +151,15 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
     }
 
     /** @return FS name. */
-    public String ggfsName() {
+    public String igfsName() {
         return "igfs";
     }
 
     /** @throws Exception If failed. */
-    public void testGgfsEnabled() throws Exception {
-        IgniteFs ggfs = grid(0).fileSystem(ggfsName());
+    public void testigfsEnabled() throws Exception {
+        IgniteFs igfs = grid(0).fileSystem(igfsName());
 
-        assertNotNull(ggfs);
+        assertNotNull(igfs);
     }
 
     /**
@@ -170,25 +170,25 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
     public void testUpdateProperties() throws Exception {
         IgfsPath p = path("/tmp/my");
 
-        ggfs.mkdirs(p);
+        igfs.mkdirs(p);
 
-        Map<String, String> oldProps = ggfs.info(p).properties();
+        Map<String, String> oldProps = igfs.info(p).properties();
 
-        ggfs.update(p, F.asMap("a", "1"));
-        ggfs.update(p, F.asMap("b", "2"));
+        igfs.update(p, F.asMap("a", "1"));
+        igfs.update(p, F.asMap("b", "2"));
 
-        assertEquals("1", ggfs.info(p).property("a"));
-        assertEquals("2", ggfs.info(p).property("b"));
+        assertEquals("1", igfs.info(p).property("a"));
+        assertEquals("2", igfs.info(p).property("b"));
 
-        ggfs.update(p, F.asMap("b", "3"));
+        igfs.update(p, F.asMap("b", "3"));
 
         Map<String, String> expProps = new HashMap<>(oldProps);
         expProps.put("a", "1");
         expProps.put("b", "3");
 
-        assertEquals("3", ggfs.info(p).property("b"));
-        assertEquals(expProps, ggfs.info(p).properties());
-        assertEquals("5", ggfs.info(p).property("c", "5"));
+        assertEquals("3", igfs.info(p).property("b"));
+        assertEquals(expProps, igfs.info(p).properties());
+        assertEquals("5", igfs.info(p).property("c", "5"));
 
         assertUpdatePropertiesFails(null, null, NullPointerException.class, "Ouch! Argument cannot be null");
         assertUpdatePropertiesFails(p, null, NullPointerException.class, "Ouch! Argument cannot be null");
@@ -203,10 +203,10 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
     public void testCreate() throws Exception {
         IgfsPath path = path("/file");
 
-        try (IgfsOutputStream os = ggfs.create(path, false)) {
+        try (IgfsOutputStream os = igfs.create(path, false)) {
             assert os != null;
 
-            IgfsFileImpl info = (IgfsFileImpl)ggfs.info(path);
+            IgfsFileImpl info = (IgfsFileImpl)igfs.info(path);
 
             for (int i = 0; i < nodesCount(); i++) {
                 IgfsFileInfo fileInfo = (IgfsFileInfo)grid(i).cachex(metaCacheName).peek(info.fileId());
@@ -216,7 +216,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
             }
         }
         finally {
-            ggfs.delete(path("/"), true);
+            igfs.delete(path("/"), true);
         }
     }
 
@@ -228,19 +228,19 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
     public void testMakeListDeleteDirs() throws Exception {
         assertListDir("/");
 
-        ggfs.mkdirs(path("/ab/cd/ef"));
+        igfs.mkdirs(path("/ab/cd/ef"));
 
         assertListDir("/", "ab");
         assertListDir("/ab", "cd");
         assertListDir("/ab/cd", "ef");
 
-        ggfs.mkdirs(path("/ab/ef"));
-        ggfs.mkdirs(path("/cd/ef"));
-        ggfs.mkdirs(path("/cd/gh"));
-        ggfs.mkdirs(path("/ef"));
-        ggfs.mkdirs(path("/ef/1"));
-        ggfs.mkdirs(path("/ef/2"));
-        ggfs.mkdirs(path("/ef/3"));
+        igfs.mkdirs(path("/ab/ef"));
+        igfs.mkdirs(path("/cd/ef"));
+        igfs.mkdirs(path("/cd/gh"));
+        igfs.mkdirs(path("/ef"));
+        igfs.mkdirs(path("/ef/1"));
+        igfs.mkdirs(path("/ef/2"));
+        igfs.mkdirs(path("/ef/3"));
 
         assertListDir("/", "ef", "ab", "cd");
         assertListDir("/ab", "cd", "ef");
@@ -250,20 +250,20 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
         assertListDir("/cd/ef");
         assertListDir("/ef", "1", "2", "3");
 
-        ggfs.delete(path("/ef/2"), false);
+        igfs.delete(path("/ef/2"), false);
 
         assertListDir("/", "ef", "ab", "cd");
         assertListDir("/ef", "1", "3");
 
         // Delete should return false for non-existing paths.
-        assertFalse(ggfs.delete(path("/ef/2"), false));
+        assertFalse(igfs.delete(path("/ef/2"), false));
 
         assertListDir("/", "ef", "ab", "cd");
         assertListDir("/ef", "1", "3");
 
         GridTestUtils.assertThrows(log, new Callable<Object>() {
             @Override public Object call() throws Exception {
-                ggfs.delete(path("/ef"), false);
+                igfs.delete(path("/ef"), false);
 
                 return null;
             }
@@ -272,7 +272,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
         assertListDir("/", "ef", "ab", "cd");
         assertListDir("/ef", "1", "3");
 
-        ggfs.delete(path("/ef"), true);
+        igfs.delete(path("/ef"), true);
 
         assertListDir("/", "ab", "cd");
     }
@@ -295,7 +295,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
         GridTestUtils.runMultiThreaded(new Callable<Object>() {
             @Override public Object call() throws Exception {
                 for (int cur = cnt.incrementAndGet(); cur < max; cur = cnt.incrementAndGet())
-                    ggfs.mkdirs(path(cur));
+                    igfs.mkdirs(path(cur));
 
                 return null;
             }
@@ -308,7 +308,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
         GridTestUtils.runMultiThreaded(new Callable<Object>() {
             @Override public Object call() throws Exception {
                 for (int cur = cnt.incrementAndGet(); cur < max; cur = cnt.incrementAndGet()) {
-                    IgfsFile info = ggfs.info(path(cur));
+                    IgfsFile info = igfs.info(path(cur));
 
                     assertNotNull("Expects file exist: " + cur, info);
                     assertTrue("Expects file is a directory: " + cur, info.isDirectory());
@@ -325,7 +325,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
         GridTestUtils.runMultiThreaded(new Callable<Object>() {
             @Override public Object call() throws Exception {
                 for (int cur = cnt.incrementAndGet(); cur < max; cur = cnt.incrementAndGet())
-                    ggfs.delete(path(cur), true);
+                    igfs.delete(path(cur), true);
 
                 return null;
             }
@@ -335,82 +335,82 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
     /** @throws Exception If failed. */
     public void testBasicOps() throws Exception {
         // Create directories.
-        ggfs.mkdirs(path("/A/B1/C1"));
+        igfs.mkdirs(path("/A/B1/C1"));
 
         for (Object key : metaCache.keySet())
             info("Entry in cache [key=" + key + ", val=" + metaCache.get(key) + ']');
 
-        ggfs.mkdirs(path("/A/B1/C2"));
-        ggfs.mkdirs(path("/A/B1/C3"));
-        ggfs.mkdirs(path("/A/B2/C1"));
-        ggfs.mkdirs(path("/A/B2/C2"));
+        igfs.mkdirs(path("/A/B1/C2"));
+        igfs.mkdirs(path("/A/B1/C3"));
+        igfs.mkdirs(path("/A/B2/C1"));
+        igfs.mkdirs(path("/A/B2/C2"));
 
-        ggfs.mkdirs(path("/A1/B1/C1"));
-        ggfs.mkdirs(path("/A1/B1/C2"));
-        ggfs.mkdirs(path("/A1/B1/C3"));
-        ggfs.mkdirs(path("/A2/B2/C1"));
-        ggfs.mkdirs(path("/A2/B2/C2"));
+        igfs.mkdirs(path("/A1/B1/C1"));
+        igfs.mkdirs(path("/A1/B1/C2"));
+        igfs.mkdirs(path("/A1/B1/C3"));
+        igfs.mkdirs(path("/A2/B2/C1"));
+        igfs.mkdirs(path("/A2/B2/C2"));
 
         for (Object key : metaCache.keySet())
             info("Entry in cache [key=" + key + ", val=" + metaCache.get(key) + ']');
 
         // Check existence.
-        assert ggfs.exists(path("/A/B1/C1"));
+        assert igfs.exists(path("/A/B1/C1"));
 
         // List items.
-        Collection<IgfsPath> paths = ggfs.listPaths(path("/"));
+        Collection<IgfsPath> paths = igfs.listPaths(path("/"));
 
         assert paths.size() == 3 : "Unexpected paths: " + paths;
 
-        paths = ggfs.listPaths(path("/A"));
+        paths = igfs.listPaths(path("/A"));
 
         assert paths.size() == 2 : "Unexpected paths: " + paths;
 
-        paths = ggfs.listPaths(path("/A/B1"));
+        paths = igfs.listPaths(path("/A/B1"));
 
         assert paths.size() == 3 : "Unexpected paths: " + paths;
 
         // Delete.
         GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
             @Override public Object call() throws Exception {
-                ggfs.delete(path("/"), false);
+                igfs.delete(path("/"), false);
 
                 return null;
             }
         }, IgfsException.class, null);
 
-        ggfs.delete(path("/A1/B1/C1"), false);
-        assertNull(ggfs.info(path("/A1/B1/C1")));
+        igfs.delete(path("/A1/B1/C1"), false);
+        assertNull(igfs.info(path("/A1/B1/C1")));
 
-        ggfs.delete(path("/A1/B1/C2"), false);
-        assertNull(ggfs.info(path("/A1/B1/C2")));
+        igfs.delete(path("/A1/B1/C2"), false);
+        assertNull(igfs.info(path("/A1/B1/C2")));
 
-        ggfs.delete(path("/A1/B1/C3"), false);
-        assertNull(ggfs.info(path("/A1/B1/C3")));
+        igfs.delete(path("/A1/B1/C3"), false);
+        assertNull(igfs.info(path("/A1/B1/C3")));
 
-        assertEquals(Collections.<IgfsPath>emptyList(), ggfs.listPaths(path("/A1/B1")));
+        assertEquals(Collections.<IgfsPath>emptyList(), igfs.listPaths(path("/A1/B1")));
 
-        ggfs.delete(path("/A2/B2"), true);
-        assertNull(ggfs.info(path("/A2/B2")));
+        igfs.delete(path("/A2/B2"), true);
+        assertNull(igfs.info(path("/A2/B2")));
 
-        assertEquals(Collections.<IgfsPath>emptyList(), ggfs.listPaths(path("/A2")));
+        assertEquals(Collections.<IgfsPath>emptyList(), igfs.listPaths(path("/A2")));
 
-        assertEquals(Arrays.asList(path("/A"), path("/A1"), path("/A2")), sorted(ggfs.listPaths(path("/"))));
+        assertEquals(Arrays.asList(path("/A"), path("/A1"), path("/A2")), sorted(igfs.listPaths(path("/"))));
 
         GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
             @Override public Object call() throws Exception {
-                ggfs.delete(path("/"), false);
+                igfs.delete(path("/"), false);
 
                 return null;
             }
         }, IgfsException.class, null);
-        assertEquals(Arrays.asList(path("/A"), path("/A1"), path("/A2")), sorted(ggfs.listPaths(path("/"))));
+        assertEquals(Arrays.asList(path("/A"), path("/A1"), path("/A2")), sorted(igfs.listPaths(path("/"))));
 
-        ggfs.delete(path("/"), true);
-        assertEquals(Collections.<IgfsPath>emptyList(), ggfs.listPaths(path("/")));
+        igfs.delete(path("/"), true);
+        assertEquals(Collections.<IgfsPath>emptyList(), igfs.listPaths(path("/")));
 
-        ggfs.delete(path("/"), false);
-        assertEquals(Collections.<IgfsPath>emptyList(), ggfs.listPaths(path("/")));
+        igfs.delete(path("/"), false);
+        assertEquals(Collections.<IgfsPath>emptyList(), igfs.listPaths(path("/")));
 
         for (Cache.Entry<Object, Object> e : metaCache)
             info("Entry in cache [key=" + e.getKey() + ", val=" + e.getValue() + ']');
@@ -430,26 +430,26 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
         IgfsPath fileSubdir1 = path("/dir1/subdir1/file");
         IgfsPath fileDir2 = path("/dir2/file");
 
-        IgfsOutputStream os = ggfs.create(fileDir1, false);
+        IgfsOutputStream os = igfs.create(fileDir1, false);
         os.write(new byte[1000]);
         os.close();
 
-        os = ggfs.create(fileSubdir1, false);
+        os = igfs.create(fileSubdir1, false);
         os.write(new byte[2000]);
         os.close();
 
-        os = ggfs.create(fileDir2, false);
+        os = igfs.create(fileDir2, false);
         os.write(new byte[4000]);
         os.close();
 
-        assert ggfs.size(fileDir1) == 1000;
-        assert ggfs.size(fileSubdir1) == 2000;
-        assert ggfs.size(fileDir2) == 4000;
+        assert igfs.size(fileDir1) == 1000;
+        assert igfs.size(fileSubdir1) == 2000;
+        assert igfs.size(fileDir2) == 4000;
 
-        assert ggfs.size(dir1) == 3000;
-        assert ggfs.size(subDir1) == 2000;
+        assert igfs.size(dir1) == 3000;
+        assert igfs.size(subDir1) == 2000;
 
-        assert ggfs.size(dir2) == 4000;
+        assert igfs.size(dir2) == 4000;
     }
 
     /**
@@ -469,7 +469,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
     /** @throws Exception If failed. */
     public void testRename() throws Exception {
         // Create directories.
-        ggfs.mkdirs(path("/A/B1/C1"));
+        igfs.mkdirs(path("/A/B1/C1"));
 
         for (Object key : metaCache.keySet())
             info("Entry in cache [key=" + key + ", val=" + metaCache.get(key) + ']');
@@ -477,7 +477,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
         // Move under itself.
         GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
             @Override public Object call() throws Exception {
-                ggfs.rename(path("/A/B1/C1"), path("/A/B1/C1/C2"));
+                igfs.rename(path("/A/B1/C1"), path("/A/B1/C1/C2"));
 
                 return null;
             }
@@ -486,7 +486,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
         // Move under itself.
         GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
             @Override public Object call() throws Exception {
-                ggfs.rename(path("/A/B1/C1"), path("/A/B1/C1/D/C2"));
+                igfs.rename(path("/A/B1/C1"), path("/A/B1/C1/D/C2"));
 
                 return null;
             }
@@ -496,7 +496,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
         GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
             @Override
             public Object call() throws Exception {
-                ggfs.rename(path("/A/B1/C1"), path("/A/B1/C1/D/E/C2"));
+                igfs.rename(path("/A/B1/C1"), path("/A/B1/C1/D/E/C2"));
 
                 return null;
             }
@@ -526,15 +526,15 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
             final IgfsPath p1 = path(e.get1());
             final IgfsPath p2 = path(e.get2());
 
-            assertTrue("Entry: " + e, ggfs.exists(p1));
-            ggfs.rename(p1, p2);
-            assertFalse("Entry: " + e, ggfs.exists(p1));
-            assertTrue("Entry: " + e, ggfs.exists(p2));
+            assertTrue("Entry: " + e, igfs.exists(p1));
+            igfs.rename(p1, p2);
+            assertFalse("Entry: " + e, igfs.exists(p1));
+            assertTrue("Entry: " + e, igfs.exists(p2));
 
             // Test root rename.
             GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
                 @Override public Object call() throws Exception {
-                    ggfs.rename(root, p1);
+                    igfs.rename(root, p1);
 
                     return null;
                 }
@@ -543,7 +543,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
             // Test root rename.
             GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
                 @Override public Object call() throws Exception {
-                    ggfs.rename(p1, root);
+                    igfs.rename(p1, root);
 
                     return null;
                 }
@@ -553,7 +553,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
             if (!root.equals(p2)) {
                 GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
                     @Override public Object call() throws Exception {
-                        ggfs.rename(root, p2);
+                        igfs.rename(root, p2);
 
                         return null;
                     }
@@ -561,14 +561,14 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
             }
 
             // Test same rename.
-            ggfs.rename(p1, p1);
-            ggfs.rename(p2, p2);
+            igfs.rename(p1, p1);
+            igfs.rename(p2, p2);
         }
 
         // List items.
-        assertEquals(Arrays.asList(path("/A")), sorted(ggfs.listPaths(root)));
-        assertEquals(Arrays.asList(path("/A/B1")), sorted(ggfs.listPaths(path("/A"))));
-        assertEquals(Arrays.asList(path("/A/B1/C1")), sorted(ggfs.listPaths(path("/A/B1"))));
+        assertEquals(Arrays.asList(path("/A")), sorted(igfs.listPaths(root)));
+        assertEquals(Arrays.asList(path("/A/B1")), sorted(igfs.listPaths(path("/A"))));
+        assertEquals(Arrays.asList(path("/A/B1/C1")), sorted(igfs.listPaths(path("/A/B1"))));
 
         String text = "Test long number: " + rnd.nextLong();
 
@@ -577,9 +577,9 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
 
         // Validate renamed during reading.
 
-        try (IgfsInputStream in0 = ggfs.open(path("/A/a"))) {
+        try (IgfsInputStream in0 = igfs.open(path("/A/a"))) {
             // Rename file.
-            ggfs.rename(path("/A/a"), path("/b"));
+            igfs.rename(path("/A/a"), path("/b"));
 
             assertEquals(text, IOUtils.toString(in0, UTF_8));
         }
@@ -589,9 +589,9 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
         assertEquals(text, read("/b"));
 
         // Cleanup.
-        ggfs.delete(root, true);
+        igfs.delete(root, true);
 
-        assertEquals(Collections.<IgfsPath>emptyList(), ggfs.listPaths(root));
+        assertEquals(Collections.<IgfsPath>emptyList(), igfs.listPaths(root));
     }
 
     /**
@@ -619,7 +619,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
         assertCreateFails("/", false, "Failed to resolve parent directory");
 
         // Create directories.
-        ggfs.mkdirs(path("/A/B1/C1"));
+        igfs.mkdirs(path("/A/B1/C1"));
 
         // Error - path points to directory.
         for (String path : Arrays.asList("/A", "/A/B1", "/A/B1/C1")) {
@@ -655,7 +655,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
             assertEquals(text2 + text1 + text2, append(path, true, text2));
 
             // Delete this file.
-            ggfs.delete(path(path), true);
+            igfs.delete(path(path), true);
 
             // Error - file doesn't exist.
             assertOpenFails(path, "File not found");
@@ -668,7 +668,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
             for (String full = text1, cur = ""; full.length() < 10000; cur = ", long=" + rnd.nextLong())
                 assertEquals(full += cur, append(path, rnd.nextBoolean(), cur));
 
-            ggfs.delete(path(path), false);
+            igfs.delete(path(path), false);
         }
     }
 
@@ -677,11 +677,11 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
     public void testDeleteCacheConsistency() throws Exception {
         IgfsPath path = new IgfsPath("/someFile");
 
-        try (IgfsOutputStream out = ggfs.create(path, true)) {
+        try (IgfsOutputStream out = igfs.create(path, true)) {
             out.write(new byte[10 * 1024 * 1024]);
         }
 
-        IgniteUuid fileId = U.field(ggfs.info(path), "fileId");
+        IgniteUuid fileId = U.field(igfs.info(path), "fileId");
 
         GridCache<IgniteUuid, IgfsFileInfo> metaCache = grid(0).cachex(META_CACHE_NAME);
         GridCache<IgfsBlockKey, byte[]> dataCache = grid(0).cachex(DATA_CACHE_NAME);
@@ -692,12 +692,12 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
         assertTrue(info.isFile());
         assertNotNull(metaCache.get(info.id()));
 
-        IgfsDataManager dataMgr = ((IgfsEx)ggfs).context().data();
+        IgfsDataManager dataMgr = ((IgfsEx)igfs).context().data();
 
         for (int i = 0; i < info.blocksCount(); i++)
             assertNotNull(dataCache.get(dataMgr.blockKey(i, info)));
 
-        ggfs.delete(path, true);
+        igfs.delete(path, true);
 
         for (int i = 0; i < 25; i++) {
             if (metaCache.get(info.id()) == null)
@@ -757,18 +757,18 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
     public void testFormatNonEmpty() throws Exception {
         String dirPath = "/A/B/C";
 
-        ggfs.mkdirs(path(dirPath));
+        igfs.mkdirs(path(dirPath));
 
         String filePath = "/someFile";
 
         create(filePath, false, "Some text.");
 
-        ggfs.format();
+        igfs.format();
 
-        assert !ggfs.exists(path(dirPath));
-        assert !ggfs.exists(path(filePath));
+        assert !igfs.exists(path(dirPath));
+        assert !igfs.exists(path(filePath));
 
-        assert grid(0).cachex(ggfs.configuration().getMetaCacheName()).size() == 2; // ROOT + TRASH.
+        assert grid(0).cachex(igfs.configuration().getMetaCacheName()).size() == 2; // ROOT + TRASH.
     }
 
     /**
@@ -777,7 +777,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testFormatEmpty() throws Exception {
-        ggfs.format();
+        igfs.format();
     }
 
     /**
@@ -794,7 +794,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
         for (int i = 0; i < buf.length; i++)
             buf[i] = (byte)(i * i);
 
-        IgfsOutputStream os = ggfs.create(path, bufSize, true, null, 0, 1024, null);
+        IgfsOutputStream os = igfs.create(path, bufSize, true, null, 0, 1024, null);
 
         try {
             for (int i = 0; i < cnt; i++)
@@ -806,7 +806,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
             os.close();
         }
 
-        os = ggfs.append(path, chunkSize, false, null);
+        os = igfs.append(path, chunkSize, false, null);
 
         try {
             for (int i = 0; i < cnt; i++)
@@ -820,7 +820,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
 
         byte[] readBuf = new byte[chunkSize];
 
-        try (IgfsInputStream in = ggfs.open(path)) {
+        try (IgfsInputStream in = igfs.open(path)) {
             long pos = 0;
 
             for (int k = 0; k < 2 * cnt; k++) {
@@ -845,11 +845,11 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
      */
     private String create(String path, boolean overwrite, String text) throws Exception {
 
-        try (IgfsOutputStream out = ggfs.create(path(path), overwrite)) {
+        try (IgfsOutputStream out = igfs.create(path(path), overwrite)) {
             IOUtils.write(text, out, UTF_8);
         }
 
-        assertNotNull(ggfs.info(path(path)));
+        assertNotNull(igfs.info(path(path)));
 
         return read(path);
     }
@@ -865,11 +865,11 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
      */
     private String append(String path, boolean create, String text) throws Exception {
 
-        try (IgfsOutputStream out = ggfs.append(path(path), create)) {
+        try (IgfsOutputStream out = igfs.append(path(path), create)) {
             IOUtils.write(text, out, UTF_8);
         }
 
-        assertNotNull(ggfs.info(path(path)));
+        assertNotNull(igfs.info(path(path)));
 
         return read(path);
     }
@@ -883,7 +883,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
      */
     private String read(String path) throws Exception {
 
-        try (IgfsInputStream in = ggfs.open(path(path))) {
+        try (IgfsInputStream in = igfs.open(path(path))) {
             return IOUtils.toString(in, UTF_8);
         }
     }
@@ -900,7 +900,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
         Class<? extends Throwable> cls, @Nullable String msg) {
         GridTestUtils.assertThrows(log, new Callable() {
             @Override public Object call() throws Exception {
-                return ggfs.update(path, props);
+                return igfs.update(path, props);
             }
         }, cls, msg);
     }
@@ -915,7 +915,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
     private void assertCreateFails(final String path, final boolean overwrite, @Nullable String msg) {
         GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
             @Override public Object call() throws Exception {
-                ggfs.create(path(path), overwrite);
+                igfs.create(path(path), overwrite);
 
                 return false;
             }
@@ -932,7 +932,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
     private void assertAppendFails(final String path, final boolean create, @Nullable String msg) {
         GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
             @Override public Object call() throws Exception {
-                ggfs.append(path(path), create);
+                igfs.append(path(path), create);
 
                 return false;
             }
@@ -948,7 +948,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
     private void assertOpenFails(final String path, @Nullable String msg) {
         GridTestUtils.assertThrowsInherited(log, new Callable<Object>() {
             @Override public Object call() throws Exception {
-                ggfs.open(path(path));
+                igfs.open(path(path));
 
                 return false;
             }
@@ -963,7 +963,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
      * @throws IgniteCheckedException If failed.
      */
     private void assertListDir(String path, String... item) throws IgniteCheckedException {
-        Collection<IgfsFile> files = ggfs.listFiles(new IgfsPath(path));
+        Collection<IgfsFile> files = igfs.listFiles(new IgfsPath(path));
 
         List<String> names = new ArrayList<>(item.length);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d6347db/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
index 0a23357..6f444c0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
@@ -37,9 +37,9 @@ import static org.apache.ignite.igfs.IgfsMode.*;
  * Tests for node validation logic in {@link IgfsProcessor}.
  * <p>
  * Tests starting with "testLocal" are checking
- * {@link IgfsProcessor#validateLocalGgfsConfigurations(org.apache.ignite.configuration.IgfsConfiguration[])}.
+ * {@link IgfsProcessor#validateLocalIgfsConfigurations(org.apache.ignite.configuration.IgfsConfiguration[])}.
  * <p>
- * Tests starting with "testRemote" are checking {@link IgfsProcessor#checkGgfsOnRemoteNode(org.apache.ignite.cluster.ClusterNode)}.
+ * Tests starting with "testRemote" are checking {@link IgfsProcessor#checkIgfsOnRemoteNode(org.apache.ignite.cluster.ClusterNode)}.
  */
 public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
     /** IP finder. */
@@ -61,10 +61,10 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
     private static final String metaCache2Name = "metaCache2";
 
     /** First IGFS config in grid #1. */
-    private IgfsConfiguration g1GgfsCfg1 = new IgfsConfiguration();
+    private IgfsConfiguration g1IgfsCfg1 = new IgfsConfiguration();
 
     /** Second IGFS config in grid#1. */
-    private IgfsConfiguration g1GgfsCfg2 = new IgfsConfiguration();
+    private IgfsConfiguration g1IgfsCfg2 = new IgfsConfiguration();
 
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
@@ -81,15 +81,15 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
 
         cfg.setDiscoverySpi(discoSpi);
 
-        g1GgfsCfg1.setName("g1GgfsCfg1");
-        g1GgfsCfg1.setDataCacheName(dataCache1Name);
-        g1GgfsCfg1.setMetaCacheName(metaCache1Name);
+        g1IgfsCfg1.setName("g1IgfsCfg1");
+        g1IgfsCfg1.setDataCacheName(dataCache1Name);
+        g1IgfsCfg1.setMetaCacheName(metaCache1Name);
 
-        g1GgfsCfg2.setName("g1GgfsCfg2");
-        g1GgfsCfg2.setDataCacheName(dataCache2Name);
-        g1GgfsCfg2.setMetaCacheName(metaCache2Name);
+        g1IgfsCfg2.setName("g1IgfsCfg2");
+        g1IgfsCfg2.setDataCacheName(dataCache2Name);
+        g1IgfsCfg2.setMetaCacheName(metaCache2Name);
 
-        cfg.setIgfsConfiguration(g1GgfsCfg1, g1GgfsCfg2);
+        cfg.setIgfsConfiguration(g1IgfsCfg1, g1IgfsCfg2);
 
         cfg.setLocalHost("127.0.0.1");
 
@@ -169,13 +169,13 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
-    public void testLocalIfGgfsConfigsHaveDifferentNames() throws Exception {
+    public void testLocalIfIgfsConfigsHaveDifferentNames() throws Exception {
         g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
 
-        String ggfsCfgName = "igfs-cfg";
+        String igfsCfgName = "igfs-cfg";
 
-        g1GgfsCfg1.setName(ggfsCfgName);
-        g1GgfsCfg2.setName(ggfsCfgName);
+        g1IgfsCfg1.setName(igfsCfgName);
+        g1IgfsCfg2.setName(igfsCfgName);
 
         checkGridStartFails(g1Cfg, "Duplicate IGFS name found (check configuration and assign unique name", true);
     }
@@ -210,10 +210,10 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     @SuppressWarnings("NullableProblems")
-    public void testLocalNullGgfsNameIsSupported() throws Exception {
+    public void testLocalNullIgfsNameIsSupported() throws Exception {
         g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
 
-        g1GgfsCfg1.setName(null);
+        g1IgfsCfg1.setName(null);
 
         assertFalse(G.start(g1Cfg).cluster().nodes().isEmpty());
     }
@@ -224,7 +224,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
     public void testLocalIfOffheapIsDisabledAndMaxSpaceSizeIsGreater() throws Exception {
         g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
 
-        g1GgfsCfg2.setMaxSpaceSize(999999999999999999L);
+        g1IgfsCfg2.setMaxSpaceSize(999999999999999999L);
 
         checkGridStartFails(g1Cfg, "Maximum IGFS space size cannot be greater that size of available heap", true);
     }
@@ -238,7 +238,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
         for (CacheConfiguration cc : g1Cfg.getCacheConfiguration())
             cc.setOffHeapMaxMemory(1000000);
 
-        g1GgfsCfg2.setMaxSpaceSize(999999999999999999L);
+        g1IgfsCfg2.setMaxSpaceSize(999999999999999999L);
 
         checkGridStartFails(g1Cfg,
             "Maximum IGFS space size cannot be greater than size of available heap memory and offheap storage", true);
@@ -264,7 +264,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
     public void testLocalIfNonPrimaryModeAndHadoopFileSystemUriIsNull() throws Exception {
         g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
 
-        g1GgfsCfg2.setDefaultMode(PROXY);
+        g1IgfsCfg2.setDefaultMode(PROXY);
 
         checkGridStartFails(g1Cfg, "secondaryFileSystem cannot be null when mode is SECONDARY", true);
     }
@@ -278,11 +278,11 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
         g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
         g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
 
-        IgfsConfiguration g2GgfsCfg1 = new IgfsConfiguration(g1GgfsCfg1);
+        IgfsConfiguration g2IgfsCfg1 = new IgfsConfiguration(g1IgfsCfg1);
 
-        g2GgfsCfg1.setBlockSize(g2GgfsCfg1.getBlockSize() + 100);
+        g2IgfsCfg1.setBlockSize(g2IgfsCfg1.getBlockSize() + 100);
 
-        g2Cfg.setIgfsConfiguration(g2GgfsCfg1, g1GgfsCfg2);
+        g2Cfg.setIgfsConfiguration(g2IgfsCfg1, g1IgfsCfg2);
 
         G.start(g1Cfg);
 
@@ -310,17 +310,17 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
     public void testRemoteIfMetaCacheNameDiffers() throws Exception {
         IgniteConfiguration g2Cfg = getConfiguration("g2");
 
-        IgfsConfiguration g2GgfsCfg1 = new IgfsConfiguration(g1GgfsCfg1);
-        IgfsConfiguration g2GgfsCfg2 = new IgfsConfiguration(g1GgfsCfg2);
+        IgfsConfiguration g2IgfsCfg1 = new IgfsConfiguration(g1IgfsCfg1);
+        IgfsConfiguration g2IgfsCfg2 = new IgfsConfiguration(g1IgfsCfg2);
 
-        g2GgfsCfg1.setMetaCacheName("g2MetaCache1");
-        g2GgfsCfg2.setMetaCacheName("g2MetaCache2");
+        g2IgfsCfg1.setMetaCacheName("g2MetaCache1");
+        g2IgfsCfg2.setMetaCacheName("g2MetaCache2");
 
         g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
         g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches("g2MetaCache1", "g2MetaCache2"),
              CacheConfiguration.class));
 
-        g2Cfg.setIgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2);
+        g2Cfg.setIgfsConfiguration(g2IgfsCfg1, g2IgfsCfg2);
 
         G.start(g1Cfg);
 
@@ -333,20 +333,20 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
     public void testRemoteIfMetaCacheNameEquals() throws Exception {
         IgniteConfiguration g2Cfg = getConfiguration("g2");
 
-        IgfsConfiguration g2GgfsCfg1 = new IgfsConfiguration(g1GgfsCfg1);
-        IgfsConfiguration g2GgfsCfg2 = new IgfsConfiguration(g1GgfsCfg2);
+        IgfsConfiguration g2IgfsCfg1 = new IgfsConfiguration(g1IgfsCfg1);
+        IgfsConfiguration g2IgfsCfg2 = new IgfsConfiguration(g1IgfsCfg2);
 
-        g2GgfsCfg1.setName("g2GgfsCfg1");
-        g2GgfsCfg2.setName("g2GgfsCfg2");
+        g2IgfsCfg1.setName("g2IgfsCfg1");
+        g2IgfsCfg2.setName("g2IgfsCfg2");
 
-        g2GgfsCfg1.setDataCacheName("g2DataCache1");
-        g2GgfsCfg2.setDataCacheName("g2DataCache2");
+        g2IgfsCfg1.setDataCacheName("g2DataCache1");
+        g2IgfsCfg2.setDataCacheName("g2DataCache2");
 
         g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
         g2Cfg.setCacheConfiguration(concat(dataCaches(1024, "g2DataCache1", "g2DataCache2"), metaCaches(),
              CacheConfiguration.class));
 
-        g2Cfg.setIgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2);
+        g2Cfg.setIgfsConfiguration(g2IgfsCfg1, g2IgfsCfg2);
 
         G.start(g1Cfg);
 
@@ -359,17 +359,17 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
     public void testRemoteIfDataCacheNameDiffers() throws Exception {
         IgniteConfiguration g2Cfg = getConfiguration("g2");
 
-        IgfsConfiguration g2GgfsCfg1 = new IgfsConfiguration(g1GgfsCfg1);
-        IgfsConfiguration g2GgfsCfg2 = new IgfsConfiguration(g1GgfsCfg2);
+        IgfsConfiguration g2IgfsCfg1 = new IgfsConfiguration(g1IgfsCfg1);
+        IgfsConfiguration g2IgfsCfg2 = new IgfsConfiguration(g1IgfsCfg2);
 
-        g2GgfsCfg1.setDataCacheName("g2DataCache1");
-        g2GgfsCfg2.setDataCacheName("g2DataCache2");
+        g2IgfsCfg1.setDataCacheName("g2DataCache1");
+        g2IgfsCfg2.setDataCacheName("g2DataCache2");
 
         g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
         g2Cfg.setCacheConfiguration(concat(dataCaches(1024, "g2DataCache1", "g2DataCache2"), metaCaches(),
              CacheConfiguration.class));
 
-        g2Cfg.setIgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2);
+        g2Cfg.setIgfsConfiguration(g2IgfsCfg1, g2IgfsCfg2);
 
         G.start(g1Cfg);
 
@@ -382,20 +382,20 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
     public void testRemoteIfDataCacheNameEquals() throws Exception {
         IgniteConfiguration g2Cfg = getConfiguration("g2");
 
-        IgfsConfiguration g2GgfsCfg1 = new IgfsConfiguration(g1GgfsCfg1);
-        IgfsConfiguration g2GgfsCfg2 = new IgfsConfiguration(g1GgfsCfg2);
+        IgfsConfiguration g2IgfsCfg1 = new IgfsConfiguration(g1IgfsCfg1);
+        IgfsConfiguration g2IgfsCfg2 = new IgfsConfiguration(g1IgfsCfg2);
 
-        g2GgfsCfg1.setName("g2GgfsCfg1");
-        g2GgfsCfg2.setName("g2GgfsCfg2");
+        g2IgfsCfg1.setName("g2IgfsCfg1");
+        g2IgfsCfg2.setName("g2IgfsCfg2");
 
-        g2GgfsCfg1.setMetaCacheName("g2MetaCache1");
-        g2GgfsCfg2.setMetaCacheName("g2MetaCache2");
+        g2IgfsCfg1.setMetaCacheName("g2MetaCache1");
+        g2IgfsCfg2.setMetaCacheName("g2MetaCache2");
 
         g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
         g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches("g2MetaCache1", "g2MetaCache2"),
              CacheConfiguration.class));
 
-        g2Cfg.setIgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2);
+        g2Cfg.setIgfsConfiguration(g2IgfsCfg1, g2IgfsCfg2);
 
         G.start(g1Cfg);
 
@@ -408,19 +408,19 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
     public void testRemoteIfDefaultModeDiffers() throws Exception {
         IgniteConfiguration g2Cfg = getConfiguration("g2");
 
-        IgfsConfiguration g2GgfsCfg1 = new IgfsConfiguration(g1GgfsCfg1);
-        IgfsConfiguration g2GgfsCfg2 = new IgfsConfiguration(g1GgfsCfg2);
+        IgfsConfiguration g2IgfsCfg1 = new IgfsConfiguration(g1IgfsCfg1);
+        IgfsConfiguration g2IgfsCfg2 = new IgfsConfiguration(g1IgfsCfg2);
 
-        g1GgfsCfg1.setDefaultMode(DUAL_ASYNC);
-        g1GgfsCfg2.setDefaultMode(DUAL_ASYNC);
+        g1IgfsCfg1.setDefaultMode(DUAL_ASYNC);
+        g1IgfsCfg2.setDefaultMode(DUAL_ASYNC);
 
-        g2GgfsCfg1.setDefaultMode(DUAL_SYNC);
-        g2GgfsCfg2.setDefaultMode(DUAL_SYNC);
+        g2IgfsCfg1.setDefaultMode(DUAL_SYNC);
+        g2IgfsCfg2.setDefaultMode(DUAL_SYNC);
 
         g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
         g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
 
-        g2Cfg.setIgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2);
+        g2Cfg.setIgfsConfiguration(g2IgfsCfg1, g2IgfsCfg2);
 
         G.start(g1Cfg);
 
@@ -433,16 +433,16 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
     public void testRemoteIfPathModeDiffers() throws Exception {
         IgniteConfiguration g2Cfg = getConfiguration("g2");
 
-        IgfsConfiguration g2GgfsCfg1 = new IgfsConfiguration(g1GgfsCfg1);
-        IgfsConfiguration g2GgfsCfg2 = new IgfsConfiguration(g1GgfsCfg2);
+        IgfsConfiguration g2IgfsCfg1 = new IgfsConfiguration(g1IgfsCfg1);
+        IgfsConfiguration g2IgfsCfg2 = new IgfsConfiguration(g1IgfsCfg2);
 
-        g2GgfsCfg1.setPathModes(Collections.singletonMap("/somePath", DUAL_SYNC));
-        g2GgfsCfg2.setPathModes(Collections.singletonMap("/somePath", DUAL_SYNC));
+        g2IgfsCfg1.setPathModes(Collections.singletonMap("/somePath", DUAL_SYNC));
+        g2IgfsCfg2.setPathModes(Collections.singletonMap("/somePath", DUAL_SYNC));
 
         g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
         g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
 
-        g2Cfg.setIgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2);
+        g2Cfg.setIgfsConfiguration(g2IgfsCfg1, g2IgfsCfg2);
 
         G.start(g1Cfg);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d6347db/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
index dfad276..70f04fb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
@@ -170,16 +170,16 @@ public abstract class IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest e
                 endPntCfg.put("host", endPntHost);
         }
 
-        IgfsConfiguration ggfsConfiguration = new IgfsConfiguration();
+        IgfsConfiguration igfsConfiguration = new IgfsConfiguration();
 
-        ggfsConfiguration.setDataCacheName("partitioned");
-        ggfsConfiguration.setMetaCacheName("replicated");
-        ggfsConfiguration.setName("igfs" + UUID.randomUUID());
-        ggfsConfiguration.setManagementPort(mgmtPort.getAndIncrement());
+        igfsConfiguration.setDataCacheName("partitioned");
+        igfsConfiguration.setMetaCacheName("replicated");
+        igfsConfiguration.setName("igfs" + UUID.randomUUID());
+        igfsConfiguration.setManagementPort(mgmtPort.getAndIncrement());
 
         if (endPntCfg != null)
-            ggfsConfiguration.setIpcEndpointConfiguration(endPntCfg);
+            igfsConfiguration.setIpcEndpointConfiguration(endPntCfg);
 
-        return ggfsConfiguration;
+        return igfsConfiguration;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d6347db/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
index 8ec07ab..3cc563c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
@@ -87,7 +87,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
     private boolean nearEnabled;
 
     /** IGFS maximum space. */
-    private long ggfsMaxData;
+    private long igfsMaxData;
 
     /** Trash purge timeout. */
     private long trashPurgeTimeout;
@@ -96,7 +96,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
     @Override protected void beforeTest() throws Exception {
         cacheMode = null;
         nearEnabled = false;
-        ggfsMaxData = 0;
+        igfsMaxData = 0;
         trashPurgeTimeout = 0;
 
         mgmtPort = 11400;
@@ -111,16 +111,16 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(gridName);
 
-        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
+        IgfsConfiguration igfsCfg = new IgfsConfiguration();
 
-        ggfsCfg.setDataCacheName(DATA_CACHE_NAME);
-        ggfsCfg.setMetaCacheName(META_CACHE_NAME);
-        ggfsCfg.setName(IGFS_NAME);
-        ggfsCfg.setBlockSize(BLOCK_SIZE);
-        ggfsCfg.setFragmentizerEnabled(false);
-        ggfsCfg.setMaxSpaceSize(ggfsMaxData);
-        ggfsCfg.setTrashPurgeTimeout(trashPurgeTimeout);
-        ggfsCfg.setManagementPort(++mgmtPort);
+        igfsCfg.setDataCacheName(DATA_CACHE_NAME);
+        igfsCfg.setMetaCacheName(META_CACHE_NAME);
+        igfsCfg.setName(IGFS_NAME);
+        igfsCfg.setBlockSize(BLOCK_SIZE);
+        igfsCfg.setFragmentizerEnabled(false);
+        igfsCfg.setMaxSpaceSize(igfsMaxData);
+        igfsCfg.setTrashPurgeTimeout(trashPurgeTimeout);
+        igfsCfg.setManagementPort(++mgmtPort);
 
         CacheConfiguration dataCfg = defaultCacheConfiguration();
 
@@ -154,7 +154,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
 
         cfg.setDiscoverySpi(discoSpi);
         cfg.setCacheConfiguration(metaCfg, dataCfg);
-        cfg.setIgfsConfiguration(ggfsCfg);
+        cfg.setIgfsConfiguration(igfsCfg);
 
         return cfg;
     }
@@ -350,7 +350,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
             for (int i = 0; i < GRID_CNT; i++) {
                 int total = 0;
 
-                IgfsInputStream is = ggfs(i).open(file.path());
+                IgfsInputStream is = igfs(i).open(file.path());
 
                 while (true) {
                     int read = is.read(buf);
@@ -399,7 +399,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
 
         // Delete data and ensure that all counters are 0 now.
         for (IgfsFile file : files) {
-            ggfs(0).delete(file.path(), false);
+            igfs(0).delete(file.path(), false);
 
             // Await for actual delete to occur.
             for (IgfsBlock block : file.blocks()) {
@@ -423,26 +423,26 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     private void checkOversize() throws Exception {
-        ggfsMaxData = BLOCK_SIZE;
+        igfsMaxData = BLOCK_SIZE;
 
         startUp();
 
         final IgfsPath path = new IgfsPath("/file");
 
         // This write is expected to be successful.
-        IgfsOutputStream os = ggfs(0).create(path, false);
+        IgfsOutputStream os = igfs(0).create(path, false);
         os.write(chunk(BLOCK_SIZE - 1));
         os.close();
 
         // This write must be successful as well.
-        os = ggfs(0).append(path, false);
+        os = igfs(0).append(path, false);
         os.write(chunk(1));
         os.close();
 
         // This write must fail w/ exception.
         GridTestUtils.assertThrows(log(), new Callable<Object>() {
             @Override public Object call() throws Exception {
-                IgfsOutputStream osErr = ggfs(0).append(path, false);
+                IgfsOutputStream osErr = igfs(0).append(path, false);
 
                 try {
                     osErr.write(chunk(BLOCK_SIZE));
@@ -463,7 +463,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
                 }
             }
         }, IgfsOutOfSpaceException.class, "Failed to write data block (IGFS maximum data size exceeded) [used=" +
-            ggfsMaxData + ", allowed=" + ggfsMaxData + ']');
+            igfsMaxData + ", allowed=" + igfsMaxData + ']');
     }
 
     /**
@@ -474,27 +474,27 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
     private void checkOversizeDelay() throws Exception {
         final CountDownLatch latch = new CountDownLatch(1);
 
-        ggfsMaxData = 256;
+        igfsMaxData = 256;
         trashPurgeTimeout = 2000;
 
         startUp();
 
-        IgfsImpl ggfs = ggfs(0);
+        IgfsImpl igfs = igfs(0);
 
         final IgfsPath path = new IgfsPath("/file");
         final IgfsPath otherPath = new IgfsPath("/fileOther");
 
         // Fill cache with data up to it's limit.
-        IgfsOutputStream os = ggfs.create(path, false);
-        os.write(chunk((int)ggfsMaxData));
+        IgfsOutputStream os = igfs.create(path, false);
+        os.write(chunk((int)igfsMaxData));
         os.close();
 
-        final GridCache<IgniteUuid, IgfsFileInfo> metaCache = ggfs.context().kernalContext().cache().cache(
-            ggfs.configuration().getMetaCacheName());
+        final GridCache<IgniteUuid, IgfsFileInfo> metaCache = igfs.context().kernalContext().cache().cache(
+            igfs.configuration().getMetaCacheName());
 
         // Start a transaction in a separate thread which will lock file ID.
-        final IgniteUuid id = ggfs.context().meta().fileId(path);
-        final IgfsFileInfo info = ggfs.context().meta().info(id);
+        final IgniteUuid id = igfs.context().meta().fileId(path);
+        final IgfsFileInfo info = igfs.context().meta().info(id);
 
         final AtomicReference<Throwable> err = new AtomicReference<>();
 
@@ -542,7 +542,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
             assert metaCache.get(TRASH_ID) != null;
 
             // Now the file is locked and is located in trash, try adding some more data.
-            os = ggfs.create(otherPath, false);
+            os = igfs.create(otherPath, false);
             os.write(new byte[1]);
 
             latch.countDown();
@@ -674,9 +674,9 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     private IgfsBlockKey blockKey(IgfsPath path, long blockId) throws Exception {
-        IgfsEx ggfs0 = (IgfsEx)grid(0).fileSystem(IGFS_NAME);
+        IgfsEx igfs0 = (IgfsEx)grid(0).fileSystem(IGFS_NAME);
 
-        IgniteUuid fileId = ggfs0.context().meta().fileId(path);
+        IgniteUuid fileId = igfs0.context().meta().fileId(path);
 
         return new IgfsBlockKey(fileId, null, true, blockId);
     }
@@ -724,7 +724,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
      * @return IGFS.
      * @throws Exception If failed.
      */
-    private IgfsImpl ggfs(int idx) throws Exception {
+    private IgfsImpl igfs(int idx) throws Exception {
         return (IgfsImpl)grid(idx).fileSystem(IGFS_NAME);
     }
 
@@ -735,7 +735,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
      * @return IGFS.
      * @throws Exception If failed.
      */
-    private IgfsImpl ggfs(Ignite ignite) throws Exception {
+    private IgfsImpl igfs(Ignite ignite) throws Exception {
         return (IgfsImpl) ignite.fileSystem(IGFS_NAME);
     }
 
@@ -765,9 +765,9 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
             // Create empty file locally.
             IgfsPath path = new IgfsPath("/file-" + i);
 
-            ggfs(0).create(path, false).close();
+            igfs(0).create(path, false).close();
 
-            IgfsMetaManager meta = ggfs(0).context().meta();
+            IgfsMetaManager meta = igfs(0).context().meta();
 
             IgniteUuid fileId = meta.fileId(path);
 
@@ -789,7 +789,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
 
             // Actual write.
             for (IgfsBlock block : blocks) {
-                IgfsOutputStream os = ggfs(0).append(path, false);
+                IgfsOutputStream os = igfs(0).append(path, false);
 
                 os.write(chunk(block.length()));
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d6347db/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
index efd578e..bbd7432 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
@@ -110,15 +110,15 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
 
         cfg.setDiscoverySpi(discoSpi);
 
-        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
+        IgfsConfiguration igfsCfg = new IgfsConfiguration();
 
-        ggfsCfg.setMetaCacheName(META_CACHE_NAME);
-        ggfsCfg.setDataCacheName(DATA_CACHE_NAME);
-        ggfsCfg.setName("igfs");
-        ggfsCfg.setBlockSize(CFG_BLOCK_SIZE);
-        ggfsCfg.setFragmentizerEnabled(true);
+        igfsCfg.setMetaCacheName(META_CACHE_NAME);
+        igfsCfg.setDataCacheName(DATA_CACHE_NAME);
+        igfsCfg.setName("igfs");
+        igfsCfg.setBlockSize(CFG_BLOCK_SIZE);
+        igfsCfg.setFragmentizerEnabled(true);
 
-        cfg.setIgfsConfiguration(ggfsCfg);
+        cfg.setIgfsConfiguration(igfsCfg);
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d6347db/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
index 4d441ed..5b7a636 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
@@ -68,7 +68,7 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
     private static final int REPEAT_CNT = 10;
 
     /** IGFS. */
-    private static IgniteFs ggfs;
+    private static IgniteFs igfs;
 
     /** {@inheritDoc} */
     @Override protected void beforeTestsStarted() throws Exception {
@@ -76,7 +76,7 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
             Ignite g = G.start(config(i));
 
             if (i + 1 == NODE_CNT)
-                ggfs = g.fileSystem("igfs");
+                igfs = g.fileSystem("igfs");
         }
     }
 
@@ -87,7 +87,7 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
-        ggfs.format();
+        igfs.format();
     }
 
     /**
@@ -97,14 +97,14 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
      * @return Grid configuration
      */
     private IgniteConfiguration config(int idx) {
-        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
+        IgfsConfiguration igfsCfg = new IgfsConfiguration();
 
-        ggfsCfg.setDataCacheName("dataCache");
-        ggfsCfg.setMetaCacheName("metaCache");
-        ggfsCfg.setName("igfs");
-        ggfsCfg.setBlockSize(BLOCK_SIZE);
-        ggfsCfg.setDefaultMode(PRIMARY);
-        ggfsCfg.setFragmentizerEnabled(false);
+        igfsCfg.setDataCacheName("dataCache");
+        igfsCfg.setMetaCacheName("metaCache");
+        igfsCfg.setName("igfs");
+        igfsCfg.setBlockSize(BLOCK_SIZE);
+        igfsCfg.setDefaultMode(PRIMARY);
+        igfsCfg.setFragmentizerEnabled(false);
 
         CacheConfiguration dataCacheCfg = new CacheConfiguration();
 
@@ -133,7 +133,7 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
 
         cfg.setDiscoverySpi(discoSpi);
         cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg);
-        cfg.setIgfsConfiguration(ggfsCfg);
+        cfg.setIgfsConfiguration(igfsCfg);
 
         cfg.setGridName("node-" + idx);
 
@@ -152,9 +152,9 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
             String arg = DICTIONARY[new Random(System.currentTimeMillis()).nextInt(DICTIONARY.length)];
 
             generateFile(TOTAL_WORDS);
-            Long genLen = ggfs.info(FILE).length();
+            Long genLen = igfs.info(FILE).length();
 
-            IgniteBiTuple<Long, Integer> taskRes = ggfs.execute(new Task(),
+            IgniteBiTuple<Long, Integer> taskRes = igfs.execute(new Task(),
                 new IgfsStringDelimiterRecordResolver(" "), Collections.singleton(FILE), arg);
 
             assert F.eq(genLen, taskRes.getKey());
@@ -170,22 +170,22 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
     public void testTaskAsync() throws Exception {
         U.sleep(3000);
 
-        assertFalse(ggfs.isAsync());
+        assertFalse(igfs.isAsync());
 
-        IgniteFs ggfsAsync = ggfs.withAsync();
+        IgniteFs igfsAsync = igfs.withAsync();
 
-        assertTrue(ggfsAsync.isAsync());
+        assertTrue(igfsAsync.isAsync());
 
         for (int i = 0; i < REPEAT_CNT; i++) {
             String arg = DICTIONARY[new Random(System.currentTimeMillis()).nextInt(DICTIONARY.length)];
 
             generateFile(TOTAL_WORDS);
-            Long genLen = ggfs.info(FILE).length();
+            Long genLen = igfs.info(FILE).length();
 
-            assertNull(ggfsAsync.execute(
+            assertNull(igfsAsync.execute(
                 new Task(), new IgfsStringDelimiterRecordResolver(" "), Collections.singleton(FILE), arg));
 
-            IgniteFuture<IgniteBiTuple<Long, Integer>> fut = ggfsAsync.future();
+            IgniteFuture<IgniteBiTuple<Long, Integer>> fut = igfsAsync.future();
 
             assertNotNull(fut);
 
@@ -195,9 +195,9 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
             assert F.eq(TOTAL_WORDS, taskRes.getValue());
         }
 
-        ggfsAsync.format();
+        igfsAsync.format();
 
-        IgniteFuture<?> fut = ggfsAsync.future();
+        IgniteFuture<?> fut = igfsAsync.future();
 
         assertNotNull(fut);
 
@@ -214,7 +214,7 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
         throws Exception {
         Random rnd = new Random(System.currentTimeMillis());
 
-        try (OutputStreamWriter writer = new OutputStreamWriter(ggfs.create(FILE, true))) {
+        try (OutputStreamWriter writer = new OutputStreamWriter(igfs.create(FILE, true))) {
             int cnt = 0;
 
             while (cnt < wordCnt) {


Mime
View raw message