# IGNITE-226: WIP.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cd5f9f00 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cd5f9f00 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cd5f9f00 Branch: refs/heads/ignite-226 Commit: cd5f9f00e1b004459bd6070269b0b719613f52e4 Parents: 5dad54e Author: vozerov-gridgain <[email protected]> Authored: Fri Feb 13 14:38:34 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Fri Feb 13 14:38:34 2015 +0300 ---------------------------------------------------------------------- .../ignite/configuration/IgfsConfiguration.java | 6 +- .../configuration/IgniteConfiguration.java | 14 +- .../org/apache/ignite/events/EventType.java | 50 +++---- .../org/apache/ignite/events/IgfsEvent.java | 20 +-- .../apache/ignite/internal/IgniteKernal.java | 4 +- .../org/apache/ignite/internal/IgnitionEx.java | 4 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheProcessor.java | 2 +- .../processors/cache/GridCacheUtils.java | 2 +- .../processors/igfs/IgfsDeleteWorker.java | 4 +- .../internal/processors/igfs/IgfsImpl.java | 64 ++++----- .../processors/igfs/IgfsMetaManager.java | 28 ++-- .../internal/processors/igfs/IgfsProcessor.java | 8 +- .../visor/node/VisorGridConfiguration.java | 2 +- .../internal/visor/util/VisorTaskUtils.java | 2 +- .../ignite/igfs/IgfsEventsAbstractSelfTest.java | 134 +++++++++---------- .../igfs/IgfsFragmentizerAbstractSelfTest.java | 2 +- ...heIgfsPerBlockLruEvictionPolicySelfTest.java | 4 +- .../processors/igfs/IgfsAbstractSelfTest.java | 2 +- .../processors/igfs/IgfsCacheSelfTest.java | 2 +- .../igfs/IgfsDataManagerSelfTest.java | 2 +- .../igfs/IgfsMetaManagerSelfTest.java | 2 +- .../processors/igfs/IgfsMetricsSelfTest.java | 4 +- .../processors/igfs/IgfsModesSelfTest.java | 4 +- .../processors/igfs/IgfsProcessorSelfTest.java | 4 +- .../igfs/IgfsProcessorValidationSelfTest.java | 16 +-- ...IpcEndpointRegistrationAbstractSelfTest.java | 4 +- ...dpointRegistrationOnLinuxAndMacSelfTest.java | 2 +- ...pcEndpointRegistrationOnWindowsSelfTest.java | 2 +- .../processors/igfs/IgfsSizeSelfTest.java | 2 +- .../processors/igfs/IgfsStreamsSelfTest.java | 2 +- .../processors/igfs/IgfsTaskSelfTest.java | 2 +- .../IgfsAbstractRecordResolverSelfTest.java | 2 +- .../ipc/shmem/IpcSharedMemoryNodeStartup.java | 2 +- .../igfs/hadoop/v1/IgfsHadoopFileSystem.java | 4 +- .../igfs/hadoop/v2/IgfsHadoopFileSystem.java | 4 +- .../IgfsHadoop20FileSystemAbstractSelfTest.java | 4 +- .../igfs/IgfsHadoopDualAbstractSelfTest.java | 2 +- .../IgfsHadoopFileSystemAbstractSelfTest.java | 4 +- .../IgfsHadoopFileSystemClientSelfTest.java | 2 +- .../IgfsHadoopFileSystemHandshakeSelfTest.java | 2 +- .../IgfsHadoopFileSystemIpcCacheSelfTest.java | 2 +- ...IgfsHadoopFileSystemLoggerStateSelfTest.java | 2 +- ...fsHadoopFileSystemSecondaryModeSelfTest.java | 4 +- .../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 2 +- .../hadoop/GridHadoopAbstractSelfTest.java | 2 +- 46 files changed, 220 insertions(+), 220 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/core/src/main/java/org/apache/ignite/configuration/IgfsConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgfsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgfsConfiguration.java index 303803c..c9907e2 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgfsConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgfsConfiguration.java @@ -26,7 +26,7 @@ import java.util.concurrent.*; /** * {@code GGFS} configuration. More than one file system can be configured within grid. - * {@code GGFS} configuration is provided via {@link org.apache.ignite.configuration.IgniteConfiguration#getGgfsConfiguration()} + * {@code GGFS} configuration is provided via {@link org.apache.ignite.configuration.IgniteConfiguration#getIgfsConfiguration()} * method. * <p> * Refer to {@code config/hadoop/default-config.xml} or {@code config/hadoop/default-config-client.xml} @@ -55,10 +55,10 @@ public class IgfsConfiguration { public static final boolean DFLT_FRAGMENTIZER_ENABLED = true; /** Default batch size for logging. */ - public static final int DFLT_GGFS_LOG_BATCH_SIZE = 100; + public static final int DFLT_IGFS_LOG_BATCH_SIZE = 100; /** Default {@code GGFS} log directory. */ - public static final String DFLT_GGFS_LOG_DIR = "work/igfs/log"; + public static final String DFLT_IGFS_LOG_DIR = "work/igfs/log"; /** Default per node buffer size. */ public static final int DFLT_PER_NODE_BATCH_SIZE = 100; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index 50e0c8a..b86a3ac 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@ -393,7 +393,7 @@ public class IgniteConfiguration { private Map<IgnitePredicate<? extends Event>, int[]> lsnrs; /** GGFS configuration. */ - private IgfsConfiguration[] ggfsCfg; + private IgfsConfiguration[] igfsCfg; /** Streamer configuration. */ private StreamerConfiguration[] streamerCfg; @@ -473,7 +473,7 @@ public class IgniteConfiguration { ggHome = cfg.getIgniteHome(); ggWork = cfg.getWorkDirectory(); gridName = cfg.getGridName(); - ggfsCfg = cfg.getGgfsConfiguration(); + igfsCfg = cfg.getIgfsConfiguration(); ggfsPoolSize = cfg.getGgfsThreadPoolSize(); hadoopCfg = cfg.getHadoopConfiguration(); inclEvtTypes = cfg.getIncludeEventTypes(); @@ -2142,17 +2142,17 @@ public class IgniteConfiguration { * * @return GGFS configurations. */ - public IgfsConfiguration[] getGgfsConfiguration() { - return ggfsCfg; + public IgfsConfiguration[] getIgfsConfiguration() { + return igfsCfg; } /** * Sets GGFS configurations. * - * @param ggfsCfg GGFS configurations. + * @param igfsCfg GGFS configurations. */ - public void setGgfsConfiguration(IgfsConfiguration... ggfsCfg) { - this.ggfsCfg = ggfsCfg; + public void setIgfsConfiguration(IgfsConfiguration... igfsCfg) { + this.igfsCfg = igfsCfg; } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/core/src/main/java/org/apache/ignite/events/EventType.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/events/EventType.java b/modules/core/src/main/java/org/apache/ignite/events/EventType.java index 4ec97a5..2080be6 100644 --- a/modules/core/src/main/java/org/apache/ignite/events/EventType.java +++ b/modules/core/src/main/java/org/apache/ignite/events/EventType.java @@ -691,7 +691,7 @@ public interface EventType { * * @see IgfsEvent */ - public static final int EVT_GGFS_FILE_CREATED = 116; + public static final int EVT_IGFS_FILE_CREATED = 116; /** * Built-in event type: GGFS file renamed. @@ -703,7 +703,7 @@ public interface EventType { * * @see IgfsEvent */ - public static final int EVT_GGFS_FILE_RENAMED = 117; + public static final int EVT_IGFS_FILE_RENAMED = 117; /** * Built-in event type: GGFS file deleted. @@ -715,7 +715,7 @@ public interface EventType { * * @see IgfsEvent */ - public static final int EVT_GGFS_FILE_DELETED = 118; + public static final int EVT_IGFS_FILE_DELETED = 118; /** * Built-in event type: GGFS file opened for reading. @@ -727,7 +727,7 @@ public interface EventType { * * @see IgfsEvent */ - public static final int EVT_GGFS_FILE_OPENED_READ = 119; + public static final int EVT_IGFS_FILE_OPENED_READ = 119; /** * Built-in event type: GGFS file opened for writing. @@ -739,7 +739,7 @@ public interface EventType { * * @see IgfsEvent */ - public static final int EVT_GGFS_FILE_OPENED_WRITE = 120; + public static final int EVT_IGFS_FILE_OPENED_WRITE = 120; /** * Built-in event type: GGFS file or directory metadata updated. @@ -751,7 +751,7 @@ public interface EventType { * * @see IgfsEvent */ - public static final int EVT_GGFS_META_UPDATED = 121; + public static final int EVT_IGFS_META_UPDATED = 121; /** * Built-in event type: GGFS file closed. @@ -763,7 +763,7 @@ public interface EventType { * * @see IgfsEvent */ - public static final int EVT_GGFS_FILE_CLOSED_WRITE = 122; + public static final int EVT_IGFS_FILE_CLOSED_WRITE = 122; /** * Built-in event type: GGFS file closed. @@ -775,7 +775,7 @@ public interface EventType { * * @see IgfsEvent */ - public static final int EVT_GGFS_FILE_CLOSED_READ = 123; + public static final int EVT_IGFS_FILE_CLOSED_READ = 123; /** * Built-in event type: GGFS directory created. @@ -787,7 +787,7 @@ public interface EventType { * * @see IgfsEvent */ - public static final int EVT_GGFS_DIR_CREATED = 124; + public static final int EVT_IGFS_DIR_CREATED = 124; /** * Built-in event type: GGFS directory renamed. @@ -799,7 +799,7 @@ public interface EventType { * * @see IgfsEvent */ - public static final int EVT_GGFS_DIR_RENAMED = 125; + public static final int EVT_IGFS_DIR_RENAMED = 125; /** * Built-in event type: GGFS directory deleted. @@ -811,7 +811,7 @@ public interface EventType { * * @see IgfsEvent */ - public static final int EVT_GGFS_DIR_DELETED = 126; + public static final int EVT_IGFS_DIR_DELETED = 126; /** * Built-in event type: GGFS file purged. @@ -823,7 +823,7 @@ public interface EventType { * * @see IgfsEvent */ - public static final int EVT_GGFS_FILE_PURGED = 127; + public static final int EVT_IGFS_FILE_PURGED = 127; /** * Built-in event type: authorization succeed. @@ -1076,19 +1076,19 @@ public interface EventType { * * @see SecureSessionEvent */ - public static final int[] EVTS_GGFS = { - EVT_GGFS_FILE_CREATED, - EVT_GGFS_FILE_RENAMED, - EVT_GGFS_FILE_DELETED, - EVT_GGFS_FILE_OPENED_READ, - EVT_GGFS_FILE_OPENED_WRITE, - EVT_GGFS_FILE_CLOSED_WRITE, - EVT_GGFS_FILE_CLOSED_READ, - EVT_GGFS_FILE_PURGED, - EVT_GGFS_META_UPDATED, - EVT_GGFS_DIR_CREATED, - EVT_GGFS_DIR_RENAMED, - EVT_GGFS_DIR_DELETED, + public static final int[] EVTS_IGFS = { + EVT_IGFS_FILE_CREATED, + EVT_IGFS_FILE_RENAMED, + EVT_IGFS_FILE_DELETED, + EVT_IGFS_FILE_OPENED_READ, + EVT_IGFS_FILE_OPENED_WRITE, + EVT_IGFS_FILE_CLOSED_WRITE, + EVT_IGFS_FILE_CLOSED_READ, + EVT_IGFS_FILE_PURGED, + EVT_IGFS_META_UPDATED, + EVT_IGFS_DIR_CREATED, + EVT_IGFS_DIR_RENAMED, + EVT_IGFS_DIR_DELETED, }; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/core/src/main/java/org/apache/ignite/events/IgfsEvent.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/events/IgfsEvent.java b/modules/core/src/main/java/org/apache/ignite/events/IgfsEvent.java index f18e0f4..49c815f 100644 --- a/modules/core/src/main/java/org/apache/ignite/events/IgfsEvent.java +++ b/modules/core/src/main/java/org/apache/ignite/events/IgfsEvent.java @@ -59,9 +59,9 @@ import static org.apache.ignite.events.EventType.*; * events are required for Ignite's internal operations and such events will still be generated but not stored by * event storage SPI if they are disabled in Ignite configuration. * - * @see EventType#EVT_GGFS_FILE_CREATED - * @see EventType#EVT_GGFS_FILE_RENAMED - * @see EventType#EVT_GGFS_FILE_DELETED + * @see EventType#EVT_IGFS_FILE_CREATED + * @see EventType#EVT_IGFS_FILE_RENAMED + * @see EventType#EVT_IGFS_FILE_DELETED */ public class IgfsEvent extends EventAdapter { /** */ @@ -95,8 +95,8 @@ public class IgfsEvent extends EventAdapter { /** * Constructs an event instance for path modification event - * ({@link EventType#EVT_GGFS_FILE_RENAMED}, - * {@link EventType#EVT_GGFS_DIR_RENAMED}). + * ({@link EventType#EVT_IGFS_FILE_RENAMED}, + * {@link EventType#EVT_IGFS_DIR_RENAMED}). * * @param path File or directory path. * @param newPath New file or directory path. @@ -111,8 +111,8 @@ public class IgfsEvent extends EventAdapter { /** * Constructs an event instance for close events: - * ({@link EventType#EVT_GGFS_FILE_CLOSED_READ}, - * {@link EventType#EVT_GGFS_FILE_CLOSED_WRITE}). + * ({@link EventType#EVT_IGFS_FILE_CLOSED_READ}, + * {@link EventType#EVT_IGFS_FILE_CLOSED_WRITE}). * * @param path File path. * @param node Node. @@ -127,7 +127,7 @@ public class IgfsEvent extends EventAdapter { /** * Constructs an event instance for file metadata update events - * ({@link EventType#EVT_GGFS_META_UPDATED}). + * ({@link EventType#EVT_IGFS_META_UPDATED}). * * @param path File path. * @param node Node. @@ -151,7 +151,7 @@ public class IgfsEvent extends EventAdapter { /** * New file or directory path for this event (used in - * {@link EventType#EVT_GGFS_FILE_RENAMED} event). + * {@link EventType#EVT_IGFS_FILE_RENAMED} event). * * @return New file or directory path or {@code null}, * if not relevant for this event. @@ -187,7 +187,7 @@ public class IgfsEvent extends EventAdapter { public boolean isDirectory() { int t = type(); - return t == EVT_GGFS_DIR_CREATED || t == EVT_GGFS_DIR_RENAMED || t == EVT_GGFS_DIR_DELETED; + return t == EVT_IGFS_DIR_CREATED || t == EVT_IGFS_DIR_RENAMED || t == EVT_IGFS_DIR_DELETED; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index ddb5679..7cdb06d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -675,7 +675,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit // Starts lifecycle aware components. U.startLifecycleAware(lifecycleAwares(cfg)); - addHelper(ctx, GGFS_HELPER.create(F.isEmpty(cfg.getGgfsConfiguration()))); + addHelper(ctx, GGFS_HELPER.create(F.isEmpty(cfg.getIgfsConfiguration()))); startProcessor(ctx, new IgnitePluginProcessor(ctx, cfg), attrs); @@ -727,7 +727,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit startProcessor(ctx, new GridRestProcessor(ctx), attrs); startProcessor(ctx, new GridDataLoaderProcessor(ctx), attrs); startProcessor(ctx, new GridStreamProcessor(ctx), attrs); - startProcessor(ctx, (GridProcessor)GGFS.create(ctx, F.isEmpty(cfg.getGgfsConfiguration())), attrs); + startProcessor(ctx, (GridProcessor)GGFS.create(ctx, F.isEmpty(cfg.getIgfsConfiguration())), attrs); startProcessor(ctx, new GridContinuousProcessor(ctx), attrs); startProcessor(ctx, (GridProcessor)(cfg.isPeerClassLoadingEnabled() ? IgniteComponentType.HADOOP.create(ctx, true): // No-op when peer class loading is enabled. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index 59da2bd..c542d42 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@ -1561,7 +1561,7 @@ public class IgnitionEx { myCfg.setMarshalLocalJobs(cfg.isMarshalLocalJobs()); myCfg.setNodeId(nodeId); - IgfsConfiguration[] ggfsCfgs = cfg.getGgfsConfiguration(); + IgfsConfiguration[] ggfsCfgs = cfg.getIgfsConfiguration(); if (ggfsCfgs != null) { IgfsConfiguration[] clone = ggfsCfgs.clone(); @@ -1569,7 +1569,7 @@ public class IgnitionEx { for (int i = 0; i < ggfsCfgs.length; i++) clone[i] = new IgfsConfiguration(ggfsCfgs[i]); - myCfg.setGgfsConfiguration(clone); + myCfg.setIgfsConfiguration(clone); } StreamerConfiguration[] streamerCfgs = cfg.getStreamerConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 5c4b8a5..db51d98 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -237,7 +237,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, mxBean = new CacheMetricsMXBeanImpl(this); - IgfsConfiguration[] ggfsCfgs = gridCfg.getGgfsConfiguration(); + IgfsConfiguration[] ggfsCfgs = gridCfg.getIgfsConfiguration(); if (ggfsCfgs != null) { for (IgfsConfiguration ggfsCfg : ggfsCfgs) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index c871722..c260d5a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -561,7 +561,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { maxPreloadOrder = validatePreloadOrder(ctx.config().getCacheConfiguration()); // Internal caches which should not be returned to user. - IgfsConfiguration[] ggfsCfgs = ctx.grid().configuration().getGgfsConfiguration(); + IgfsConfiguration[] ggfsCfgs = ctx.grid().configuration().getIgfsConfiguration(); if (ggfsCfgs != null) { for (IgfsConfiguration ggfsCfg : ggfsCfgs) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java index 0f52729..d665326 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java @@ -1584,7 +1584,7 @@ public class GridCacheUtils { * @return {@code True} in this is GGFS data or meta cache. */ public static boolean isGgfsCache(IgniteConfiguration cfg, @Nullable String cacheName) { - IgfsConfiguration[] ggfsCfgs = cfg.getGgfsConfiguration(); + IgfsConfiguration[] ggfsCfgs = cfg.getIgfsConfiguration(); if (ggfsCfgs != null) { for (IgfsConfiguration ggfsCfg : ggfsCfgs) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java index 14f87ad..8da51b1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java @@ -222,10 +222,10 @@ public class IgfsDeleteWorker extends IgfsThread { boolean ret = meta.delete(TRASH_ID, name, id); - if (evts.isRecordable(EVT_GGFS_FILE_PURGED)) { + if (evts.isRecordable(EVT_IGFS_FILE_PURGED)) { if (info.path() != null) evts.record(new IgfsEvent(info.path(), - ggfsCtx.kernalContext().discovery().localNode(), EVT_GGFS_FILE_PURGED)); + ggfsCtx.kernalContext().discovery().localNode(), EVT_IGFS_FILE_PURGED)); else LT.warn(log, null, "Removing file without path info: " + info); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/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 eee0187..227bafc 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 @@ -612,8 +612,8 @@ public final class IgfsImpl implements IgfsEx { IgfsFileInfo info = meta.updateProperties(parentId, fileId, path.name(), props); if (info != null) { - if (evts.isRecordable(EVT_GGFS_META_UPDATED)) - evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_META_UPDATED, props)); + if (evts.isRecordable(EVT_IGFS_META_UPDATED)) + evts.record(new IgfsEvent(path, localNode(), EVT_IGFS_META_UPDATED, props)); return new IgfsFileImpl(path, info, data.groupBlockSize()); } @@ -720,16 +720,16 @@ public final class IgfsImpl implements IgfsEx { meta.move(srcDesc.fileId, srcFileName, srcDesc.parentId, destFileName, destDesc.fileId); if (srcDesc.isFile) { // Renamed a file. - if (evts.isRecordable(EVT_GGFS_FILE_RENAMED)) + if (evts.isRecordable(EVT_IGFS_FILE_RENAMED)) evts.record(new IgfsEvent( src, newDest ? dest : new IgfsPath(dest, destFileName), localNode(), - EVT_GGFS_FILE_RENAMED)); + EVT_IGFS_FILE_RENAMED)); } else { // Renamed a directory. - if (evts.isRecordable(EVT_GGFS_DIR_RENAMED)) - evts.record(new IgfsEvent(src, dest, localNode(), EVT_GGFS_DIR_RENAMED)); + if (evts.isRecordable(EVT_IGFS_DIR_RENAMED)) + evts.record(new IgfsEvent(src, dest, localNode(), EVT_IGFS_DIR_RENAMED)); } } catch (IgniteCheckedException e) { @@ -780,11 +780,11 @@ public final class IgfsImpl implements IgfsEx { // Record event if needed. if (res && desc != null) { if (desc.isFile) { - if (evts.isRecordable(EVT_GGFS_FILE_DELETED)) - evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_FILE_DELETED)); + if (evts.isRecordable(EVT_IGFS_FILE_DELETED)) + evts.record(new IgfsEvent(path, localNode(), EVT_IGFS_FILE_DELETED)); } - else if (evts.isRecordable(EVT_GGFS_DIR_DELETED)) - evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_DIR_DELETED)); + else if (evts.isRecordable(EVT_IGFS_DIR_DELETED)) + evts.record(new IgfsEvent(path, localNode(), EVT_IGFS_DIR_DELETED)); } return res; @@ -899,8 +899,8 @@ public final class IgfsImpl implements IgfsEx { fileId = oldId == null ? fileInfo.id() : oldId; // Update node ID. - if (oldId == null && evts.isRecordable(EVT_GGFS_DIR_CREATED)) - evts.record(new IgfsEvent(curPath, localNode(), EVT_GGFS_DIR_CREATED)); + if (oldId == null && evts.isRecordable(EVT_IGFS_DIR_CREATED)) + evts.record(new IgfsEvent(curPath, localNode(), EVT_IGFS_DIR_CREATED)); } catch (IgniteCheckedException e) { if (log.isDebugEnabled()) @@ -1107,8 +1107,8 @@ public final class IgfsImpl implements IgfsEx { IgfsEventAwareInputStream os = new IgfsEventAwareInputStream(ggfsCtx, path, desc.info(), cfg.getPrefetchBlocks(), seqReadsBeforePrefetch, desc.reader(), metrics); - if (evts.isRecordable(EVT_GGFS_FILE_OPENED_READ)) - evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_FILE_OPENED_READ)); + if (evts.isRecordable(EVT_IGFS_FILE_OPENED_READ)) + evts.record(new IgfsEvent(path, localNode(), EVT_IGFS_FILE_OPENED_READ)); return os; } @@ -1128,8 +1128,8 @@ public final class IgfsImpl implements IgfsEx { IgfsEventAwareInputStream os = new IgfsEventAwareInputStream(ggfsCtx, path, info, cfg.getPrefetchBlocks(), seqReadsBeforePrefetch, null, metrics); - if (evts.isRecordable(EVT_GGFS_FILE_OPENED_READ)) - evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_FILE_OPENED_READ)); + if (evts.isRecordable(EVT_IGFS_FILE_OPENED_READ)) + evts.record(new IgfsEvent(path, localNode(), EVT_IGFS_FILE_OPENED_READ)); return os; } @@ -1210,8 +1210,8 @@ public final class IgfsImpl implements IgfsEx { IgfsEventAwareOutputStream os = new IgfsEventAwareOutputStream(path, desc.info(), desc.parentId(), bufSize == 0 ? cfg.getStreamBufferSize() : bufSize, mode, batch); - if (evts.isRecordable(EVT_GGFS_FILE_OPENED_WRITE)) - evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_FILE_OPENED_WRITE)); + if (evts.isRecordable(EVT_IGFS_FILE_OPENED_WRITE)) + evts.record(new IgfsEvent(path, localNode(), EVT_IGFS_FILE_OPENED_WRITE)); return os; } @@ -1258,20 +1258,20 @@ public final class IgfsImpl implements IgfsEx { // Only one file is deleted, so we use internal data loader. deleteFile(path, new FileDescriptor(parentId, fileName, oldId, oldInfo.isFile()), false); - if (evts.isRecordable(EVT_GGFS_FILE_DELETED)) - evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_FILE_DELETED)); + if (evts.isRecordable(EVT_IGFS_FILE_DELETED)) + evts.record(new IgfsEvent(path, localNode(), EVT_IGFS_FILE_DELETED)); } - if (evts.isRecordable(EVT_GGFS_FILE_CREATED)) - evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_FILE_CREATED)); + if (evts.isRecordable(EVT_IGFS_FILE_CREATED)) + evts.record(new IgfsEvent(path, localNode(), EVT_IGFS_FILE_CREATED)); info = meta.lock(info.id()); IgfsEventAwareOutputStream os = new IgfsEventAwareOutputStream(path, info, parentId, bufSize == 0 ? cfg.getStreamBufferSize() : bufSize, mode, batch); - if (evts.isRecordable(EVT_GGFS_FILE_OPENED_WRITE)) - evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_FILE_OPENED_WRITE)); + if (evts.isRecordable(EVT_IGFS_FILE_OPENED_WRITE)) + evts.record(new IgfsEvent(path, localNode(), EVT_IGFS_FILE_OPENED_WRITE)); return os; } @@ -1347,8 +1347,8 @@ public final class IgfsImpl implements IgfsEx { if (oldId != null) info = meta.info(oldId); - if (evts.isRecordable(EVT_GGFS_FILE_CREATED)) - evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_FILE_CREATED)); + if (evts.isRecordable(EVT_IGFS_FILE_CREATED)) + evts.record(new IgfsEvent(path, localNode(), EVT_IGFS_FILE_CREATED)); } if (!info.isFile()) @@ -1356,8 +1356,8 @@ public final class IgfsImpl implements IgfsEx { info = meta.lock(info.id()); - if (evts.isRecordable(EVT_GGFS_FILE_OPENED_WRITE)) - evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_FILE_OPENED_WRITE)); + if (evts.isRecordable(EVT_IGFS_FILE_OPENED_WRITE)) + evts.record(new IgfsEvent(path, localNode(), EVT_IGFS_FILE_OPENED_WRITE)); return new IgfsEventAwareOutputStream(path, info, parentId, bufSize == 0 ? cfg.getStreamBufferSize() : bufSize, mode, batch); @@ -2010,8 +2010,8 @@ public final class IgfsImpl implements IgfsEx { metrics.decrementFilesOpenedForWrite(); - if (evts.isRecordable(EVT_GGFS_FILE_CLOSED_WRITE)) - evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_FILE_CLOSED_WRITE, bytes())); + if (evts.isRecordable(EVT_IGFS_FILE_CLOSED_WRITE)) + evts.record(new IgfsEvent(path, localNode(), EVT_IGFS_FILE_CLOSED_WRITE, bytes())); } } } @@ -2050,8 +2050,8 @@ public final class IgfsImpl implements IgfsEx { metrics.decrementFilesOpenedForRead(); - if (evts.isRecordable(EVT_GGFS_FILE_CLOSED_READ)) - evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_FILE_CLOSED_READ, bytes())); + if (evts.isRecordable(EVT_IGFS_FILE_CLOSED_READ)) + evts.record(new IgfsEvent(path, localNode(), EVT_IGFS_FILE_CLOSED_READ, bytes())); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java index d2e6c5a..d06ff4f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java @@ -1641,11 +1641,11 @@ public class IgfsMetaManager extends IgfsManager { parentInfo = synchronize(fs, parentPath, parentInfo, parent0, true, null); // Fire notification about missing directories creation. - if (evts.isRecordable(EVT_GGFS_DIR_CREATED)) { + if (evts.isRecordable(EVT_IGFS_DIR_CREATED)) { IgfsPath evtPath = parent0; while (!parentPath.equals(evtPath)) { - pendingEvts.addFirst(new IgfsEvent(evtPath, locNode, EVT_GGFS_DIR_CREATED)); + pendingEvts.addFirst(new IgfsEvent(evtPath, locNode, EVT_IGFS_DIR_CREATED)); evtPath = evtPath.parent(); @@ -1684,13 +1684,13 @@ public class IgfsMetaManager extends IgfsManager { IgniteInternalFuture<?> delFut = igfsCtx.data().delete(oldInfo); // Record PURGE event if needed. - if (evts.isRecordable(EVT_GGFS_FILE_PURGED)) { + if (evts.isRecordable(EVT_IGFS_FILE_PURGED)) { delFut.listenAsync(new CI1<IgniteInternalFuture<?>>() { @Override public void apply(IgniteInternalFuture<?> t) { try { t.get(); // Ensure delete succeeded. - evts.record(new IgfsEvent(path, locNode, EVT_GGFS_FILE_PURGED)); + evts.record(new IgfsEvent(path, locNode, EVT_IGFS_FILE_PURGED)); } catch (IgniteCheckedException e) { LT.warn(log, e, "Old file deletion failed in DUAL mode [path=" + path + @@ -1703,13 +1703,13 @@ public class IgfsMetaManager extends IgfsManager { } // Record DELETE event if needed. - if (evts.isRecordable(EVT_GGFS_FILE_DELETED)) - pendingEvts.add(new IgfsEvent(path, locNode, EVT_GGFS_FILE_DELETED)); + if (evts.isRecordable(EVT_IGFS_FILE_DELETED)) + pendingEvts.add(new IgfsEvent(path, locNode, EVT_IGFS_FILE_DELETED)); } // Record CREATE event if needed. - if (evts.isRecordable(EVT_GGFS_FILE_CREATED)) - pendingEvts.add(new IgfsEvent(path, locNode, EVT_GGFS_FILE_CREATED)); + if (evts.isRecordable(EVT_IGFS_FILE_CREATED)) + pendingEvts.add(new IgfsEvent(path, locNode, EVT_IGFS_FILE_CREATED)); return new IgfsSecondaryOutputStreamDescriptor(parentInfo.id(), newInfo, out); } @@ -1975,11 +1975,11 @@ public class IgfsMetaManager extends IgfsManager { synchronize(fs, parentPath, parentPathInfo, path, true, null); - if (evts.isRecordable(EVT_GGFS_DIR_CREATED)) { + if (evts.isRecordable(EVT_IGFS_DIR_CREATED)) { IgfsPath evtPath = path; while (!parentPath.equals(evtPath)) { - pendingEvts.addFirst(new IgfsEvent(evtPath, locNode, EVT_GGFS_DIR_CREATED)); + pendingEvts.addFirst(new IgfsEvent(evtPath, locNode, EVT_IGFS_DIR_CREATED)); evtPath = evtPath.parent(); @@ -2076,15 +2076,15 @@ public class IgfsMetaManager extends IgfsManager { // Record event if needed. if (srcInfo.isFile()) { - if (evts.isRecordable(EVT_GGFS_FILE_RENAMED)) + if (evts.isRecordable(EVT_IGFS_FILE_RENAMED)) pendingEvts.add(new IgfsEvent( src, destInfo == null ? dest : new IgfsPath(dest, src.name()), locNode, - EVT_GGFS_FILE_RENAMED)); + EVT_IGFS_FILE_RENAMED)); } - else if (evts.isRecordable(EVT_GGFS_DIR_RENAMED)) - pendingEvts.add(new IgfsEvent(src, dest, locNode, EVT_GGFS_DIR_RENAMED)); + else if (evts.isRecordable(EVT_IGFS_DIR_RENAMED)) + pendingEvts.add(new IgfsEvent(src, dest, locNode, EVT_IGFS_DIR_RENAMED)); return true; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java index 42ed3a7..c80530f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java @@ -73,7 +73,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter { if (ctx.config().isDaemon()) return; - IgfsConfiguration[] cfgs = ctx.config().getGgfsConfiguration(); + IgfsConfiguration[] cfgs = ctx.config().getIgfsConfiguration(); assert cfgs != null && cfgs.length > 0; @@ -202,7 +202,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter { // is daemon; // doesn't have configured GGFS; // doesn't have configured caches. - if (gridCfg.isDaemon() || F.isEmpty(gridCfg.getGgfsConfiguration()) || + if (gridCfg.isDaemon() || F.isEmpty(gridCfg.getIgfsConfiguration()) || F.isEmpty(gridCfg.getCacheConfiguration())) return; @@ -216,9 +216,9 @@ public class IgfsProcessor extends IgfsProcessorAdapter { Collection<IgfsAttributes> attrVals = new ArrayList<>(); - assert gridCfg.getGgfsConfiguration() != null; + assert gridCfg.getIgfsConfiguration() != null; - for (IgfsConfiguration ggfsCfg : gridCfg.getGgfsConfiguration()) { + for (IgfsConfiguration ggfsCfg : gridCfg.getIgfsConfiguration()) { CacheConfiguration cacheCfg = cacheCfgs.get(ggfsCfg.getDataCacheName()); if (cacheCfg == null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java index 1a3b8ec..ed33415 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java @@ -108,7 +108,7 @@ public class VisorGridConfiguration implements Serializable { rest(VisorRestConfiguration.from(c)); userAttributes(c.getUserAttributes()); caches(VisorCacheConfiguration.list(c.getCacheConfiguration())); - ggfss(VisorIgfsConfiguration.list(c.getGgfsConfiguration())); + ggfss(VisorIgfsConfiguration.list(c.getIgfsConfiguration())); streamers(VisorStreamerConfiguration.list(c.getStreamerConfiguration())); env(new HashMap<>(getenv())); systemProperties(getProperties()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java index 622a3c2..dce8483 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java @@ -613,7 +613,7 @@ public class VisorTaskUtils { else throw new IgniteCheckedException("Failed to get profiler log folder (unexpected GGFS instance type)"); - URL logsDirUrl = U.resolveIgniteUrl(logsDir != null ? logsDir : DFLT_GGFS_LOG_DIR); + URL logsDirUrl = U.resolveIgniteUrl(logsDir != null ? logsDir : DFLT_IGFS_LOG_DIR); return logsDirUrl != null ? new File(logsDirUrl.getPath()).toPath() : null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/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 733c176..1050c8c 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 @@ -116,9 +116,9 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest cfg.setGridName(gridName); - cfg.setIncludeEventTypes(concat(EVTS_GGFS, EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED)); + cfg.setIncludeEventTypes(concat(EVTS_IGFS, EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED)); - cfg.setGgfsConfiguration(ggfsCfg); + cfg.setIgfsConfiguration(ggfsCfg); cfg.setCacheConfiguration(getCacheConfiguration(gridName)); @@ -164,7 +164,7 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { if (lsnr != null) { - grid(1).events().stopLocalListen(lsnr, EVTS_GGFS); + grid(1).events().stopLocalListen(lsnr, EVTS_IGFS); lsnr = null; } @@ -200,7 +200,7 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest return true; } - }, EVTS_GGFS); + }, EVTS_IGFS); IgfsPath dir = new IgfsPath("/dir1/dir2/dir3"); @@ -222,39 +222,39 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest assertEquals(evtsCnt, evtList.size()); IgfsEvent evt = (IgfsEvent)evtList.get(0); - assertEquals(EVT_GGFS_DIR_CREATED, evt.type()); + assertEquals(EVT_IGFS_DIR_CREATED, evt.type()); assertEquals(new IgfsPath("/dir1"), evt.path()); assertTrue(evt.isDirectory()); evt = (IgfsEvent)evtList.get(1); - assertEquals(EVT_GGFS_DIR_CREATED, evt.type()); + assertEquals(EVT_IGFS_DIR_CREATED, evt.type()); assertEquals(new IgfsPath("/dir1/dir2"), evt.path()); evt = (IgfsEvent)evtList.get(2); - assertEquals(EVT_GGFS_DIR_CREATED, evt.type()); + assertEquals(EVT_IGFS_DIR_CREATED, evt.type()); assertEquals(new IgfsPath("/dir1/dir2/dir3"), evt.path()); evt = (IgfsEvent)evtList.get(3); - assertEquals(EVT_GGFS_FILE_CREATED, evt.type()); + assertEquals(EVT_IGFS_FILE_CREATED, evt.type()); assertEquals(new IgfsPath("/dir1/dir2/dir3/file1"), evt.path()); assertFalse(evt.isDirectory()); evt = (IgfsEvent)evtList.get(4); - assertEquals(EVT_GGFS_FILE_OPENED_WRITE, evt.type()); + assertEquals(EVT_IGFS_FILE_OPENED_WRITE, evt.type()); assertEquals(new IgfsPath("/dir1/dir2/dir3/file1"), evt.path()); evt = (IgfsEvent)evtList.get(5); - assertEquals(EVT_GGFS_FILE_CLOSED_WRITE, evt.type()); + assertEquals(EVT_IGFS_FILE_CLOSED_WRITE, evt.type()); assertEquals(new IgfsPath("/dir1/dir2/dir3/file1"), evt.path()); assertEquals(0, evt.dataSize()); evt = (IgfsEvent)evtList.get(6); - assertEquals(EVT_GGFS_FILE_RENAMED, evt.type()); + assertEquals(EVT_IGFS_FILE_RENAMED, evt.type()); assertEquals(new IgfsPath("/dir1/dir2/dir3/file1"), evt.path()); assertEquals(new IgfsPath("/dir1/dir2/dir3/mvFile1"), evt.newPath()); evt = (IgfsEvent)evtList.get(7); - assertEquals(EVT_GGFS_DIR_DELETED, evt.type()); + assertEquals(EVT_IGFS_DIR_DELETED, evt.type()); assertEquals(new IgfsPath("/dir1/dir2"), evt.path()); } @@ -281,7 +281,7 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest return true; } - }, EVTS_GGFS); + }, EVTS_IGFS); IgfsPath dir = new IgfsPath("/dir1"); @@ -304,38 +304,38 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest assertEquals(evtsCnt, evtList.size()); IgfsEvent evt = (IgfsEvent)evtList.get(0); - assertEquals(EVT_GGFS_DIR_CREATED, evt.type()); + assertEquals(EVT_IGFS_DIR_CREATED, evt.type()); assertEquals(new IgfsPath("/dir1"), evt.path()); assertTrue(evt.isDirectory()); evt = (IgfsEvent)evtList.get(1); - assertEquals(EVT_GGFS_FILE_CREATED, evt.type()); + assertEquals(EVT_IGFS_FILE_CREATED, evt.type()); assertEquals(new IgfsPath("/dir1/file1"), evt.path()); assertFalse(evt.isDirectory()); evt = (IgfsEvent)evtList.get(2); - assertEquals(EVT_GGFS_FILE_OPENED_WRITE, evt.type()); + assertEquals(EVT_IGFS_FILE_OPENED_WRITE, evt.type()); assertEquals(new IgfsPath("/dir1/file1"), evt.path()); evt = (IgfsEvent)evtList.get(3); - assertEquals(EVT_GGFS_FILE_CLOSED_WRITE, evt.type()); + assertEquals(EVT_IGFS_FILE_CLOSED_WRITE, evt.type()); assertEquals(new IgfsPath("/dir1/file1"), evt.path()); evt = (IgfsEvent)evtList.get(4); - assertEquals(EVT_GGFS_FILE_CREATED, evt.type()); + assertEquals(EVT_IGFS_FILE_CREATED, evt.type()); assertEquals(new IgfsPath("/dir1/file2"), evt.path()); assertFalse(evt.isDirectory()); evt = (IgfsEvent)evtList.get(5); - assertEquals(EVT_GGFS_FILE_OPENED_WRITE, evt.type()); + assertEquals(EVT_IGFS_FILE_OPENED_WRITE, evt.type()); assertEquals(new IgfsPath("/dir1/file2"), evt.path()); evt = (IgfsEvent)evtList.get(6); - assertEquals(EVT_GGFS_FILE_CLOSED_WRITE, evt.type()); + assertEquals(EVT_IGFS_FILE_CLOSED_WRITE, evt.type()); assertEquals(new IgfsPath("/dir1/file2"), evt.path()); evt = (IgfsEvent)evtList.get(7); - assertEquals(EVT_GGFS_DIR_DELETED, evt.type()); + assertEquals(EVT_IGFS_DIR_DELETED, evt.type()); assertEquals(new IgfsPath("/dir1"), evt.path()); } @@ -362,7 +362,7 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest return true; } - }, EVTS_GGFS); + }, EVTS_IGFS); IgfsPath dir = new IgfsPath("/dir1"); @@ -381,18 +381,18 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest assertEquals(evtsCnt, evtList.size()); IgfsEvent evt = (IgfsEvent)evtList.get(0); - assertEquals(EVT_GGFS_DIR_CREATED, evt.type()); + assertEquals(EVT_IGFS_DIR_CREATED, evt.type()); assertEquals(new IgfsPath("/dir1"), evt.path()); assertTrue(evt.isDirectory()); evt = (IgfsEvent)evtList.get(1); - assertEquals(EVT_GGFS_DIR_RENAMED, evt.type()); + assertEquals(EVT_IGFS_DIR_RENAMED, evt.type()); assertEquals(new IgfsPath("/dir1"), evt.path()); assertEquals(new IgfsPath("/mvDir1"), evt.newPath()); assertTrue(evt.isDirectory()); evt = (IgfsEvent)evtList.get(2); - assertEquals(EVT_GGFS_DIR_DELETED, evt.type()); + assertEquals(EVT_IGFS_DIR_DELETED, evt.type()); assertEquals(new IgfsPath("/mvDir1"), evt.path()); assertTrue(evt.isDirectory()); } @@ -419,7 +419,7 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest return true; } - }, EVTS_GGFS); + }, EVTS_IGFS); IgfsPath dir = new IgfsPath("/dir1"); @@ -444,42 +444,42 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest assertEquals(evtsCnt, evtList.size()); IgfsEvent evt = (IgfsEvent)evtList.get(0); - assertEquals(EVT_GGFS_DIR_CREATED, evt.type()); + assertEquals(EVT_IGFS_DIR_CREATED, evt.type()); assertEquals(new IgfsPath("/dir1"), evt.path()); assertTrue(evt.isDirectory()); evt = (IgfsEvent)evtList.get(1); - assertEquals(EVT_GGFS_FILE_CREATED, evt.type()); + assertEquals(EVT_IGFS_FILE_CREATED, evt.type()); assertEquals(new IgfsPath("/dir1/file1"), evt.path()); evt = (IgfsEvent)evtList.get(2); - assertEquals(EVT_GGFS_FILE_OPENED_WRITE, evt.type()); + assertEquals(EVT_IGFS_FILE_OPENED_WRITE, evt.type()); assertEquals(new IgfsPath("/dir1/file1"), evt.path()); evt = (IgfsEvent)evtList.get(3); - assertEquals(EVT_GGFS_FILE_CLOSED_WRITE, evt.type()); + assertEquals(EVT_IGFS_FILE_CLOSED_WRITE, evt.type()); assertEquals(new IgfsPath("/dir1/file1"), evt.path()); assertEquals(0, evt.dataSize()); evt = (IgfsEvent)evtList.get(4); - assertEquals(EVT_GGFS_FILE_CREATED, evt.type()); + assertEquals(EVT_IGFS_FILE_CREATED, evt.type()); assertEquals(new IgfsPath("/dir1/file2"), evt.path()); evt = (IgfsEvent)evtList.get(5); - assertEquals(EVT_GGFS_FILE_OPENED_WRITE, evt.type()); + assertEquals(EVT_IGFS_FILE_OPENED_WRITE, evt.type()); assertEquals(new IgfsPath("/dir1/file2"), evt.path()); evt = (IgfsEvent)evtList.get(6); - assertEquals(EVT_GGFS_FILE_CLOSED_WRITE, evt.type()); + assertEquals(EVT_IGFS_FILE_CLOSED_WRITE, evt.type()); assertEquals(new IgfsPath("/dir1/file2"), evt.path()); assertEquals(0, evt.dataSize()); assertOneToOne( evtList.subList(7, 11), - new EventPredicate(EVT_GGFS_FILE_DELETED, new IgfsPath("/dir1/file1")), - new EventPredicate(EVT_GGFS_FILE_PURGED, new IgfsPath("/dir1/file1")), - new EventPredicate(EVT_GGFS_FILE_DELETED, new IgfsPath("/dir1/file2")), - new EventPredicate(EVT_GGFS_FILE_PURGED, new IgfsPath("/dir1/file2")) + new EventPredicate(EVT_IGFS_FILE_DELETED, new IgfsPath("/dir1/file1")), + new EventPredicate(EVT_IGFS_FILE_PURGED, new IgfsPath("/dir1/file1")), + new EventPredicate(EVT_IGFS_FILE_DELETED, new IgfsPath("/dir1/file2")), + new EventPredicate(EVT_IGFS_FILE_PURGED, new IgfsPath("/dir1/file2")) ); } @@ -506,7 +506,7 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest return true; } - }, EVTS_GGFS); + }, EVTS_IGFS); IgfsPath dir = new IgfsPath("/dir1/dir2"); @@ -526,15 +526,15 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest assertEquals(evtsCnt, evtList.size()); IgfsEvent evt = (IgfsEvent)evtList.get(0); - assertEquals(EVT_GGFS_DIR_CREATED, evt.type()); + assertEquals(EVT_IGFS_DIR_CREATED, evt.type()); assertEquals(new IgfsPath("/dir1"), evt.path()); evt = (IgfsEvent)evtList.get(1); - assertEquals(EVT_GGFS_DIR_CREATED, evt.type()); + assertEquals(EVT_IGFS_DIR_CREATED, evt.type()); assertEquals(new IgfsPath("/dir1/dir2"), evt.path()); IgfsEvent evt3 = (IgfsEvent)evtList.get(2); - assertEquals(EVT_GGFS_DIR_DELETED, evt3.type()); + assertEquals(EVT_IGFS_DIR_DELETED, evt3.type()); assertEquals(new IgfsPath("/dir1/dir2"), evt3.path()); } @@ -560,7 +560,7 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest return true; } - }, EVTS_GGFS); + }, EVTS_IGFS); IgfsPath dir = new IgfsPath("/dir1/dir2"); @@ -578,28 +578,28 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest assertEquals(evtsCnt, evtList.size()); IgfsEvent evt = (IgfsEvent)evtList.get(0); - assertEquals(EVT_GGFS_DIR_CREATED, evt.type()); + assertEquals(EVT_IGFS_DIR_CREATED, evt.type()); assertEquals(new IgfsPath("/dir1"), evt.path()); evt = (IgfsEvent)evtList.get(1); - assertEquals(EVT_GGFS_DIR_CREATED, evt.type()); + assertEquals(EVT_IGFS_DIR_CREATED, evt.type()); assertEquals(new IgfsPath("/dir1/dir2"), evt.path()); evt = (IgfsEvent)evtList.get(2); - assertEquals(EVT_GGFS_FILE_CREATED, evt.type()); + assertEquals(EVT_IGFS_FILE_CREATED, evt.type()); assertEquals(new IgfsPath("/dir1/dir2/file1"), evt.path()); evt = (IgfsEvent)evtList.get(3); - assertEquals(EVT_GGFS_FILE_OPENED_WRITE, evt.type()); + assertEquals(EVT_IGFS_FILE_OPENED_WRITE, evt.type()); assertEquals(new IgfsPath("/dir1/dir2/file1"), evt.path()); evt = (IgfsEvent)evtList.get(4); - assertEquals(EVT_GGFS_FILE_CLOSED_WRITE, evt.type()); + assertEquals(EVT_IGFS_FILE_CLOSED_WRITE, evt.type()); assertEquals(new IgfsPath("/dir1/dir2/file1"), evt.path()); assertEquals(0, evt.dataSize()); IgfsEvent evt4 = (IgfsEvent)evtList.get(5); - assertEquals(EVT_GGFS_FILE_RENAMED, evt4.type()); + assertEquals(EVT_IGFS_FILE_RENAMED, evt4.type()); assertEquals(new IgfsPath("/dir1/dir2/file1"), evt4.path()); assertEquals(new IgfsPath("/dir1/file1"), evt4.newPath()); } @@ -627,7 +627,7 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest return true; } - }, EVTS_GGFS); + }, EVTS_IGFS); IgfsPath dir = new IgfsPath("/dir1/dir2"); @@ -642,15 +642,15 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest assertEquals(evtsCnt, evtList.size()); IgfsEvent evt = (IgfsEvent)evtList.get(0); - assertEquals(EVT_GGFS_DIR_CREATED, evt.type()); + assertEquals(EVT_IGFS_DIR_CREATED, evt.type()); assertEquals(new IgfsPath("/dir1"), evt.path()); evt = (IgfsEvent)evtList.get(1); - assertEquals(EVT_GGFS_DIR_CREATED, evt.type()); + assertEquals(EVT_IGFS_DIR_CREATED, evt.type()); assertEquals(new IgfsPath("/dir1/dir2"), evt.path()); evt = (IgfsEvent)evtList.get(2); - assertEquals(EVT_GGFS_DIR_DELETED, evt.type()); + assertEquals(EVT_IGFS_DIR_DELETED, evt.type()); assertEquals(new IgfsPath("/dir1"), evt.path()); } @@ -677,7 +677,7 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest return true; } - }, EVTS_GGFS); + }, EVTS_IGFS); final IgfsPath file = new IgfsPath("/file1"); @@ -699,15 +699,15 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest final IgfsPath file1 = new IgfsPath("/file1"); IgfsEvent evt = (IgfsEvent)evtList.get(0); - assertEquals(EVT_GGFS_FILE_CREATED, evt.type()); + assertEquals(EVT_IGFS_FILE_CREATED, evt.type()); assertEquals(file1, evt.path()); evt = (IgfsEvent)evtList.get(1); - assertEquals(EVT_GGFS_FILE_OPENED_WRITE, evt.type()); + assertEquals(EVT_IGFS_FILE_OPENED_WRITE, evt.type()); assertEquals(file1, evt.path()); evt = (IgfsEvent)evtList.get(2); - assertEquals(EVT_GGFS_FILE_CLOSED_WRITE, evt.type()); + assertEquals(EVT_IGFS_FILE_CLOSED_WRITE, evt.type()); assertEquals(file1, evt.path()); assertEquals(0, evt.dataSize()); @@ -717,35 +717,35 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest @Override public boolean apply(Event e) { IgfsEvent e0 = (IgfsEvent)e; - return e0.type() == EVT_GGFS_FILE_DELETED && e0.path().equals(file1); + return e0.type() == EVT_IGFS_FILE_DELETED && e0.path().equals(file1); } }, new P1<Event>() { @Override public boolean apply(Event e) { IgfsEvent e0 = (IgfsEvent)e; - return e0.type() == EVT_GGFS_FILE_PURGED && e0.path().equals(file1); + return e0.type() == EVT_IGFS_FILE_PURGED && e0.path().equals(file1); } }, new P1<Event>() { @Override public boolean apply(Event e) { IgfsEvent e0 = (IgfsEvent)e; - return e0.type() == EVT_GGFS_FILE_CREATED && e0.path().equals(file1); + return e0.type() == EVT_IGFS_FILE_CREATED && e0.path().equals(file1); } }, new P1<Event>() { @Override public boolean apply(Event e) { IgfsEvent e0 = (IgfsEvent)e; - return e0.type() == EVT_GGFS_FILE_OPENED_WRITE && e0.path().equals(file1); + return e0.type() == EVT_IGFS_FILE_OPENED_WRITE && e0.path().equals(file1); } }, new P1<Event>() { @Override public boolean apply(Event e) { IgfsEvent e0 = (IgfsEvent)e; - return e0.type() == EVT_GGFS_FILE_CLOSED_WRITE && e0.path().equals(file1); + return e0.type() == EVT_IGFS_FILE_CLOSED_WRITE && e0.path().equals(file1); } } ); @@ -773,7 +773,7 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest return true; } - }, EVTS_GGFS); + }, EVTS_IGFS); final IgfsPath file = new IgfsPath("/file1"); @@ -796,24 +796,24 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest assertEquals(evtsCnt, evtList.size()); IgfsEvent evt = (IgfsEvent)evtList.get(0); - assertEquals(EVT_GGFS_FILE_CREATED, evt.type()); + assertEquals(EVT_IGFS_FILE_CREATED, evt.type()); assertEquals(new IgfsPath("/file1"), evt.path()); evt = (IgfsEvent)evtList.get(1); - assertEquals(EVT_GGFS_FILE_OPENED_WRITE, evt.type()); + assertEquals(EVT_IGFS_FILE_OPENED_WRITE, evt.type()); assertEquals(new IgfsPath("/file1"), evt.path()); evt = (IgfsEvent)evtList.get(2); - assertEquals(EVT_GGFS_FILE_CLOSED_WRITE, evt.type()); + assertEquals(EVT_IGFS_FILE_CLOSED_WRITE, evt.type()); assertEquals(new IgfsPath("/file1"), evt.path()); assertEquals((long)dataSize, evt.dataSize()); evt = (IgfsEvent)evtList.get(3); - assertEquals(EVT_GGFS_FILE_OPENED_READ, evt.type()); + assertEquals(EVT_IGFS_FILE_OPENED_READ, evt.type()); assertEquals(new IgfsPath("/file1"), evt.path()); evt = (IgfsEvent)evtList.get(4); - assertEquals(EVT_GGFS_FILE_CLOSED_READ, evt.type()); + assertEquals(EVT_IGFS_FILE_CLOSED_READ, evt.type()); assertEquals(new IgfsPath("/file1"), evt.path()); assertEquals((long)dataSize, evt.dataSize()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/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 0f56897..ad1e824 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 @@ -76,7 +76,7 @@ public class IgfsFragmentizerAbstractSelfTest extends IgfsCommonAbstractTest { ggfsCfg.setFragmentizerThrottlingBlockLength(16 * GGFS_BLOCK_SIZE); ggfsCfg.setFragmentizerThrottlingDelay(10); - cfg.setGgfsConfiguration(ggfsCfg); + cfg.setIgfsConfiguration(ggfsCfg); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java index 3b5c38b..1db7d9f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java @@ -130,7 +130,7 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb cfg.setDiscoverySpi(discoSpi); cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg); - cfg.setGgfsConfiguration(ggfsCfg); + cfg.setIgfsConfiguration(ggfsCfg); cfg.setLocalHost("127.0.0.1"); cfg.setConnectorConfiguration(null); @@ -188,7 +188,7 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb cfg.setDiscoverySpi(discoSpi); cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg); - cfg.setGgfsConfiguration(ggfsCfg); + cfg.setIgfsConfiguration(ggfsCfg); cfg.setLocalHost("127.0.0.1"); cfg.setConnectorConfiguration(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/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 bd0bb17..a61222c 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 @@ -225,7 +225,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { cfg.setDiscoverySpi(discoSpi); cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg); - cfg.setGgfsConfiguration(ggfsCfg); + cfg.setIgfsConfiguration(ggfsCfg); cfg.setLocalHost("127.0.0.1"); cfg.setConnectorConfiguration(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java index 25070e2..a29bb67 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java @@ -62,7 +62,7 @@ public class IgfsCacheSelfTest extends IgfsCommonAbstractTest { ggfsCfg.setDataCacheName(DATA_CACHE_NAME); ggfsCfg.setName("igfs"); - cfg.setGgfsConfiguration(ggfsCfg); + cfg.setIgfsConfiguration(ggfsCfg); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java index 3d03b75..3274363 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java @@ -103,7 +103,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest { igfsCfg.setName("igfs"); igfsCfg.setBlockSize(BLOCK_SIZE); - cfg.setGgfsConfiguration(igfsCfg); + cfg.setIgfsConfiguration(igfsCfg); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/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 3830cdf..acbf956 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 @@ -81,7 +81,7 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest { ggfsCfg.setDataCacheName(DATA_CACHE_NAME); ggfsCfg.setName("igfs"); - cfg.setGgfsConfiguration(ggfsCfg); + cfg.setIgfsConfiguration(ggfsCfg); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/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 d282f11..68829e2 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 @@ -146,7 +146,7 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest { cfg.setDiscoverySpi(discoSpi); cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg); - cfg.setGgfsConfiguration(ggfsCfg); + cfg.setIgfsConfiguration(ggfsCfg); cfg.setLocalHost("127.0.0.1"); @@ -198,7 +198,7 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest { cfg.setDiscoverySpi(discoSpi); cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg); - cfg.setGgfsConfiguration(ggfsCfg); + cfg.setIgfsConfiguration(ggfsCfg); cfg.setLocalHost("127.0.0.1"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java index 09e0e0d..13a5bf7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java @@ -128,7 +128,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest { cfg.setDiscoverySpi(discoSpi); cfg.setCacheConfiguration(metaCacheCfg, cacheCfg); - cfg.setGgfsConfiguration(ggfsCfg); + cfg.setIgfsConfiguration(ggfsCfg); cfg.setLocalHost("127.0.0.1"); cfg.setConnectorConfiguration(null); @@ -185,7 +185,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest { cfg.setDiscoverySpi(discoSpi); cfg.setCacheConfiguration(metaCacheCfg, cacheCfg); - cfg.setGgfsConfiguration(ggfsCfg); + cfg.setIgfsConfiguration(ggfsCfg); cfg.setLocalHost("127.0.0.1"); cfg.setConnectorConfiguration(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/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 270bc0d..ac25d61 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 @@ -73,7 +73,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest { ggfs = grid.fileSystem(ggfsName()); - IgfsConfiguration[] cfgs = grid.configuration().getGgfsConfiguration(); + IgfsConfiguration[] cfgs = grid.configuration().getIgfsConfiguration(); assert cfgs.length == 1; @@ -117,7 +117,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest { ggfsCfg.setDataCacheName(DATA_CACHE_NAME); ggfsCfg.setName("igfs"); - cfg.setGgfsConfiguration(ggfsCfg); + cfg.setIgfsConfiguration(ggfsCfg); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java index d83e4f8..3b8515a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java @@ -89,7 +89,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { g1GgfsCfg2.setDataCacheName(dataCache2Name); g1GgfsCfg2.setMetaCacheName(metaCache2Name); - cfg.setGgfsConfiguration(g1GgfsCfg1, g1GgfsCfg2); + cfg.setIgfsConfiguration(g1GgfsCfg1, g1GgfsCfg2); cfg.setLocalHost("127.0.0.1"); @@ -282,7 +282,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { g2GgfsCfg1.setBlockSize(g2GgfsCfg1.getBlockSize() + 100); - g2Cfg.setGgfsConfiguration(g2GgfsCfg1, g1GgfsCfg2); + g2Cfg.setIgfsConfiguration(g2GgfsCfg1, g1GgfsCfg2); G.start(g1Cfg); @@ -320,7 +320,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches("g2MetaCache1", "g2MetaCache2"), CacheConfiguration.class)); - g2Cfg.setGgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2); + g2Cfg.setIgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2); G.start(g1Cfg); @@ -346,7 +346,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { g2Cfg.setCacheConfiguration(concat(dataCaches(1024, "g2DataCache1", "g2DataCache2"), metaCaches(), CacheConfiguration.class)); - g2Cfg.setGgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2); + g2Cfg.setIgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2); G.start(g1Cfg); @@ -369,7 +369,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { g2Cfg.setCacheConfiguration(concat(dataCaches(1024, "g2DataCache1", "g2DataCache2"), metaCaches(), CacheConfiguration.class)); - g2Cfg.setGgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2); + g2Cfg.setIgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2); G.start(g1Cfg); @@ -395,7 +395,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches("g2MetaCache1", "g2MetaCache2"), CacheConfiguration.class)); - g2Cfg.setGgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2); + g2Cfg.setIgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2); G.start(g1Cfg); @@ -420,7 +420,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class)); g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class)); - g2Cfg.setGgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2); + g2Cfg.setIgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2); G.start(g1Cfg); @@ -442,7 +442,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class)); g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class)); - g2Cfg.setGgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2); + g2Cfg.setIgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2); G.start(g1Cfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java index 2267fd9..dfad276 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java @@ -58,7 +58,7 @@ public abstract class IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest e public void testLoopbackEndpointsRegistration() throws Exception { IgniteConfiguration cfg = gridConfiguration(); - cfg.setGgfsConfiguration( + cfg.setIgfsConfiguration( igniteFsConfiguration("tcp", DFLT_IPC_PORT, null) ); @@ -77,7 +77,7 @@ public abstract class IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest e public void testLoopbackEndpointsCustomHostRegistration() throws Exception { IgniteConfiguration cfg = gridConfiguration(); - cfg.setGgfsConfiguration( + cfg.setIgfsConfiguration( igniteFsConfiguration("tcp", DFLT_IPC_PORT, "127.0.0.1"), igniteFsConfiguration("tcp", DFLT_IPC_PORT + 1, U.getLocalHost().getHostName())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.java index 6def2d3..bc9cbf0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.java @@ -34,7 +34,7 @@ public class IgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest public void testLoopbackAndShmemEndpointsRegistration() throws Exception { IgniteConfiguration cfg = gridConfiguration(); - cfg.setGgfsConfiguration( + cfg.setIgfsConfiguration( igniteFsConfiguration(null, null, null), // Check null IPC endpoint config won't bring any hassles. igniteFsConfiguration("tcp", DFLT_IPC_PORT + 1, null), igniteFsConfiguration("shmem", DFLT_IPC_PORT + 2, null)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest.java index df9916f..bcdf1d7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest.java @@ -40,7 +40,7 @@ public class IgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest @Override public Object call() throws Exception { IgniteConfiguration cfg = gridConfiguration(); - cfg.setGgfsConfiguration(igniteFsConfiguration("shmem", IpcSharedMemoryServerEndpoint.DFLT_IPC_PORT, + cfg.setIgfsConfiguration(igniteFsConfiguration("shmem", IpcSharedMemoryServerEndpoint.DFLT_IPC_PORT, null)); return G.start(cfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java index c6ecbe4..c88205e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java @@ -154,7 +154,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { cfg.setDiscoverySpi(discoSpi); cfg.setCacheConfiguration(metaCfg, dataCfg); - cfg.setGgfsConfiguration(ggfsCfg); + cfg.setIgfsConfiguration(ggfsCfg); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/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 ddf6214..db93385 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 @@ -118,7 +118,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest { ggfsCfg.setBlockSize(CFG_BLOCK_SIZE); ggfsCfg.setFragmentizerEnabled(true); - cfg.setGgfsConfiguration(ggfsCfg); + cfg.setIgfsConfiguration(ggfsCfg); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/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 7b00d5d..c7de836 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 @@ -133,7 +133,7 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest { cfg.setDiscoverySpi(discoSpi); cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg); - cfg.setGgfsConfiguration(ggfsCfg); + cfg.setIgfsConfiguration(ggfsCfg); cfg.setGridName("node-" + idx); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/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 625f167..63b6c1e 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 @@ -87,7 +87,7 @@ public class IgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(discoSpi); cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg); - cfg.setGgfsConfiguration(ggfsCfg); + cfg.setIgfsConfiguration(ggfsCfg); Ignite g = G.start(cfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java index 75c3c59..1e0d175 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java @@ -60,7 +60,7 @@ public class IpcSharedMemoryNodeStartup { ggfsCfg.setMetaCacheName("partitioned"); ggfsCfg.setName("igfs"); - cfg.setGgfsConfiguration(ggfsCfg); + cfg.setIgfsConfiguration(ggfsCfg); CacheConfiguration cacheCfg = new CacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java index c5e9b46..f8420c4 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java @@ -236,7 +236,7 @@ public class IgfsHadoopFileSystem extends FileSystem { preferLocFileWrites = cfg.getBoolean(PARAM_GGFS_PREFER_LOCAL_WRITES, false); // Get log directory. - String logDirCfg = parameter(cfg, PARAM_GGFS_LOG_DIR, uriAuthority, DFLT_GGFS_LOG_DIR); + String logDirCfg = parameter(cfg, PARAM_GGFS_LOG_DIR, uriAuthority, DFLT_IGFS_LOG_DIR); File logDirFile = U.resolveIgnitePath(logDirCfg); @@ -259,7 +259,7 @@ public class IgfsHadoopFileSystem extends FileSystem { if (logDir == null) throw new IOException("Failed to resolve log directory: " + logDirCfg); - Integer batchSize = parameter(cfg, PARAM_GGFS_LOG_BATCH_SIZE, uriAuthority, DFLT_GGFS_LOG_BATCH_SIZE); + Integer batchSize = parameter(cfg, PARAM_GGFS_LOG_BATCH_SIZE, uriAuthority, DFLT_IGFS_LOG_BATCH_SIZE); clientLog = IgfsLogger.logger(uriAuthority, handshake.ggfsName(), logDir, batchSize); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd5f9f00/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java index 03d08e5..768234a 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java @@ -232,7 +232,7 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl preferLocFileWrites = cfg.getBoolean(PARAM_GGFS_PREFER_LOCAL_WRITES, false); // Get log directory. - String logDirCfg = parameter(cfg, PARAM_GGFS_LOG_DIR, uriAuthority, DFLT_GGFS_LOG_DIR); + String logDirCfg = parameter(cfg, PARAM_GGFS_LOG_DIR, uriAuthority, DFLT_IGFS_LOG_DIR); File logDirFile = U.resolveIgnitePath(logDirCfg); @@ -254,7 +254,7 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl if (logDir == null) throw new IOException("Failed to resolve log directory: " + logDirCfg); - Integer batchSize = parameter(cfg, PARAM_GGFS_LOG_BATCH_SIZE, uriAuthority, DFLT_GGFS_LOG_BATCH_SIZE); + Integer batchSize = parameter(cfg, PARAM_GGFS_LOG_BATCH_SIZE, uriAuthority, DFLT_IGFS_LOG_BATCH_SIZE); clientLog = IgfsLogger.logger(uriAuthority, handshake.ggfsName(), logDir, batchSize); }
