ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [1/5] ignite git commit: IGNITE-3931: IGFS: Test fixes for PROXY mode. This closes #1102.
Date Mon, 26 Sep 2016 07:38:07 GMT
Repository: ignite
Updated Branches:
  refs/heads/master e5b3546b3 -> cc57e2d62


IGNITE-3931: IGFS: Test fixes for PROXY mode. This closes #1102.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/062ecd75
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/062ecd75
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/062ecd75

Branch: refs/heads/master
Commit: 062ecd75908131084e27883f3f160f3504e92165
Parents: 29f508b
Author: tledkov-gridgain <tledkov@gridgain.com>
Authored: Fri Sep 23 14:05:17 2016 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Fri Sep 23 14:05:17 2016 +0300

----------------------------------------------------------------------
 .../local/LocalIgfsSecondaryFileSystem.java     |  13 +-
 .../internal/processors/igfs/IgfsImpl.java      |  16 +-
 .../igfs/IgfsAbstractBaseSelfTest.java          |   2 +-
 .../processors/igfs/IgfsAbstractSelfTest.java   |  26 +-
 ...SecondaryFileSystemDualAbstractSelfTest.java |   3 +-
 ...lSecondaryFileSystemProxyClientSelfTest.java |  28 ++
 ...fsLocalSecondaryFileSystemProxySelfTest.java | 272 +++++++++++++++++++
 .../processors/igfs/IgfsProxySelfTest.java      |   2 +-
 .../ignite/testsuites/IgniteIgfsTestSuite.java  |   8 +
 9 files changed, 345 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/062ecd75/modules/core/src/main/java/org/apache/ignite/igfs/secondary/local/LocalIgfsSecondaryFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/secondary/local/LocalIgfsSecondaryFileSystem.java
b/modules/core/src/main/java/org/apache/ignite/igfs/secondary/local/LocalIgfsSecondaryFileSystem.java
index c84fcf2..8dd4fda 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/secondary/local/LocalIgfsSecondaryFileSystem.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/secondary/local/LocalIgfsSecondaryFileSystem.java
@@ -115,40 +115,41 @@ public class LocalIgfsSecondaryFileSystem implements IgfsSecondaryFileSystem,
Li
         if (!recursive)
             return f.delete();
         else
-            return deleteRecursive(f);
+            return deleteRecursive(f, false);
     }
 
     /**
      * Delete directory recursively.
      *
      * @param f Directory.
+     * @param deleteIfExists Ignore delete errors if the file doesn't exist.
      * @return {@code true} if successful.
      */
