IGNITE-3531: Renamed IgniteFileSystem.format() to clear().
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0ccb8569 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0ccb8569 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0ccb8569 Branch: refs/heads/ignite-4003 Commit: 0ccb8569bd3f7b4bbcdb435612867a6723d4a506 Parents: b465301 Author: devozerov <[email protected]> Authored: Thu Apr 6 14:02:09 2017 +0300 Committer: devozerov <[email protected]> Committed: Thu Apr 6 14:02:09 2017 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/IgniteFileSystem.java | 26 ++++++-------------- .../internal/processors/igfs/IgfsAsyncImpl.java | 8 +++--- .../internal/processors/igfs/IgfsImpl.java | 10 ++++---- .../visor/igfs/VisorIgfsFormatTask.java | 2 +- .../ignite/igfs/IgfsEventsAbstractSelfTest.java | 2 +- .../igfs/IgfsFragmentizerAbstractSelfTest.java | 2 +- .../ignite/igfs/IgfsFragmentizerSelfTest.java | 2 +- ...faultIgfsSecondaryFileSystemTestAdapter.java | 2 +- .../igfs/IgfsAbstractBaseSelfTest.java | 2 +- .../processors/igfs/IgfsAbstractSelfTest.java | 4 +-- ...sCachePerBlockLruEvictionPolicySelfTest.java | 2 +- .../igfs/IgfsMetaManagerSelfTest.java | 2 +- .../processors/igfs/IgfsMetricsSelfTest.java | 2 +- .../internal/processors/igfs/IgfsMock.java | 4 +-- .../processors/igfs/IgfsProcessorSelfTest.java | 8 +++--- .../processors/igfs/IgfsStreamsSelfTest.java | 2 +- .../processors/igfs/IgfsTaskSelfTest.java | 2 +- .../IgfsAbstractRecordResolverSelfTest.java | 2 +- .../impl/HadoopTaskExecutionSelfTest.java | 2 +- ...opClientProtocolMultipleServersSelfTest.java | 2 +- .../client/HadoopClientProtocolSelfTest.java | 2 +- .../hadoop/impl/igfs/IgfsEventsTestSuite.java | 2 +- 22 files changed, 41 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0ccb8569/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java b/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java index 78c86dc..0100c7b 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java @@ -31,7 +31,6 @@ import org.apache.ignite.igfs.IgfsPathSummary; import org.apache.ignite.igfs.mapreduce.IgfsRecordResolver; import org.apache.ignite.igfs.mapreduce.IgfsTask; import org.apache.ignite.lang.IgniteAsyncSupport; -import org.apache.ignite.lang.IgniteAsyncSupported; import org.apache.ignite.lang.IgniteFuture; import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; @@ -266,28 +265,23 @@ public interface IgniteFileSystem extends IgniteAsyncSupport { public long size(IgfsPath path) throws IgniteException; /** - * Formats the file system removing all existing entries from it. - * <p> - * Supports asynchronous execution (see {@link IgniteAsyncSupport}). + * Formats the file system removing all existing entries from it, but not removing anything in secondary + * file system (if any). * - * @throws IgniteException In case format has failed. + * @throws IgniteException In case clear failed. */ - @IgniteAsyncSupported - public void format() throws IgniteException; + public void clear() throws IgniteException; /** - * Asynchronously formats the file system removing all existing entries from it. - * <p> + * Formats the file system removing all existing entries from it, but not removing anything in secondary + * file system (if any). * - * @return a Future representing pending completion of the format operation. - * @throws IgniteException In case format has failed. + * @return Future representing pending completion of the clear operation. */ - public IgniteFuture<Void> formatAsync() throws IgniteException; + public IgniteFuture<Void> clearAsync() throws IgniteException; /** * Executes IGFS task. - * <p> - * Supports asynchronous execution (see {@link IgniteAsyncSupport}). * * @param task Task to execute. * @param rslvr Optional resolver to control split boundaries. @@ -296,7 +290,6 @@ public interface IgniteFileSystem extends IgniteAsyncSupport { * @return Task result. * @throws IgniteException If execution failed. */ - @IgniteAsyncSupported public <T, R> R execute(IgfsTask<T, R> task, @Nullable IgfsRecordResolver rslvr, Collection<IgfsPath> paths, @Nullable T arg) throws IgniteException; @@ -331,7 +324,6 @@ public interface IgniteFileSystem extends IgniteAsyncSupport { * @return Task result. * @throws IgniteException If execution failed. */ - @IgniteAsyncSupported public <T, R> R execute(IgfsTask<T, R> task, @Nullable IgfsRecordResolver rslvr, Collection<IgfsPath> paths, boolean skipNonExistentFiles, long maxRangeLen, @Nullable T arg) throws IgniteException; @@ -367,7 +359,6 @@ public interface IgniteFileSystem extends IgniteAsyncSupport { * @return Task result. * @throws IgniteException If execution failed. */ - @IgniteAsyncSupported public <T, R> R execute(Class<? extends IgfsTask<T, R>> taskCls, @Nullable IgfsRecordResolver rslvr, Collection<IgfsPath> paths, @Nullable T arg) throws IgniteException; @@ -401,7 +392,6 @@ public interface IgniteFileSystem extends IgniteAsyncSupport { * @return Task result. * @throws IgniteException If execution failed. */ - @IgniteAsyncSupported public <T, R> R execute(Class<? extends IgfsTask<T, R>> taskCls, @Nullable IgfsRecordResolver rslvr, Collection<IgfsPath> paths, boolean skipNonExistentFiles, long maxRangeLen, @Nullable T arg) throws IgniteException; http://git-wip-us.apache.org/repos/asf/ignite/blob/0ccb8569/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java index b5289a3..528c18f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java @@ -58,9 +58,9 @@ public class IgfsAsyncImpl extends AsyncSupportAdapter<IgniteFileSystem> impleme } /** {@inheritDoc} */ - @Override public void format() { + @Override public void clear() { try { - saveOrGet(igfs.formatAsync0()); + saveOrGet(igfs.clearAsync0()); } catch (IgniteCheckedException e) { throw U.convertException(e); @@ -68,8 +68,8 @@ public class IgfsAsyncImpl extends AsyncSupportAdapter<IgniteFileSystem> impleme } /** {@inheritDoc} */ - @Override public IgniteFuture<Void> formatAsync() throws IgniteException { - return igfs.formatAsync(); + @Override public IgniteFuture<Void> clearAsync() throws IgniteException { + return igfs.clearAsync(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/0ccb8569/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 18506cd..6ffa202 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 @@ -1404,7 +1404,7 @@ public final class IgfsImpl implements IgfsEx { } /** {@inheritDoc} */ - @Override public void format() { + @Override public void clear() { try { IgniteUuid id = meta.format(); @@ -1432,8 +1432,8 @@ public final class IgfsImpl implements IgfsEx { } /** {@inheritDoc} */ - @Override public IgniteFuture<Void> formatAsync() throws IgniteException { - return (IgniteFuture<Void>)createFuture(formatAsync0()); + @Override public IgniteFuture<Void> clearAsync() throws IgniteException { + return (IgniteFuture<Void>)createFuture(clearAsync0()); } /** @@ -1441,7 +1441,7 @@ public final class IgfsImpl implements IgfsEx { * * @return Future. */ - IgniteInternalFuture<?> formatAsync0() { + IgniteInternalFuture<?> clearAsync0() { GridFutureAdapter<?> fut = new GridFutureAdapter<>(); Thread t = new Thread(new FormatRunnable(fut), "igfs-format-" + cfg.getName() + "-" + @@ -1871,7 +1871,7 @@ public final class IgfsImpl implements IgfsEx { IgfsException err = null; try { - format(); + clear(); } catch (Throwable err0) { err = IgfsUtils.toIgfsException(err0); http://git-wip-us.apache.org/repos/asf/ignite/blob/0ccb8569/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsFormatTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsFormatTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsFormatTask.java index e2b1c6e..3a9f683 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsFormatTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsFormatTask.java @@ -54,7 +54,7 @@ public class VisorIgfsFormatTask extends VisorOneNodeTask<String, Void> { /** {@inheritDoc} */ @Override protected Void run(String igfsName) { try { - ignite.fileSystem(igfsName).format(); + ignite.fileSystem(igfsName).clear(); } catch (IllegalArgumentException iae) { throw new IgniteException("Failed to format IGFS: " + igfsName, iae); http://git-wip-us.apache.org/repos/asf/ignite/blob/0ccb8569/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java index 3bbb3f9..5593493 100644 --- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java @@ -176,7 +176,7 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest // Clean up file system. if (igfs != null) - igfs.format(); + igfs.clear(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/0ccb8569/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java index 91d5d5c..a409ece 100644 --- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java @@ -156,6 +156,6 @@ public class IgfsFragmentizerAbstractSelfTest extends IgfsCommonAbstractTest { /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - grid(0).fileSystem("igfs").format(); + grid(0).fileSystem("igfs").clear(); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/0ccb8569/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java index 5149493..b95fc9c 100644 --- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerSelfTest.java @@ -237,7 +237,7 @@ public class IgfsFragmentizerSelfTest extends IgfsFragmentizerAbstractSelfTest { U.sleep(200); } - igfs.format(); + igfs.clear(); GridTestUtils.retryAssert(log, 50, 100, new CA() { @Override public void apply() { http://git-wip-us.apache.org/repos/asf/ignite/blob/0ccb8569/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/DefaultIgfsSecondaryFileSystemTestAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/DefaultIgfsSecondaryFileSystemTestAdapter.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/DefaultIgfsSecondaryFileSystemTestAdapter.java index 7fe587d..93e0827 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/DefaultIgfsSecondaryFileSystemTestAdapter.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/DefaultIgfsSecondaryFileSystemTestAdapter.java @@ -59,7 +59,7 @@ public class DefaultIgfsSecondaryFileSystemTestAdapter implements IgfsSecondaryF /** {@inheritDoc} */ @Override public void format() throws IOException { - igfsEx.format(); + igfsEx.clear(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/0ccb8569/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 38d6c7b..6a2af15 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 @@ -990,7 +990,7 @@ public abstract class IgfsAbstractBaseSelfTest extends IgfsCommonAbstractTest { } // Clear igfs. - igfs.format(); + igfs.clear(); int prevDifferentSize = Integer.MAX_VALUE; // Previous different size. int constCnt = 0, totalCnt = 0; http://git-wip-us.apache.org/repos/asf/ignite/blob/0ccb8569/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 0e776b1..5d3b062 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 @@ -693,7 +693,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest { assert dataCache.size(new CachePeekMode[] {CachePeekMode.ALL}) > 0; - igfs.format(); + igfs.clear(); // Ensure format is not propagated to the secondary file system. if (dual) { @@ -756,7 +756,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest { private void checkRootPropertyUpdate(String prop, String setVal, String expGetVal) throws Exception { igfs.update(IgfsPath.ROOT, Collections.singletonMap(prop, setVal)); - igfs.format(); + igfs.clear(); IgfsFile file = igfs.info(IgfsPath.ROOT); http://git-wip-us.apache.org/repos/asf/ignite/blob/0ccb8569/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCachePerBlockLruEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCachePerBlockLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCachePerBlockLruEvictionPolicySelfTest.java index 32e7e17..ddddeca 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCachePerBlockLruEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCachePerBlockLruEvictionPolicySelfTest.java @@ -211,7 +211,7 @@ public class IgfsCachePerBlockLruEvictionPolicySelfTest extends IgfsCommonAbstra @Override protected void afterTest() throws Exception { try { // Cleanup. - igfsPrimary.format(); + igfsPrimary.clear(); while (!dataCache.isEmpty()) U.sleep(100); http://git-wip-us.apache.org/repos/asf/ignite/blob/0ccb8569/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java index cf1f37d..f77c1d1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java @@ -117,7 +117,7 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest { /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - mgr.igfsCtx.igfs().format(); + mgr.igfsCtx.igfs().clear(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/0ccb8569/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java index 1ff0c00..76398f5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java @@ -346,7 +346,7 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest { assertEquals(0, m.filesOpenedForRead()); assertEquals(0, m.filesOpenedForWrite()); - fs.format(); + fs.clear(); m = fs.metrics(); http://git-wip-us.apache.org/repos/asf/ignite/blob/0ccb8569/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMock.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMock.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMock.java index 1217005..833ab4c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMock.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMock.java @@ -261,12 +261,12 @@ public class IgfsMock implements IgfsEx { } /** {@inheritDoc} */ - @Override public void format() throws IgniteException { + @Override public void clear() throws IgniteException { throwUnsupported(); } /** {@inheritDoc} */ - @Override public IgniteFuture<Void> formatAsync() throws IgniteException { + @Override public IgniteFuture<Void> clearAsync() throws IgniteException { throwUnsupported(); return null; http://git-wip-us.apache.org/repos/asf/ignite/blob/0ccb8569/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 2fb2b84..375478f 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 @@ -101,7 +101,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest { @Override protected void afterTest() throws Exception { super.afterTest(); - igfs.format(); + igfs.clear(); } /** {@inheritDoc} */ @@ -595,7 +595,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest { assertEquals(text, read("/b")); // Cleanup. - igfs.format(); + igfs.clear(); assertTrue(F.isEmpty(igfs.listPaths(root))); } @@ -772,7 +772,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest { create(filePath, false, "Some text."); - igfs.format(); + igfs.clear(); assert !igfs.exists(path(dirPath)); assert !igfs.exists(path(filePath)); @@ -798,7 +798,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest { * @throws Exception If failed. */ public void testFormatEmpty() throws Exception { - igfs.format(); + igfs.clear(); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/0ccb8569/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 cc1b53b..0e749f3 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 @@ -108,7 +108,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest { fs = grid(0).fileSystem("igfs"); // Cleanup FS. - fs.format(); + fs.clear(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/0ccb8569/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 36c99dc..fcc8fd7 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 @@ -100,7 +100,7 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest { /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - igfs.format(); + igfs.clear(); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/0ccb8569/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java index b8e1e3b..bd3d7a0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java @@ -103,7 +103,7 @@ public class IgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - igfs.format(); + igfs.clear(); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/0ccb8569/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTaskExecutionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTaskExecutionSelfTest.java index feb5a1f..f25d78a 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTaskExecutionSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTaskExecutionSelfTest.java @@ -96,7 +96,7 @@ public class HadoopTaskExecutionSelfTest extends HadoopAbstractSelfTest { /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - grid(0).fileSystem(igfsName).format(); + grid(0).fileSystem(igfsName).clear(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/0ccb8569/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolMultipleServersSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolMultipleServersSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolMultipleServersSelfTest.java index abc3701..7767ec1 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolMultipleServersSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolMultipleServersSelfTest.java @@ -97,7 +97,7 @@ public class HadoopClientProtocolMultipleServersSelfTest extends HadoopAbstractS private void beforeJob() throws Exception { IgniteFileSystem igfs = grid(0).fileSystem(HadoopAbstractSelfTest.igfsName); - igfs.format(); + igfs.clear(); igfs.mkdirs(new IgfsPath(PATH_INPUT)); http://git-wip-us.apache.org/repos/asf/ignite/blob/0ccb8569/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolSelfTest.java index b3ff3e4..7241506 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolSelfTest.java @@ -129,7 +129,7 @@ public class HadoopClientProtocolSelfTest extends HadoopAbstractSelfTest { /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - grid(0).fileSystem(HadoopAbstractSelfTest.igfsName).format(); + grid(0).fileSystem(HadoopAbstractSelfTest.igfsName).clear(); setupLockFile.delete(); mapLockFile.delete(); http://git-wip-us.apache.org/repos/asf/ignite/blob/0ccb8569/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsEventsTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsEventsTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsEventsTestSuite.java index 2395338..6934587 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsEventsTestSuite.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsEventsTestSuite.java @@ -175,7 +175,7 @@ public class IgfsEventsTestSuite extends TestSuite { super.afterTest(); // Clean up secondary file system. - igfsSec.format(); + igfsSec.clear(); } /**
