http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsTask.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsTask.java index e8ac409..ebf758a 100644 --- a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsTask.java @@ -30,7 +30,7 @@ import java.util.*; * <p> * Each file participating in GGFS task is split into {@link GridGgfsFileRange}s first. Normally range is a number of * consequent bytes located on a single node (see {@code GridGgfsGroupDataBlocksKeyMapper}). In case maximum range size - * is provided (either through {@link GridGgfsConfiguration#getMaximumTaskRangeLength()} or {@code GridGgfs.execute()} + * is provided (either through {@link org.gridgain.grid.ggfs.IgniteFsConfiguration#getMaximumTaskRangeLength()} or {@code GridGgfs.execute()} * argument), then ranges could be further divided into smaller chunks. * <p> * Once file is split into ranges, each range is passed to {@code GridGgfsTask.createJob()} method in order to create a
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsTaskArgs.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsTaskArgs.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsTaskArgs.java index 469e703..2b321c7 100644 --- a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsTaskArgs.java +++ b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/GridGgfsTaskArgs.java @@ -25,7 +25,7 @@ import java.util.*; * <li>{@link GridGgfsRecordResolver} for that task</li> * <li>Flag indicating whether to skip non-existent file paths or throw an exception</li> * <li>User-defined task argument</li> - * <li>Maximum file range length for that task (see {@link GridGgfsConfiguration#getMaximumTaskRangeLength()})</li> + * <li>Maximum file range length for that task (see {@link org.gridgain.grid.ggfs.IgniteFsConfiguration#getMaximumTaskRangeLength()})</li> * </ul> */ public interface GridGgfsTaskArgs<T> { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java index 7193c1c..a79aa15 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java @@ -1634,13 +1634,13 @@ public class GridGainEx { myCfg.setGgfsExecutorServiceShutdown(ggfsSvcShutdown); myCfg.setNodeId(nodeId); - GridGgfsConfiguration[] ggfsCfgs = cfg.getGgfsConfiguration(); + IgniteFsConfiguration[] ggfsCfgs = cfg.getGgfsConfiguration(); if (ggfsCfgs != null) { - GridGgfsConfiguration[] clone = ggfsCfgs.clone(); + IgniteFsConfiguration[] clone = ggfsCfgs.clone(); for (int i = 0; i < ggfsCfgs.length; i++) - clone[i] = new GridGgfsConfiguration(ggfsCfgs[i]); + clone[i] = new IgniteFsConfiguration(ggfsCfgs[i]); myCfg.setGgfsConfiguration(clone); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/main/java/org/gridgain/grid/kernal/ggfs/common/GridGgfsControlResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/ggfs/common/GridGgfsControlResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/ggfs/common/GridGgfsControlResponse.java index 216e888..00919ee 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/ggfs/common/GridGgfsControlResponse.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/ggfs/common/GridGgfsControlResponse.java @@ -265,7 +265,7 @@ public class GridGgfsControlResponse extends GridGgfsMessage { else if (errCode == ERR_CORRUPTED_FILE) throw new GridGgfsCorruptedFileException(err); else if (errCode == ERR_GGFS_GENERIC) - throw new GridGgfsException(err); + throw new IgniteFsException(err); throw new GridException(err); } @@ -337,7 +337,7 @@ public class GridGgfsControlResponse extends GridGgfsMessage { else if (X.hasCause(e, GridGgfsCorruptedFileException.class)) return ERR_CORRUPTED_FILE; // This check should be the last. - else if (GridGgfsException.class.isInstance(e)) + else if (IgniteFsException.class.isInstance(e)) return ERR_GGFS_GENERIC; return ERR_GENERIC; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java index 7f88e83..4a99bc4 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java @@ -216,10 +216,10 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im metrics = new GridCacheMetricsAdapter(); - GridGgfsConfiguration[] ggfsCfgs = gridCfg.getGgfsConfiguration(); + IgniteFsConfiguration[] ggfsCfgs = gridCfg.getGgfsConfiguration(); if (ggfsCfgs != null) { - for (GridGgfsConfiguration ggfsCfg : ggfsCfgs) { + for (IgniteFsConfiguration ggfsCfg : ggfsCfgs) { if (F.eq(ctx.name(), ggfsCfg.getDataCacheName())) { if (!ctx.isNear()) { ggfsDataCache = true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java index 5f2d224..b266c57 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java @@ -510,10 +510,10 @@ public class GridCacheProcessor extends GridProcessorAdapter { maxPreloadOrder = validatePreloadOrder(ctx.config().getCacheConfiguration()); // Internal caches which should not be returned to user. - GridGgfsConfiguration[] ggfsCfgs = ctx.grid().configuration().getGgfsConfiguration(); + IgniteFsConfiguration[] ggfsCfgs = ctx.grid().configuration().getGgfsConfiguration(); if (ggfsCfgs != null) { - for (GridGgfsConfiguration ggfsCfg : ggfsCfgs) { + for (IgniteFsConfiguration ggfsCfg : ggfsCfgs) { sysCaches.add(ggfsCfg.getMetaCacheName()); sysCaches.add(ggfsCfg.getDataCacheName()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java index b3e399c..0a335ee 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java @@ -1565,10 +1565,10 @@ public class GridCacheUtils { * @return {@code True} in this is GGFS data or meta cache. */ public static boolean isGgfsCache(IgniteConfiguration cfg, @Nullable String cacheName) { - GridGgfsConfiguration[] ggfsCfgs = cfg.getGgfsConfiguration(); + IgniteFsConfiguration[] ggfsCfgs = cfg.getGgfsConfiguration(); if (ggfsCfgs != null) { - for (GridGgfsConfiguration ggfsCfg : ggfsCfgs) { + for (IgniteFsConfiguration ggfsCfg : ggfsCfgs) { // GGFS config probably has not been validated yet => possible NPE, so we check for null. if (ggfsCfg != null && (F.eq(cacheName, ggfsCfg.getDataCacheName()) || F.eq(cacheName, ggfsCfg.getMetaCacheName()))) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAsyncImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAsyncImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAsyncImpl.java index e4230f5..a38de0d 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAsyncImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAsyncImpl.java @@ -163,7 +163,7 @@ public class GridGgfsAsyncImpl extends IgniteAsyncSupportAdapter implements Grid } /** {@inheritDoc} */ - @Override public GridGgfsConfiguration configuration() { + @Override public IgniteFsConfiguration configuration() { return ggfs.configuration(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsContext.java index 3dadf71..a5f105c 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsContext.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsContext.java @@ -29,7 +29,7 @@ public class GridGgfsContext { private final GridKernalContext ctx; /** Configuration. */ - private final GridGgfsConfiguration cfg; + private final IgniteFsConfiguration cfg; /** Managers. */ private List<GridGgfsManager> mgrs = new LinkedList<>(); @@ -60,7 +60,7 @@ public class GridGgfsContext { */ public GridGgfsContext( GridKernalContext ctx, - GridGgfsConfiguration cfg, + IgniteFsConfiguration cfg, GridGgfsMetaManager metaMgr, GridGgfsDataManager dataMgr, GridGgfsServerManager srvMgr, @@ -94,7 +94,7 @@ public class GridGgfsContext { /** * @return GGFS configuration. */ - public GridGgfsConfiguration configuration() { + public IgniteFsConfiguration configuration() { return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManager.java index 1e1ff41..e3254b5 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManager.java @@ -295,7 +295,7 @@ public class GridGgfsDataManager extends GridGgfsManager { IgniteDataLoader<GridGgfsBlockKey, byte[]> ldr = ggfsCtx.kernalContext().<GridGgfsBlockKey, byte[]>dataLoad().dataLoader(dataCachePrj.name()); - GridGgfsConfiguration cfg = ggfsCtx.configuration(); + IgniteFsConfiguration cfg = ggfsCtx.configuration(); if (cfg.getPerNodeBatchSize() > 0) ldr.perNodeBufferSize(cfg.getPerNodeBatchSize()); @@ -860,7 +860,7 @@ public class GridGgfsDataManager extends GridGgfsManager { long limitGrpIdx = (start + len + grpBlockSize - 1) / grpBlockSize; if (limitGrpIdx - firstGrpIdx > Integer.MAX_VALUE) - throw new GridGgfsException("Failed to get affinity (range is too wide)" + + throw new IgniteFsException("Failed to get affinity (range is too wide)" + " [info=" + info + ", start=" + start + ", len=" + len + ']'); if (log.isDebugEnabled()) @@ -1408,7 +1408,7 @@ public class GridGgfsDataManager extends GridGgfsManager { int len = remainderLen + srcLen; if (len > reservedLen) - throw new GridGgfsException("Not enough space reserved to store data [id=" + id + + throw new IgniteFsException("Not enough space reserved to store data [id=" + id + ", reservedLen=" + reservedLen + ", remainderLen=" + remainderLen + ", data.length=" + srcLen + ']'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDirectoryNotEmptyException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDirectoryNotEmptyException.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDirectoryNotEmptyException.java index 1101e42..9850e35 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDirectoryNotEmptyException.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDirectoryNotEmptyException.java @@ -14,7 +14,7 @@ import org.gridgain.grid.ggfs.*; /** * Exception indicating that directory can not be deleted because it is not empty. */ -public class GridGgfsDirectoryNotEmptyException extends GridGgfsException { +public class GridGgfsDirectoryNotEmptyException extends IgniteFsException { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfo.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfo.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfo.java index 5078088..2e2bcc3 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfo.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfo.java @@ -90,13 +90,13 @@ public final class GridGgfsFileInfo implements Externalizable { } /** - * Constructs directory or file info with {@link GridGgfsConfiguration#DFLT_BLOCK_SIZE default} block size. + * Constructs directory or file info with {@link org.gridgain.grid.ggfs.IgniteFsConfiguration#DFLT_BLOCK_SIZE default} block size. * * @param isDir Constructs directory info if {@code true} or file info if {@code false}. * @param props Meta properties to set. */ public GridGgfsFileInfo(boolean isDir, @Nullable Map<String, String> props) { - this(isDir, null, isDir ? 0 : GridGgfsConfiguration.DFLT_BLOCK_SIZE, 0, null, null, props, null, false, + this(isDir, null, isDir ? 0 : IgniteFsConfiguration.DFLT_BLOCK_SIZE, 0, null, null, props, null, false, System.currentTimeMillis(), false); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsImpl.java index fca2fdb..e1d75c3 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsImpl.java @@ -63,7 +63,7 @@ public final class GridGgfsImpl implements GridGgfsEx { private GridGgfsDataManager data; /** FS configuration. */ - private GridGgfsConfiguration cfg; + private IgniteFsConfiguration cfg; /** Ggfs context. */ private GridGgfsContext ggfsCtx; @@ -368,7 +368,7 @@ public final class GridGgfsImpl implements GridGgfsEx { } /** {@inheritDoc} */ - @Override public GridGgfsConfiguration configuration() { + @Override public IgniteFsConfiguration configuration() { return cfg; } @@ -883,7 +883,7 @@ public final class GridGgfsImpl implements GridGgfsEx { GridGgfsFileInfo stored = meta.info(meta.fileId(parentId, fileName)); if (stored == null) - throw new GridGgfsException(e); + throw new IgniteFsException(e); if (!stored.isDirectory()) throw new GridGgfsParentNotDirectoryException("Failed to create directory (parent " + @@ -1708,7 +1708,7 @@ public final class GridGgfsImpl implements GridGgfsEx { /** * Executes GGFS task with overridden maximum range length (see - * {@link GridGgfsConfiguration#getMaximumTaskRangeLength()} for more information). + * {@link org.gridgain.grid.ggfs.IgniteFsConfiguration#getMaximumTaskRangeLength()} for more information). * * @param task Task to execute. * @param rslvr Optional resolver to control split boundaries. @@ -1742,7 +1742,7 @@ public final class GridGgfsImpl implements GridGgfsEx { /** * Executes GGFS task asynchronously with overridden maximum range length (see - * {@link GridGgfsConfiguration#getMaximumTaskRangeLength()} for more information). + * {@link org.gridgain.grid.ggfs.IgniteFsConfiguration#getMaximumTaskRangeLength()} for more information). * * @param taskCls Task class to execute. * @param rslvr Optional resolver to control split boundaries. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManager.java index cff85d0..79e17de 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManager.java @@ -40,7 +40,7 @@ import static org.gridgain.grid.kernal.processors.ggfs.GridGgfsFileInfo.*; @SuppressWarnings("all") public class GridGgfsMetaManager extends GridGgfsManager { /** GGFS configuration. */ - private GridGgfsConfiguration cfg; + private IgniteFsConfiguration cfg; /** Metadata cache. */ private GridCache<Object, Object> metaCache; @@ -746,7 +746,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { IgniteUuid fileId = newFileInfo.id(); if (!id2InfoPrj.putxIfAbsent(fileId, newFileInfo)) - throw new GridGgfsException("Failed to add file details into cache: " + newFileInfo); + throw new IgniteFsException("Failed to add file details into cache: " + newFileInfo); assert metaCache.get(parentId) != null; @@ -963,7 +963,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { assert parentInfo.isDirectory(); if (!rmvLocked && fileInfo.lockId() != null) - throw new GridGgfsException("Failed to remove file (file is opened for writing) [fileName=" + + throw new IgniteFsException("Failed to remove file (file is opened for writing) [fileName=" + fileName + ", fileId=" + fileId + ", lockId=" + fileInfo.lockId() + ']'); // Validate own directory listing. @@ -1467,15 +1467,15 @@ public class GridGgfsMetaManager extends GridGgfsManager { GridGgfsFileInfo newInfo = c.apply(oldInfo); if (newInfo == null) - throw new GridGgfsException("Failed to update file info with null value" + + throw new IgniteFsException("Failed to update file info with null value" + " [oldInfo=" + oldInfo + ", newInfo=" + newInfo + ", c=" + c + ']'); if (!oldInfo.id().equals(newInfo.id())) - throw new GridGgfsException("Failed to update file info (file IDs differ)" + + throw new IgniteFsException("Failed to update file info (file IDs differ)" + " [oldInfo=" + oldInfo + ", newInfo=" + newInfo + ", c=" + c + ']'); if (oldInfo.isDirectory() != newInfo.isDirectory()) - throw new GridGgfsException("Failed to update file info (file types differ)" + + throw new IgniteFsException("Failed to update file info (file types differ)" + " [oldInfo=" + oldInfo + ", newInfo=" + newInfo + ", c=" + c + ']'); boolean b = metaCache.replace(fileId, oldInfo, newInfo); @@ -1640,10 +1640,10 @@ public class GridGgfsMetaManager extends GridGgfsManager { GridGgfsFile status = fs.info(path); if (status == null) - throw new GridGgfsException("Failed to open output stream to the file created in " + + throw new IgniteFsException("Failed to open output stream to the file created in " + "the secondary file system because it no longer exists: " + path); else if (status.isDirectory()) - throw new GridGgfsException("Failed to open output stream to the file created in " + + throw new IgniteFsException("Failed to open output stream to the file created in " + "the secondary file system because the path points to a directory: " + path); GridGgfsFileInfo newInfo = new GridGgfsFileInfo(status.blockSize(), status.length(), affKey, @@ -1704,10 +1704,10 @@ public class GridGgfsMetaManager extends GridGgfsManager { simpleCreate + ", props=" + props + ", overwrite=" + overwrite + ", bufferSize=" + bufSize + ", replication=" + replication + ", blockSize=" + blockSize + ']', err); - if (err instanceof GridGgfsException) - throw (GridGgfsException)err; + if (err instanceof IgniteFsException) + throw (IgniteFsException)err; else - throw new GridGgfsException("Failed to create the file due to secondary file system " + + throw new IgniteFsException("Failed to create the file due to secondary file system " + "exception: " + path, err); } }; @@ -1754,7 +1754,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { GridGgfsFileInfo info = infos.get(path); if (info.isDirectory()) - throw new GridGgfsException("Failed to open output stream to the file in the " + + throw new IgniteFsException("Failed to open output stream to the file in the " + "secondary file system because the path points to a directory: " + path); out = fs.append(path, bufSize, false, null); @@ -1793,8 +1793,8 @@ public class GridGgfsMetaManager extends GridGgfsManager { U.error(log, "File append in DUAL mode failed [path=" + path + ", bufferSize=" + bufSize + ']', err); - if (err instanceof GridGgfsException) - throw (GridGgfsException)err; + if (err instanceof IgniteFsException) + throw (IgniteFsException)err; else throw new GridException("Failed to append to the file due to secondary file system " + "exception: " + path, err); @@ -1858,7 +1858,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { U.error(log, "File open in DUAL mode failed [path=" + path + ", bufferSize=" + bufSize + ']', err); - if (err instanceof GridGgfsException) + if (err instanceof IgniteFsException) throw (GridException)err; else throw new GridException("Failed to open the path due to secondary file system " + @@ -1906,7 +1906,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { } @Override public GridGgfsFileInfo onFailure(@Nullable Exception err) throws GridException { - if (err instanceof GridGgfsException) + if (err instanceof IgniteFsException) throw (GridException)err; else throw new GridException("Failed to synchronize path due to secondary file system " + @@ -2061,7 +2061,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { else { // Move. if (destInfo.isFile()) - throw new GridGgfsException("Failed to rename the path in the local file system " + + throw new IgniteFsException("Failed to rename the path in the local file system " + "because destination path already exists and it is a file: " + dest); else moveNonTx(srcInfo.id(), src.name(), srcParentInfo.id(), src.name(), destInfo.id()); @@ -2086,7 +2086,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { U.error(log, "Path rename in DUAL mode failed [source=" + src + ", destination=" + dest + ']', err); - if (err instanceof GridGgfsException) + if (err instanceof IgniteFsException) throw (GridException)err; else throw new GridException("Failed to rename the path due to secondary file system " + @@ -2427,7 +2427,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { if (changed != null) { finished = true; - throw new GridGgfsConcurrentModificationException(changed); + throw new IgniteFsConcurrentModificationException(changed); } else { boolean newParents = false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsOutputStreamImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsOutputStreamImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsOutputStreamImpl.java index 7e9c001..854fda0 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsOutputStreamImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsOutputStreamImpl.java @@ -103,7 +103,7 @@ class GridGgfsOutputStreamImpl extends GridGgfsOutputStreamAdapter { // File hasn't been locked. if (fileInfo.lockId() == null) - throw new GridGgfsException("Failed to acquire file lock (concurrently modified?): " + path); + throw new IgniteFsException("Failed to acquire file lock (concurrently modified?): " + path); this.ggfsCtx = ggfsCtx; meta = ggfsCtx.meta(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java index f1cfeba..dc83ed5 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java @@ -69,7 +69,7 @@ public class GridGgfsProcessor extends GridGgfsProcessorAdapter { if (ctx.config().isDaemon()) return; - GridGgfsConfiguration[] cfgs = ctx.config().getGgfsConfiguration(); + IgniteFsConfiguration[] cfgs = ctx.config().getGgfsConfiguration(); assert cfgs != null && cfgs.length > 0; @@ -116,10 +116,10 @@ public class GridGgfsProcessor extends GridGgfsProcessorAdapter { validateLocalGgfsConfigurations(cfgs); // Start GGFS instances. - for (GridGgfsConfiguration cfg : cfgs) { + for (IgniteFsConfiguration cfg : cfgs) { GridGgfsContext ggfsCtx = new GridGgfsContext( ctx, - new GridGgfsConfiguration(cfg), + new IgniteFsConfiguration(cfg), new GridGgfsMetaManager(), new GridGgfsDataManager(), new GridGgfsServerManager(), @@ -254,7 +254,7 @@ public class GridGgfsProcessor extends GridGgfsProcessorAdapter { assert gridCfg.getGgfsConfiguration() != null; - for (GridGgfsConfiguration ggfsCfg : gridCfg.getGgfsConfiguration()) { + for (IgniteFsConfiguration ggfsCfg : gridCfg.getGgfsConfiguration()) { GridCacheConfiguration cacheCfg = cacheCfgs.get(ggfsCfg.getDataCacheName()); if (cacheCfg == null) @@ -294,10 +294,10 @@ public class GridGgfsProcessor extends GridGgfsProcessorAdapter { * @param cfgs GGFS configurations * @throws GridException If any of GGFS configurations is invalid. */ - private void validateLocalGgfsConfigurations(GridGgfsConfiguration[] cfgs) throws GridException { + private void validateLocalGgfsConfigurations(IgniteFsConfiguration[] cfgs) throws GridException { Collection<String> cfgNames = new HashSet<>(); - for (GridGgfsConfiguration cfg : cfgs) { + for (IgniteFsConfiguration cfg : cfgs) { String name = cfg.getName(); if (cfgNames.contains(name)) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManager.java index 89e9c95..b8f17a9 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManager.java @@ -21,7 +21,7 @@ import org.gridgain.grid.util.worker.*; import java.util.*; import java.util.concurrent.*; -import static org.gridgain.grid.ggfs.GridGgfsConfiguration.*; +import static org.gridgain.grid.ggfs.IgniteFsConfiguration.*; /** * GGFS server manager. @@ -41,7 +41,7 @@ public class GridGgfsServerManager extends GridGgfsManager { /** {@inheritDoc} */ @Override protected void start0() throws GridException { - GridGgfsConfiguration ggfsCfg = ggfsCtx.configuration(); + IgniteFsConfiguration ggfsCfg = ggfsCtx.configuration(); Map<String,String> cfg = ggfsCfg.getIpcEndpointConfiguration(); if (F.isEmpty(cfg)) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorGgfsConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorGgfsConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorGgfsConfiguration.java index 10810a8..fb8d9fc 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorGgfsConfiguration.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorGgfsConfiguration.java @@ -116,7 +116,7 @@ public class VisorGgfsConfiguration implements Serializable { * @param ggfs GGFS configuration. * @return Data transfer object for GGFS configuration properties. */ - public static VisorGgfsConfiguration from(GridGgfsConfiguration ggfs) { + public static VisorGgfsConfiguration from(IgniteFsConfiguration ggfs) { VisorGgfsConfiguration cfg = new VisorGgfsConfiguration(); cfg.name(ggfs.getName()); @@ -167,13 +167,13 @@ public class VisorGgfsConfiguration implements Serializable { * @param ggfss ggfs configurations. * @return ggfs configurations properties. */ - public static Iterable<VisorGgfsConfiguration> list(GridGgfsConfiguration[] ggfss) { + public static Iterable<VisorGgfsConfiguration> list(IgniteFsConfiguration[] ggfss) { if (ggfss == null) return Collections.emptyList(); final Collection<VisorGgfsConfiguration> cfgs = new ArrayList<>(ggfss.length); - for (GridGgfsConfiguration ggfs : ggfss) + for (IgniteFsConfiguration ggfs : ggfss) cfgs.add(from(ggfs)); return cfgs; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/main/java/org/gridgain/grid/kernal/visor/util/VisorTaskUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/util/VisorTaskUtils.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/util/VisorTaskUtils.java index bc0c805..b6989c3 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/util/VisorTaskUtils.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/util/VisorTaskUtils.java @@ -37,7 +37,7 @@ import java.util.concurrent.atomic.*; import static java.lang.System.*; import static org.apache.ignite.events.IgniteEventType.*; -import static org.gridgain.grid.ggfs.GridGgfsConfiguration.*; +import static org.gridgain.grid.ggfs.IgniteFsConfiguration.*; /** * Contains utility methods for Visor tasks and jobs. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/test/config/ggfs-loopback.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/ggfs-loopback.xml b/modules/core/src/test/config/ggfs-loopback.xml index 88e8843..1721ae8 100644 --- a/modules/core/src/test/config/ggfs-loopback.xml +++ b/modules/core/src/test/config/ggfs-loopback.xml @@ -74,7 +74,7 @@ <property name="ggfsConfiguration"> <list> - <bean class="org.gridgain.grid.ggfs.GridGgfsConfiguration"> + <bean class="org.gridgain.grid.ggfs.IgniteFsConfiguration"> <property name="name" value="ggfs"/> <property name="metaCacheName" value="ggfs-meta"/> <property name="dataCacheName" value="ggfs-data"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/test/config/ggfs-no-endpoint.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/ggfs-no-endpoint.xml b/modules/core/src/test/config/ggfs-no-endpoint.xml index 25c4381..741edbf 100644 --- a/modules/core/src/test/config/ggfs-no-endpoint.xml +++ b/modules/core/src/test/config/ggfs-no-endpoint.xml @@ -75,7 +75,7 @@ <property name="ggfsConfiguration"> <list> - <bean class="org.gridgain.grid.ggfs.GridGgfsConfiguration"> + <bean class="org.gridgain.grid.ggfs.IgniteFsConfiguration"> <property name="name" value="ggfs"/> <property name="metaCacheName" value="ggfs-meta"/> <property name="dataCacheName" value="ggfs-data"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/test/config/ggfs-shmem.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/ggfs-shmem.xml b/modules/core/src/test/config/ggfs-shmem.xml index 698759f..271ace7 100644 --- a/modules/core/src/test/config/ggfs-shmem.xml +++ b/modules/core/src/test/config/ggfs-shmem.xml @@ -74,7 +74,7 @@ <property name="ggfsConfiguration"> <list> - <bean class="org.gridgain.grid.ggfs.GridGgfsConfiguration"> + <bean class="org.gridgain.grid.ggfs.IgniteFsConfiguration"> <property name="name" value="ggfs"/> <property name="metaCacheName" value="ggfs-meta"/> <property name="dataCacheName" value="ggfs-data"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java index b6b6cb6..202d168 100644 --- a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java @@ -78,8 +78,8 @@ public abstract class GridGgfsEventsAbstractSelfTest extends GridCommonAbstractT /** * @return GGFS configuration for this test. */ - protected GridGgfsConfiguration getGgfsConfiguration() throws GridException { - GridGgfsConfiguration ggfsCfg = new GridGgfsConfiguration(); + protected IgniteFsConfiguration getGgfsConfiguration() throws GridException { + IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); ggfsCfg.setDataCacheName("dataCache"); ggfsCfg.setMetaCacheName("metaCache"); @@ -103,7 +103,7 @@ public abstract class GridGgfsEventsAbstractSelfTest extends GridCommonAbstractT * @return Grid configuration. * @throws Exception If failed. */ - protected IgniteConfiguration getConfiguration(String gridName, GridGgfsConfiguration ggfsCfg) throws Exception { + protected IgniteConfiguration getConfiguration(String gridName, IgniteFsConfiguration ggfsCfg) throws Exception { IgniteConfiguration cfg = GridGainEx.loadConfiguration("config/hadoop/default-config.xml").get1(); assert cfg != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java index fc5a434..d1c6ea9 100644 --- a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java @@ -55,7 +55,7 @@ public class GridGgfsFragmentizerAbstractSelfTest extends GridGgfsCommonAbstract cfg.setCacheConfiguration(metaConfiguration(), dataConfiguration()); - GridGgfsConfiguration ggfsCfg = new GridGgfsConfiguration(); + IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); ggfsCfg.setName("ggfs"); ggfsCfg.setMetaCacheName(META_CACHE_NAME); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java index 68e7c6d..d34f6de 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java @@ -74,7 +74,7 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm * @throws Exception If failed. */ private void startPrimary() throws Exception { - GridGgfsConfiguration ggfsCfg = new GridGgfsConfiguration(); + IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); ggfsCfg.setDataCacheName("dataCache"); ggfsCfg.setMetaCacheName("metaCache"); @@ -144,7 +144,7 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm * @throws Exception If failed. */ private void startSecondary() throws Exception { - GridGgfsConfiguration ggfsCfg = new GridGgfsConfiguration(); + IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); ggfsCfg.setDataCacheName("dataCache"); ggfsCfg.setMetaCacheName("metaCache"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java index 1178dc0..b099ed3 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java @@ -169,7 +169,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes */ protected Ignite startGridWithGgfs(String gridName, String ggfsName, GridGgfsMode mode, @Nullable GridGgfsFileSystem secondaryFs, @Nullable String restCfg) throws Exception { - GridGgfsConfiguration ggfsCfg = new GridGgfsConfiguration(); + IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); ggfsCfg.setDataCacheName("dataCache"); ggfsCfg.setMetaCacheName("metaCache"); @@ -598,7 +598,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes return null; } - }, GridGgfsException.class, null); + }, IgniteFsException.class, null); checkNotExist(ggfs, ggfsSecondary, SUBDIR, SUBDIR_NEW); } @@ -917,7 +917,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes return null; } - }, GridGgfsException.class, null); + }, IgniteFsException.class, null); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCacheSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCacheSelfTest.java index 13b2bc5..5add5ee 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCacheSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCacheSelfTest.java @@ -48,7 +48,7 @@ public class GridGgfsCacheSelfTest extends GridGgfsCommonAbstractTest { cfg.setDiscoverySpi(discoSpi); - GridGgfsConfiguration ggfsCfg = new GridGgfsConfiguration(); + IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); ggfsCfg.setMetaCacheName(META_CACHE_NAME); ggfsCfg.setDataCacheName(DATA_CACHE_NAME); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java index 7d5d494..e3e953a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java @@ -85,7 +85,7 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest { cfg.setDiscoverySpi(discoSpi); - GridGgfsConfiguration ggfsCfg = new GridGgfsConfiguration(); + IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); ggfsCfg.setMetaCacheName(META_CACHE_NAME); ggfsCfg.setDataCacheName(DATA_CACHE_NAME); @@ -550,7 +550,7 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest { return null; } - }, GridGgfsException.class, msg); + }, IgniteFsException.class, msg); } /** @@ -566,7 +566,7 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest { return null; } - }, GridGgfsException.class, msg); + }, IgniteFsException.class, msg); } /** @@ -585,6 +585,6 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest { return null; } - }, GridGgfsException.class, msg); + }, IgniteFsException.class, msg); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java index 2b73c07..b1ea25b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java @@ -68,7 +68,7 @@ public class GridGgfsMetaManagerSelfTest extends GridGgfsCommonAbstractTest { cfg.setDiscoverySpi(discoSpi); - GridGgfsConfiguration ggfsCfg = new GridGgfsConfiguration(); + IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); ggfsCfg.setMetaCacheName(META_CACHE_NAME); ggfsCfg.setDataCacheName(DATA_CACHE_NAME); @@ -412,7 +412,7 @@ public class GridGgfsMetaManagerSelfTest extends GridGgfsCommonAbstractTest { @Override public Object call() throws Exception { return mgr.putIfAbsent(parentId, fileName, fileInfo); } - }, GridGgfsException.class, msg); + }, IgniteFsException.class, msg); } /** @@ -433,7 +433,7 @@ public class GridGgfsMetaManagerSelfTest extends GridGgfsCommonAbstractTest { return null; } - }, GridGgfsException.class, msg); + }, IgniteFsException.class, msg); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java index 1dcca80..db70a00 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java @@ -91,7 +91,7 @@ public class GridGgfsMetricsSelfTest extends GridGgfsCommonAbstractTest { * @throws Exception If failed. */ private IgniteConfiguration primaryConfiguration(int idx) throws Exception { - GridGgfsConfiguration ggfsCfg = new GridGgfsConfiguration(); + IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); ggfsCfg.setDataCacheName("dataCache"); ggfsCfg.setMetaCacheName("metaCache"); @@ -149,7 +149,7 @@ public class GridGgfsMetricsSelfTest extends GridGgfsCommonAbstractTest { * @throws Exception If failed. */ private void startSecondary() throws Exception { - GridGgfsConfiguration ggfsCfg = new GridGgfsConfiguration(); + IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); ggfsCfg.setDataCacheName("dataCache"); ggfsCfg.setMetaCacheName("metaCache"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java index ebf6b8d..55a7bb9 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java @@ -75,7 +75,7 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest { private void startUp() throws Exception { startUpSecondary(); - GridGgfsConfiguration ggfsCfg = new GridGgfsConfiguration(); + IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); ggfsCfg.setDataCacheName("partitioned"); ggfsCfg.setMetaCacheName("replicated"); @@ -137,7 +137,7 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest { * @throws Exception If failed. */ private void startUpSecondary() throws Exception { - GridGgfsConfiguration ggfsCfg = new GridGgfsConfiguration(); + IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); ggfsCfg.setDataCacheName("partitioned"); ggfsCfg.setMetaCacheName("replicated"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java index 575e955..1f90684 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java @@ -65,7 +65,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { ggfs = grid.fileSystem(ggfsName()); - GridGgfsConfiguration[] cfgs = grid.configuration().getGgfsConfiguration(); + IgniteFsConfiguration[] cfgs = grid.configuration().getGgfsConfiguration(); assert cfgs.length == 1; @@ -103,7 +103,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { cfg.setDiscoverySpi(discoSpi); - GridGgfsConfiguration ggfsCfg = new GridGgfsConfiguration(); + IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); ggfsCfg.setMetaCacheName(META_CACHE_NAME); ggfsCfg.setDataCacheName(DATA_CACHE_NAME); @@ -369,7 +369,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { return null; } - }, GridGgfsException.class, null); + }, IgniteFsException.class, null); ggfs.delete(path("/A1/B1/C1"), false); assertNull(ggfs.info(path("/A1/B1/C1"))); @@ -395,7 +395,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { return null; } - }, GridGgfsException.class, null); + }, IgniteFsException.class, null); assertEquals(Arrays.asList(path("/A"), path("/A1"), path("/A2")), sorted(ggfs.listPaths(path("/")))); ggfs.delete(path("/"), true); @@ -473,7 +473,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { return null; } - }, GridGgfsException.class, null); + }, IgniteFsException.class, null); // Move under itself. GridTestUtils.assertThrowsInherited(log, new Callable<Object>() { @@ -482,7 +482,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { return null; } - }, GridGgfsException.class, null); + }, IgniteFsException.class, null); // Move under itself. GridTestUtils.assertThrowsInherited(log, new Callable<Object>() { @@ -492,7 +492,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { return null; } - }, GridGgfsException.class, null); + }, IgniteFsException.class, null); /// // F6 > Enter > Tab x N times @@ -530,7 +530,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { return null; } - }, GridGgfsException.class, null); + }, IgniteFsException.class, null); // Test root rename. GridTestUtils.assertThrowsInherited(log, new Callable<Object>() { @@ -539,7 +539,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { return null; } - }, GridGgfsException.class, null); + }, IgniteFsException.class, null); // Test root rename. if (!root.equals(p2)) { @@ -549,7 +549,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { return null; } - }, GridGgfsException.class, null); + }, IgniteFsException.class, null); } // Test same rename. @@ -911,7 +911,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { return false; } - }, GridGgfsException.class, msg); + }, IgniteFsException.class, msg); } /** @@ -928,7 +928,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { return false; } - }, GridGgfsException.class, msg); + }, IgniteFsException.class, msg); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java index df0c6a4..de5f837 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java @@ -30,7 +30,7 @@ import static org.gridgain.grid.ggfs.GridGgfsMode.*; * Tests for node validation logic in {@link GridGgfsProcessor}. * <p> * Tests starting with "testLocal" are checking - * {@link GridGgfsProcessor#validateLocalGgfsConfigurations(GridGgfsConfiguration[])}. + * {@link GridGgfsProcessor#validateLocalGgfsConfigurations(org.gridgain.grid.ggfs.IgniteFsConfiguration[])}. * <p> * Tests starting with "testRemote" are checking {@link GridGgfsProcessor#checkGgfsOnRemoteNode(org.apache.ignite.cluster.ClusterNode)}. */ @@ -54,10 +54,10 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT private static final String metaCache2Name = "metaCache2"; /** First GGFS config in grid #1. */ - private GridGgfsConfiguration g1GgfsCfg1 = new GridGgfsConfiguration(); + private IgniteFsConfiguration g1GgfsCfg1 = new IgniteFsConfiguration(); /** Second GGFS config in grid#1. */ - private GridGgfsConfiguration g1GgfsCfg2 = new GridGgfsConfiguration(); + private IgniteFsConfiguration g1GgfsCfg2 = new IgniteFsConfiguration(); /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { @@ -271,7 +271,7 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class)); g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class)); - GridGgfsConfiguration g2GgfsCfg1 = new GridGgfsConfiguration(g1GgfsCfg1); + IgniteFsConfiguration g2GgfsCfg1 = new IgniteFsConfiguration(g1GgfsCfg1); g2GgfsCfg1.setBlockSize(g2GgfsCfg1.getBlockSize() + 100); @@ -303,8 +303,8 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT public void testRemoteIfMetaCacheNameDiffers() throws Exception { IgniteConfiguration g2Cfg = getConfiguration("g2"); - GridGgfsConfiguration g2GgfsCfg1 = new GridGgfsConfiguration(g1GgfsCfg1); - GridGgfsConfiguration g2GgfsCfg2 = new GridGgfsConfiguration(g1GgfsCfg2); + IgniteFsConfiguration g2GgfsCfg1 = new IgniteFsConfiguration(g1GgfsCfg1); + IgniteFsConfiguration g2GgfsCfg2 = new IgniteFsConfiguration(g1GgfsCfg2); g2GgfsCfg1.setMetaCacheName("g2MetaCache1"); g2GgfsCfg2.setMetaCacheName("g2MetaCache2"); @@ -326,8 +326,8 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT public void testRemoteIfMetaCacheNameEquals() throws Exception { IgniteConfiguration g2Cfg = getConfiguration("g2"); - GridGgfsConfiguration g2GgfsCfg1 = new GridGgfsConfiguration(g1GgfsCfg1); - GridGgfsConfiguration g2GgfsCfg2 = new GridGgfsConfiguration(g1GgfsCfg2); + IgniteFsConfiguration g2GgfsCfg1 = new IgniteFsConfiguration(g1GgfsCfg1); + IgniteFsConfiguration g2GgfsCfg2 = new IgniteFsConfiguration(g1GgfsCfg2); g2GgfsCfg1.setName("g2GgfsCfg1"); g2GgfsCfg2.setName("g2GgfsCfg2"); @@ -352,8 +352,8 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT public void testRemoteIfDataCacheNameDiffers() throws Exception { IgniteConfiguration g2Cfg = getConfiguration("g2"); - GridGgfsConfiguration g2GgfsCfg1 = new GridGgfsConfiguration(g1GgfsCfg1); - GridGgfsConfiguration g2GgfsCfg2 = new GridGgfsConfiguration(g1GgfsCfg2); + IgniteFsConfiguration g2GgfsCfg1 = new IgniteFsConfiguration(g1GgfsCfg1); + IgniteFsConfiguration g2GgfsCfg2 = new IgniteFsConfiguration(g1GgfsCfg2); g2GgfsCfg1.setDataCacheName("g2DataCache1"); g2GgfsCfg2.setDataCacheName("g2DataCache2"); @@ -375,8 +375,8 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT public void testRemoteIfDataCacheNameEquals() throws Exception { IgniteConfiguration g2Cfg = getConfiguration("g2"); - GridGgfsConfiguration g2GgfsCfg1 = new GridGgfsConfiguration(g1GgfsCfg1); - GridGgfsConfiguration g2GgfsCfg2 = new GridGgfsConfiguration(g1GgfsCfg2); + IgniteFsConfiguration g2GgfsCfg1 = new IgniteFsConfiguration(g1GgfsCfg1); + IgniteFsConfiguration g2GgfsCfg2 = new IgniteFsConfiguration(g1GgfsCfg2); g2GgfsCfg1.setName("g2GgfsCfg1"); g2GgfsCfg2.setName("g2GgfsCfg2"); @@ -401,8 +401,8 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT public void testRemoteIfDefaultModeDiffers() throws Exception { IgniteConfiguration g2Cfg = getConfiguration("g2"); - GridGgfsConfiguration g2GgfsCfg1 = new GridGgfsConfiguration(g1GgfsCfg1); - GridGgfsConfiguration g2GgfsCfg2 = new GridGgfsConfiguration(g1GgfsCfg2); + IgniteFsConfiguration g2GgfsCfg1 = new IgniteFsConfiguration(g1GgfsCfg1); + IgniteFsConfiguration g2GgfsCfg2 = new IgniteFsConfiguration(g1GgfsCfg2); g1GgfsCfg1.setDefaultMode(DUAL_ASYNC); g1GgfsCfg2.setDefaultMode(DUAL_ASYNC); @@ -426,8 +426,8 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT public void testRemoteIfPathModeDiffers() throws Exception { IgniteConfiguration g2Cfg = getConfiguration("g2"); - GridGgfsConfiguration g2GgfsCfg1 = new GridGgfsConfiguration(g1GgfsCfg1); - GridGgfsConfiguration g2GgfsCfg2 = new GridGgfsConfiguration(g1GgfsCfg2); + IgniteFsConfiguration g2GgfsCfg1 = new IgniteFsConfiguration(g1GgfsCfg1); + IgniteFsConfiguration g2GgfsCfg2 = new IgniteFsConfiguration(g1GgfsCfg2); g2GgfsCfg1.setPathModes(Collections.singletonMap("/somePath", DUAL_SYNC)); g2GgfsCfg2.setPathModes(Collections.singletonMap("/somePath", DUAL_SYNC)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java index 7612b4a..cbc49e2 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java @@ -29,7 +29,7 @@ import java.util.*; import java.util.concurrent.atomic.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.ggfs.GridGgfsConfiguration.*; +import static org.gridgain.grid.ggfs.IgniteFsConfiguration.*; /** * Base test class for {@link GridGgfsServer} checking IPC endpoint registrations. @@ -146,8 +146,8 @@ public abstract class GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTe * @param endpointCfg Optional REST endpoint configuration. * @return test-purposed GridGgfsConfiguration. */ - protected GridGgfsConfiguration gridGgfsConfiguration(@Nullable String endpointCfg) throws GridException { - GridGgfsConfiguration ggfsConfiguration = new GridGgfsConfiguration(); + protected IgniteFsConfiguration gridGgfsConfiguration(@Nullable String endpointCfg) throws GridException { + IgniteFsConfiguration ggfsConfiguration = new IgniteFsConfiguration(); ggfsConfiguration.setDataCacheName("partitioned"); ggfsConfiguration.setMetaCacheName("replicated"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.java index 535d472..2b3291d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.java @@ -12,7 +12,7 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.configuration.*; import org.gridgain.grid.util.typedef.*; -import static org.gridgain.grid.ggfs.GridGgfsConfiguration.*; +import static org.gridgain.grid.ggfs.IgniteFsConfiguration.*; /** * Tests for {@link GridGgfsServer} that checks all IPC endpoint registration types http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java index cac49b9..c4a08eb 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java @@ -102,7 +102,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - GridGgfsConfiguration ggfsCfg = new GridGgfsConfiguration(); + IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); ggfsCfg.setDataCacheName(DATA_CACHE_NAME); ggfsCfg.setMetaCacheName(META_CACHE_NAME); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java index 3194fdf..34a693d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java @@ -103,7 +103,7 @@ public class GridGgfsStreamsSelfTest extends GridGgfsCommonAbstractTest { cfg.setDiscoverySpi(discoSpi); - GridGgfsConfiguration ggfsCfg = new GridGgfsConfiguration(); + IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); ggfsCfg.setMetaCacheName(META_CACHE_NAME); ggfsCfg.setDataCacheName(DATA_CACHE_NAME); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java index f01b253..88adf6f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java @@ -90,7 +90,7 @@ public class GridGgfsTaskSelfTest extends GridGgfsCommonAbstractTest { * @return Grid configuration */ private IgniteConfiguration config(int idx) { - GridGgfsConfiguration ggfsCfg = new GridGgfsConfiguration(); + IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); ggfsCfg.setDataCacheName("dataCache"); ggfsCfg.setMetaCacheName("metaCache"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java index affd964..34e5345 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java @@ -43,7 +43,7 @@ public class GridGgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTe /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { - GridGgfsConfiguration ggfsCfg = new GridGgfsConfiguration(); + IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); ggfsCfg.setDataCacheName("dataCache"); ggfsCfg.setMetaCacheName("metaCache"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java index d1290da..96fd35b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java @@ -35,7 +35,7 @@ public class GridIpcSharedMemoryNodeStartup { public static void main(String[] args) throws Exception{ IgniteConfiguration cfg = new IgniteConfiguration(); - GridGgfsConfiguration ggfsCfg = new GridGgfsConfiguration(); + IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); GridTcpDiscoverySpi discoSpi = new GridTcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/GridGgfsHadoopParameters.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/GridGgfsHadoopParameters.java b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/GridGgfsHadoopParameters.java index 0c07daf..bbd2d49 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/GridGgfsHadoopParameters.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/GridGgfsHadoopParameters.java @@ -9,8 +9,6 @@ package org.gridgain.grid.ggfs.hadoop; -import org.gridgain.grid.ggfs.*; - /** * This class lists parameters that can be specified in Hadoop configuration. * Hadoop configuration can be specified in {@code core-site.xml} file @@ -18,7 +16,7 @@ import org.gridgain.grid.ggfs.*; * <ul> * <li> * {@code fs.ggfs.[name].open.sequential_reads_before_prefetch} - this parameter overrides - * the one specified in {@link GridGgfsConfiguration#getSequentialReadsBeforePrefetch()} + * the one specified in {@link org.gridgain.grid.ggfs.IgniteFsConfiguration#getSequentialReadsBeforePrefetch()} * GGFS data node configuration property. * </li> * <li> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java index 9fa7c00..8459461 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java @@ -31,7 +31,7 @@ import java.util.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.IgniteFs.*; -import static org.gridgain.grid.ggfs.GridGgfsConfiguration.*; +import static org.gridgain.grid.ggfs.IgniteFsConfiguration.*; import static org.gridgain.grid.ggfs.GridGgfsMode.*; import static org.gridgain.grid.ggfs.hadoop.GridGgfsHadoopParameters.*; import static org.gridgain.grid.kernal.ggfs.hadoop.GridGgfsHadoopUtils.*; @@ -716,7 +716,7 @@ public class GridGgfsHadoopFileSystem extends FileSystem { catch (IOException e) { // Intentionally ignore GGFS exceptions here to follow Hadoop contract. if (F.eq(IOException.class, e.getClass()) && (e.getCause() == null || - !GridGgfsException.class.isAssignableFrom(e.getCause().getClass()))) + !IgniteFsException.class.isAssignableFrom(e.getCause().getClass()))) throw e; else return false; @@ -767,7 +767,7 @@ public class GridGgfsHadoopFileSystem extends FileSystem { catch (IOException e) { // Intentionally ignore GGFS exceptions here to follow Hadoop contract. if (F.eq(IOException.class, e.getClass()) && (e.getCause() == null || - !GridGgfsException.class.isAssignableFrom(e.getCause().getClass()))) + !IgniteFsException.class.isAssignableFrom(e.getCause().getClass()))) throw e; else return false; @@ -925,7 +925,7 @@ public class GridGgfsHadoopFileSystem extends FileSystem { catch (IOException e) { // Intentionally ignore GGFS exceptions here to follow Hadoop contract. if (F.eq(IOException.class, e.getClass()) && (e.getCause() == null || - !GridGgfsException.class.isAssignableFrom(e.getCause().getClass()))) + !IgniteFsException.class.isAssignableFrom(e.getCause().getClass()))) throw e; else return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java index e7dc2b3..9d320b4 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java @@ -31,7 +31,7 @@ import java.util.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.IgniteFs.*; -import static org.gridgain.grid.ggfs.GridGgfsConfiguration.*; +import static org.gridgain.grid.ggfs.IgniteFsConfiguration.*; import static org.gridgain.grid.ggfs.GridGgfsMode.*; import static org.gridgain.grid.ggfs.hadoop.GridGgfsHadoopParameters.*; import static org.gridgain.grid.kernal.ggfs.hadoop.GridGgfsHadoopUtils.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopEndpoint.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopEndpoint.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopEndpoint.java index d8817c4..c17d26f 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopEndpoint.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopEndpoint.java @@ -19,7 +19,7 @@ import org.jetbrains.annotations.*; import java.io.*; import java.net.*; -import static org.gridgain.grid.ggfs.GridGgfsConfiguration.*; +import static org.gridgain.grid.ggfs.IgniteFsConfiguration.*; /** * GGFS endpoint abstraction. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java index 09bb563..f07b430 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java @@ -89,11 +89,11 @@ public class GridGgfsHadoopFileSystemWrapper implements GridGgfsFileSystem, Auto * @param detailMsg Detailed error message. * @return Appropriate exception. */ - private GridGgfsException handleSecondaryFsError(IOException e, String detailMsg) { + private IgniteFsException handleSecondaryFsError(IOException e, String detailMsg) { boolean wrongVer = X.hasCause(e, RemoteException.class) || (e.getMessage() != null && e.getMessage().contains("Failed on local")); - GridGgfsException ggfsErr = !wrongVer ? cast(detailMsg, e) : + IgniteFsException ggfsErr = !wrongVer ? cast(detailMsg, e) : new GridGgfsInvalidHdfsVersionException("HDFS version you are connecting to differs from local " + "version.", e); @@ -108,7 +108,7 @@ public class GridGgfsHadoopFileSystemWrapper implements GridGgfsFileSystem, Auto * @param e IO exception. * @return GGFS exception. */ - public static GridGgfsException cast(String msg, IOException e) { + public static IgniteFsException cast(String msg, IOException e) { if (e instanceof FileNotFoundException) return new GridGgfsFileNotFoundException(e); else if (e instanceof ParentNotDirectoryException) @@ -118,7 +118,7 @@ public class GridGgfsHadoopFileSystemWrapper implements GridGgfsFileSystem, Auto else if (e instanceof PathExistsException) return new IgniteFsPathAlreadyExistsException(msg, e); else - return new GridGgfsException(msg, e); + return new IgniteFsException(msg, e); } /** @@ -171,7 +171,7 @@ public class GridGgfsHadoopFileSystemWrapper implements GridGgfsFileSystem, Auto // Delegate to the secondary file system. try { if (!fileSys.rename(convert(src), convert(dest))) - throw new GridGgfsException("Failed to rename (secondary file system returned false) " + + throw new IgniteFsException("Failed to rename (secondary file system returned false) " + "[src=" + src + ", dest=" + dest + ']'); } catch (IOException e) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd01ed99/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/fs/GridHadoopDistributedFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/fs/GridHadoopDistributedFileSystem.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/fs/GridHadoopDistributedFileSystem.java index 040cd26..e39153a 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/fs/GridHadoopDistributedFileSystem.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/fs/GridHadoopDistributedFileSystem.java @@ -17,7 +17,7 @@ import org.apache.hadoop.mapreduce.*; import java.io.*; import java.net.*; -import static org.gridgain.grid.ggfs.GridGgfsConfiguration.*; +import static org.gridgain.grid.ggfs.IgniteFsConfiguration.*; /** * Wrapper of HDFS for support of separated working directory.