-    private boolean deleteRecursive(File f) {
+    private boolean deleteRecursive(File f, boolean deleteIfExists) {
         BasicFileAttributes attrs;
 
         try {
             attrs = Files.readAttributes(f.toPath(), BasicFileAttributes.class, LinkOption.NOFOLLOW_LINKS);
         }
         catch (IOException ignore) {
-            return false;
+            return deleteIfExists && !f.exists();
         }
 
         if (!attrs.isDirectory() || attrs.isSymbolicLink())
-            return f.delete();
+            return f.delete() || (deleteIfExists && !f.exists());
 
         File[] entries = f.listFiles();
 
         if (entries != null) {
             for (File entry : entries) {
-                boolean res = deleteRecursive(entry);
+                boolean res = deleteRecursive(entry, true);
 
                 if (!res)
                     return false;
             }
         }
 
-        return f.delete();
+        return f.delete() || (deleteIfExists && !f.exists());
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/062ecd75/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 bee9d9a..6ff1f8f 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
@@ -1232,10 +1232,20 @@ public final class IgfsImpl implements IgfsEx {
             @Override public Void call() throws Exception {
                 IgfsMode mode = resolveMode(path);
 
-                boolean useSecondary = IgfsUtils.isDualMode(mode) && secondaryFs
instanceof IgfsSecondaryFileSystemV2;
+                if (mode == PROXY) {
+                    if (secondaryFs instanceof IgfsSecondaryFileSystemV2)
+                        ((IgfsSecondaryFileSystemV2)secondaryFs).setTimes(path, accessTime,
modificationTime);
+                    else
+                        throw new UnsupportedOperationException("setTimes is not supported
in PROXY mode for " +
+                            "this secondary file system,");
+                }
+                else {
+                    boolean useSecondary =
+                        IgfsUtils.isDualMode(mode) && secondaryFs instanceof IgfsSecondaryFileSystemV2;
 
-                meta.updateTimes(path, accessTime, modificationTime,
-                    useSecondary ? (IgfsSecondaryFileSystemV2)secondaryFs : null);
+                    meta.updateTimes(path, accessTime, modificationTime,
+                        useSecondary ? (IgfsSecondaryFileSystemV2) secondaryFs : null);
+                }
 
                 return null;
             }

http://git-wip-us.apache.org/repos/asf/ignite/blob/062ecd75/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
index 14a653b..58c4c50 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
@@ -713,7 +713,7 @@ public abstract class IgfsAbstractBaseSelfTest extends IgfsCommonAbstractTest
{
         throws Exception {
         checkNotExist(igfs, paths);
 
-        if (dual)
+        if (mode != PRIMARY)
             checkNotExist(igfsSecondary, paths);
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/062ecd75/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
index a115e03..e8d65f1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
@@ -61,6 +61,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
+import static org.apache.ignite.igfs.IgfsMode.PRIMARY;
+import static org.apache.ignite.igfs.IgfsMode.PROXY;
+
 /**
  * Test fo regular igfs operations.
  */
@@ -657,6 +660,9 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest
{
      */
     @SuppressWarnings("ConstantConditions")
     public void testFormat() throws Exception {
+        if (mode == PROXY)
+            return;
+
         final GridCacheAdapter<IgfsBlockKey, byte[]> dataCache = getDataCache(igfs);
 
         assert dataCache != null;
@@ -1010,7 +1016,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest
{
      * @throws Exception If failed.
      */
     public void testCreateNoClose() throws Exception {
-        if (dual)
+        if (mode != PRIMARY)
             return;
 
         create(igfs, paths(DIR, SUBDIR), null);
@@ -1089,7 +1095,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest
{
      * @throws Exception If failed.
      */
     public void testCreateDeleteNoClose() throws Exception {
-        if (dual)
+        if (mode != PRIMARY)
             return;
 
         create(igfs, paths(DIR, SUBDIR), null);
@@ -1143,7 +1149,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest
{
      * @throws Exception If failed.
      */
     public void testCreateDeleteParentNoClose() throws Exception {
-        if (dual)
+        if (mode != PRIMARY)
             return;
 
         create(igfs, paths(DIR, SUBDIR), null);
@@ -1541,7 +1547,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest
{
      * @throws Exception If failed.
      */
     public void testAppendNoClose() throws Exception {
-        if (dual)
+        if (mode != PRIMARY)
             return;
 
         if (appendSupported()) {
@@ -1631,7 +1637,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest
{
      * @throws Exception If failed.
      */
     public void testAppendDeleteNoClose() throws Exception {
-        if (dual)
+        if (mode != PRIMARY)
             return;
 
         if (appendSupported()) {
@@ -1686,7 +1692,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest
{
      * @throws Exception If failed.
      */
     public void testAppendDeleteParentNoClose() throws Exception {
-        if (dual)
+        if (mode != PRIMARY)
             return;
 
         if (appendSupported()) {
@@ -2154,9 +2160,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest
{
                     U.awaitQuiet(barrier);
 
                     try {
-                        igfs.delete(SUBDIR, true);
-
-                        return true;
+                        return igfs.delete(SUBDIR, true);
                     }
                     catch (IgniteException ignored) {
                         return false;
@@ -2169,9 +2173,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest
{
                     U.awaitQuiet(barrier);
 
                     try {
-                        igfs.delete(SUBSUBDIR, true);
-
-                        return true;
+                        return igfs.delete(SUBSUBDIR, true);
                     }
                     catch (IgniteException ignored) {
                         return false;

http://git-wip-us.apache.org/repos/asf/ignite/blob/062ecd75/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemDualAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemDualAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemDualAbstractSelfTest.java
index 8baaf4a..0e6fc48 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemDualAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemDualAbstractSelfTest.java
@@ -66,7 +66,7 @@ public abstract class IgfsLocalSecondaryFileSystemDualAbstractSelfTest extends
I
      *
      * @param mode IGFS mode.
      */
-    public IgfsLocalSecondaryFileSystemDualAbstractSelfTest(IgfsMode mode) {
+    protected IgfsLocalSecondaryFileSystemDualAbstractSelfTest(IgfsMode mode) {
         super(mode);
     }
 
@@ -82,7 +82,6 @@ public abstract class IgfsLocalSecondaryFileSystemDualAbstractSelfTest extends
I
             cleanDirectory(extDir);
     }
 
-
     /**
      * Creates secondary filesystems.
      * @return IgfsSecondaryFileSystem

http://git-wip-us.apache.org/repos/asf/ignite/blob/062ecd75/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemProxyClientSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemProxyClientSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemProxyClientSelfTest.java
new file mode 100644
index 0000000..4e5d85f
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemProxyClientSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.igfs;
+
+/**
+ * Tests for PROXY mode with local FS is configured as a secondary.
+ */
+public class IgfsLocalSecondaryFileSystemProxyClientSelfTest extends IgfsLocalSecondaryFileSystemProxySelfTest
{
+    /** {@inheritDoc} */
+    @Override protected boolean client() {
+        return true;
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/062ecd75/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemProxySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemProxySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemProxySelfTest.java
new file mode 100644
index 0000000..848abe2
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemProxySelfTest.java
@@ -0,0 +1,272 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.igfs;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.util.Collection;
+import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.igfs.IgfsFile;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem;
+import org.apache.ignite.igfs.secondary.local.LocalIgfsSecondaryFileSystem;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiInClosure;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Tests for PROXY mode with local FS is configured as a secondary.
+ */
+public class IgfsLocalSecondaryFileSystemProxySelfTest extends IgfsProxySelfTest {
+    /** Fs work directory. */
+    private static final String FS_WORK_DIR = U.getIgniteHome() + File.separatorChar + "work"
+        + File.separatorChar + "fs";
+
+    /** */
+    private static final String FS_EXT_DIR = U.getIgniteHome() + File.separatorChar + "work"
+        + File.separatorChar + "ext";
+
+    /** */
+    private final File dirLinkDest = new File(FS_EXT_DIR + File.separatorChar + "extdir");
+
+    /** */
+    private final File fileLinkDest =
+        new File(FS_EXT_DIR + File.separatorChar + "extdir" + File.separatorChar + "filedest");
+
+    /** */
+    private final File dirLinkSrc = new File(FS_WORK_DIR + File.separatorChar + "dir");
+
+    /** */
+    private final File fileLinkSrc = new File(FS_WORK_DIR + File.separatorChar + "file");
+
+    /**
+     * Creates secondary filesystems.
+     * @return IgfsSecondaryFileSystem
+     * @throws Exception On failure.
+     */
+    @Override protected IgfsSecondaryFileSystem createSecondaryFileSystemStack() throws Exception
{
+        final File workDir = new File(FS_WORK_DIR);
+
+        if (!workDir.exists())
+            assert workDir.mkdirs();
+
+        LocalIgfsSecondaryFileSystem second = new LocalIgfsSecondaryFileSystem();
+
+        second.setWorkDirectory(workDir.getAbsolutePath());
+
+        igfsSecondary = new IgfsLocalSecondaryFileSystemTestAdapter(workDir);
+
+        return second;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void beforeTest() throws Exception {
+        super.beforeTest();
+
+        final File extDir = new File(FS_EXT_DIR);
+
+        if (!extDir.exists())
+            assert extDir.mkdirs();
+        else
+            cleanDirectory(extDir);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected boolean permissionsSupported() {
+        return false;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected boolean propertiesSupported() {
+        return false;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected boolean timesSupported() {
+        return false;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void testUpdatePathDoesNotExist() throws Exception {
+        fail("IGNITE-3645");
+    }
+
+    /**
+     *
+     * @throws Exception If failed.
+     */
+    @SuppressWarnings("ConstantConditions")
+    public void testListPathForSymlink() throws Exception {
+        if (U.isWindows())
+            return;
+
+        createSymlinks();
+
+        assertTrue(igfs.info(DIR).isDirectory());
+
+        Collection<IgfsPath> pathes = igfs.listPaths(DIR);
+        Collection<IgfsFile> files = igfs.listFiles(DIR);
+
+        assertEquals(1, pathes.size());
+        assertEquals(1, files.size());
+
+        assertEquals("filedest", F.first(pathes).name());
+        assertEquals("filedest", F.first(files).path().name());
+    }
+
+    /**
+     *
+     * @throws Exception If failed.
+     */
+    public void testDeleteSymlinkDir() throws Exception {
+        if (U.isWindows())
+            return;
+
+        createSymlinks();
+
+        // Only symlink must be deleted. Destination content must be exist.
+        igfs.delete(DIR, true);
+
+        assertTrue(fileLinkDest.exists());
+    }
+
+    /**
+     *
+     * @throws Exception If failed.
+     */
+    public void testSymlinkToFile() throws Exception {
+        if (U.isWindows())
+            return;
+
+        createSymlinks();
+
+        checkFileContent(igfs, new IgfsPath("/file"), chunk);
+    }
+
+    /**
+     *
+     * @throws Exception If failed.
+     */
+    public void testMkdirsInsideSymlink() throws Exception {
+        if (U.isWindows())
+            return;
+
+        createSymlinks();
+
+        igfs.mkdirs(SUBSUBDIR);
+
+        assertTrue(Files.isDirectory(dirLinkDest.toPath().resolve("subdir/subsubdir")));
+        assertTrue(Files.isDirectory(dirLinkSrc.toPath().resolve("subdir/subsubdir")));
+    }
+
+    /**
+     *
+     * @throws Exception If failed.
+     */
+    public void testUsedSpaceSize() throws Exception {
+        final int DIRS_COUNT = 5;
+        final int DIRS_MAX_DEEP = 3;
+        final int FILES_COUNT = 10;
+        final AtomicLong totalSize = new AtomicLong();
+
+        IgniteBiInClosure<Integer, IgfsPath> createHierarchy = new IgniteBiInClosure<Integer,
IgfsPath>() {
+            @Override public void apply(Integer level, IgfsPath levelDir) {
+                try {
+                    for (int i = 0; i < FILES_COUNT; ++i) {
+                        IgfsPath filePath = new IgfsPath(levelDir, "file" + Integer.toString(i));
+
+                        createFile(igfs, filePath, true, chunk);
+
+                        totalSize.getAndAdd(chunk.length);
+                    }
+
+                    if (level < DIRS_MAX_DEEP) {
+                        for (int dir = 0; dir < DIRS_COUNT; dir++) {
+                            IgfsPath dirPath = new IgfsPath(levelDir, "dir" + Integer.toString(dir));
+
+                            igfs.mkdirs(dirPath);
+
+                            apply(level + 1, dirPath);
+                        }
+                    }
+                } catch (Exception e) {
+                    fail(e.getMessage());
+                }
+            }
+        };
+
+        createHierarchy.apply(1, new IgfsPath("/dir"));
+
+        assertEquals(totalSize.get(), igfs.metrics().secondarySpaceSize());
+    }
+
+    /**
+     *
+     * @throws Exception If failed.
+     */
+    private void createSymlinks() throws Exception {
+        assert dirLinkDest.mkdir();
+
+        createFile(fileLinkDest, true, chunk);
+
+        Files.createSymbolicLink(dirLinkSrc.toPath(), dirLinkDest.toPath());
+        Files.createSymbolicLink(fileLinkSrc.toPath(), fileLinkDest.toPath());
+    }
+
+    /**
+     * @param dir Directory to clean.
+     */
+    private static void cleanDirectory(File dir){
+        File[] entries = dir.listFiles();
+
+        if (entries != null) {
+            for (File entry : entries) {
+                if (entry.isDirectory()) {
+                    cleanDirectory(entry);
+
+                    assert entry.delete();
+                }
+                else
+                    assert entry.delete();
+            }
+        }
+    }
+
+    /**
+     * @param f File object.
+     * @param overwrite Overwrite flag.
+     * @param chunks File content.
+     * @throws IOException If failed.
+     */
+    private static void createFile(File f, boolean overwrite, @Nullable byte[]... chunks)
throws IOException {
+        OutputStream os = null;
+
+        try {
+            os = new FileOutputStream(f, overwrite);
+
+            writeFileChunks(os, chunks);
+        }
+        finally {
+            U.closeQuiet(os);
+        }
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/062ecd75/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProxySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProxySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProxySelfTest.java
index 3b8c606..73835a5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProxySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProxySelfTest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.igfs;
 import static org.apache.ignite.igfs.IgfsMode.PROXY;
 
 /**
- * Tests for PRIMARY mode.
+ * Tests for PROXY mode.
  */
 public class IgfsProxySelfTest extends IgfsAbstractSelfTest {
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/062ecd75/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java
index 0241068..5a7e3d7 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java
@@ -29,6 +29,7 @@ import org.apache.ignite.internal.processors.igfs.IgfsCachePerBlockLruEvictionPo
 import org.apache.ignite.internal.processors.igfs.IgfsCacheSelfTest;
 import org.apache.ignite.internal.processors.igfs.IgfsDualAsyncClientSelfTest;
 import org.apache.ignite.internal.processors.igfs.IgfsDualSyncClientSelfTest;
+import org.apache.ignite.internal.processors.igfs.IgfsLocalSecondaryFileSystemProxyClientSelfTest;
 import org.apache.ignite.internal.processors.igfs.IgfsMaxSizeSelfTest;
 import org.apache.ignite.internal.processors.igfs.IgfsPrimaryClientSelfTest;
 import org.apache.ignite.internal.processors.igfs.IgfsDataManagerSelfTest;
@@ -52,6 +53,8 @@ import org.apache.ignite.internal.processors.igfs.IgfsPrimaryRelaxedConsistencyS
 import org.apache.ignite.internal.processors.igfs.IgfsPrimarySelfTest;
 import org.apache.ignite.internal.processors.igfs.IgfsProcessorSelfTest;
 import org.apache.ignite.internal.processors.igfs.IgfsProcessorValidationSelfTest;
+import org.apache.ignite.internal.processors.igfs.IgfsProxySelfTest;
+import org.apache.ignite.internal.processors.igfs.IgfsLocalSecondaryFileSystemProxySelfTest;
 import org.apache.ignite.internal.processors.igfs.IgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest;
 import org.apache.ignite.internal.processors.igfs.IgfsSizeSelfTest;
 import org.apache.ignite.internal.processors.igfs.IgfsStartCacheTest;
@@ -151,6 +154,11 @@ public class IgniteIgfsTestSuite extends TestSuite {
 
         suite.addTestSuite(IgfsMaxSizeSelfTest.class);
 
+
+        suite.addTestSuite(IgfsProxySelfTest.class);
+        suite.addTestSuite(IgfsLocalSecondaryFileSystemProxySelfTest.class);
+        suite.addTestSuite(IgfsLocalSecondaryFileSystemProxyClientSelfTest.class);
+
         return suite;
     }
 }
\ No newline at end of file


Mime
View raw message