ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [53/57] [abbrv] incubator-ignite git commit: # IGNITE-226: WIP (13)
Date Fri, 13 Feb 2015 10:55:03 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/main/java/org/apache/ignite/configuration/IgniteFsConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteFsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteFsConfiguration.java
deleted file mode 100644
index d12e94d..0000000
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteFsConfiguration.java
+++ /dev/null
@@ -1,807 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.configuration;
-
-import org.apache.ignite.ignitefs.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-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()}
- * method.
- * <p>
- * Refer to {@code config/hadoop/default-config.xml} or {@code config/hadoop/default-config-client.xml}
- * configuration files under Ignite installation to see sample {@code GGFS} configuration.
- */
-public class IgniteFsConfiguration {
-    /** Default file system user name. */
-    public static final String DFLT_USER_NAME = System.getProperty("user.name", "anonymous");
-
-    /** Default IPC port. */
-    public static final int DFLT_IPC_PORT = 10500;
-
-    /** Default fragmentizer throttling block length. */
-    public static final long DFLT_FRAGMENTIZER_THROTTLING_BLOCK_LENGTH = 16 * 1024 * 1024;
-
-    /** Default fragmentizer throttling delay. */
-    public static final long DFLT_FRAGMENTIZER_THROTTLING_DELAY = 200;
-
-    /** Default fragmentizer concurrent files. */
-    public static final int DFLT_FRAGMENTIZER_CONCURRENT_FILES = 0;
-
-    /** Default fragmentizer local writes ratio. */
-    public static final float DFLT_FRAGMENTIZER_LOCAL_WRITES_RATIO = 0.8f;
-
-    /** Fragmentizer enabled property. */
-    public static final boolean DFLT_FRAGMENTIZER_ENABLED = true;
-
-    /** Default batch size for logging. */
-    public static final int DFLT_GGFS_LOG_BATCH_SIZE = 100;
-
-    /** Default {@code GGFS} log directory. */
-    public static final String DFLT_GGFS_LOG_DIR = "work/ggfs/log";
-
-    /** Default per node buffer size. */
-    public static final int DFLT_PER_NODE_BATCH_SIZE = 100;
-
-    /** Default number of per node parallel operations. */
-    public static final int DFLT_PER_NODE_PARALLEL_BATCH_CNT = 8;
-
-    /** Default GGFS mode. */
-    public static final IgfsMode DFLT_MODE = IgfsMode.DUAL_ASYNC;
-
-    /** Default file's data block size (bytes). */
-    public static final int DFLT_BLOCK_SIZE = 1 << 16;
-
-    /** Default read/write buffers size (bytes). */
-    public static final int DFLT_BUF_SIZE = 1 << 16;
-
-    /** Default trash directory purge await timeout in case data cache oversize is detected. */
-    public static final long DFLT_TRASH_PURGE_TIMEOUT = 1000;
-
-    /** Default management port. */
-    public static final int DFLT_MGMT_PORT = 11400;
-
-    /** Default IPC endpoint enabled flag. */
-    public static final boolean DFLT_IPC_ENDPOINT_ENABLED = true;
-
-    /** GGFS instance name. */
-    private String name;
-
-    /** Cache name to store GGFS meta information. */
-    private String metaCacheName;
-
-    /** Cache name to store file's data blocks. */
-    private String dataCacheName;
-
-    /** File's data block size (bytes). */
-    private int blockSize = DFLT_BLOCK_SIZE;
-
-    /** The number of pre-fetched blocks if specific file's chunk is requested. */
-    private int prefetchBlocks;
-
-    /** Amount of sequential block reads before prefetch is triggered. */
-    private int seqReadsBeforePrefetch;
-
-    /** Read/write buffers size for stream operations (bytes). */
-    private int bufSize = DFLT_BUF_SIZE;
-
-    /** Per node buffer size. */
-    private int perNodeBatchSize = DFLT_PER_NODE_BATCH_SIZE;
-
-    /** Per node parallel operations. */
-    private int perNodeParallelBatchCnt = DFLT_PER_NODE_PARALLEL_BATCH_CNT;
-
-    /** IPC endpoint properties to publish GGFS over. */
-    private Map<String, String> ipcEndpointCfg;
-
-    /** IPC endpoint enabled flag. */
-    private boolean ipcEndpointEnabled = DFLT_IPC_ENDPOINT_ENABLED;
-
-    /** Management port. */
-    private int mgmtPort = DFLT_MGMT_PORT;
-
-    /** Secondary file system */
-    private Igfs secondaryFs;
-
-    /** GGFS mode. */
-    private IgfsMode dfltMode = DFLT_MODE;
-
-    /** Fragmentizer throttling block length. */
-    private long fragmentizerThrottlingBlockLen = DFLT_FRAGMENTIZER_THROTTLING_BLOCK_LENGTH;
-
-    /** Fragmentizer throttling delay. */
-    private long fragmentizerThrottlingDelay = DFLT_FRAGMENTIZER_THROTTLING_DELAY;
-
-    /** Fragmentizer concurrent files. */
-    private int fragmentizerConcurrentFiles = DFLT_FRAGMENTIZER_CONCURRENT_FILES;
-
-    /** Fragmentizer local writes ratio. */
-    private float fragmentizerLocWritesRatio = DFLT_FRAGMENTIZER_LOCAL_WRITES_RATIO;
-
-    /** Fragmentizer enabled flag. */
-    private boolean fragmentizerEnabled = DFLT_FRAGMENTIZER_ENABLED;
-
-    /** Path modes. */
-    private Map<String, IgfsMode> pathModes;
-
-    /** Maximum space. */
-    private long maxSpace;
-
-    /** Trash purge await timeout. */
-    private long trashPurgeTimeout = DFLT_TRASH_PURGE_TIMEOUT;
-
-    /** Dual mode PUT operations executor service. */
-    private ExecutorService dualModePutExec;
-
-    /** Dual mode PUT operations executor service shutdown flag. */
-    private boolean dualModePutExecShutdown;
-
-    /** Maximum amount of data in pending puts. */
-    private long dualModeMaxPendingPutsSize;
-
-    /** Maximum range length. */
-    private long maxTaskRangeLen;
-
-    /**
-     * Constructs default configuration.
-     */
-    public IgniteFsConfiguration() {
-        // No-op.
-    }
-
-    /**
-     * Constructs the copy of the configuration.
-     *
-     * @param cfg Configuration to copy.
-     */
-    public IgniteFsConfiguration(IgniteFsConfiguration cfg) {
-        assert cfg != null;
-
-        /*
-         * Must preserve alphabetical order!
-         */
-        blockSize = cfg.getBlockSize();
-        bufSize = cfg.getStreamBufferSize();
-        dataCacheName = cfg.getDataCacheName();
-        dfltMode = cfg.getDefaultMode();
-        dualModeMaxPendingPutsSize = cfg.getDualModeMaxPendingPutsSize();
-        dualModePutExec = cfg.getDualModePutExecutorService();
-        dualModePutExecShutdown = cfg.getDualModePutExecutorServiceShutdown();
-        fragmentizerConcurrentFiles = cfg.getFragmentizerConcurrentFiles();
-        fragmentizerLocWritesRatio = cfg.getFragmentizerLocalWritesRatio();
-        fragmentizerEnabled = cfg.isFragmentizerEnabled();
-        fragmentizerThrottlingBlockLen = cfg.getFragmentizerThrottlingBlockLength();
-        fragmentizerThrottlingDelay = cfg.getFragmentizerThrottlingDelay();
-        secondaryFs = cfg.getSecondaryFileSystem();
-        ipcEndpointCfg = cfg.getIpcEndpointConfiguration();
-        ipcEndpointEnabled = cfg.isIpcEndpointEnabled();
-        maxSpace = cfg.getMaxSpaceSize();
-        maxTaskRangeLen = cfg.getMaximumTaskRangeLength();
-        metaCacheName = cfg.getMetaCacheName();
-        mgmtPort = cfg.getManagementPort();
-        name = cfg.getName();
-        pathModes = cfg.getPathModes();
-        perNodeBatchSize = cfg.getPerNodeBatchSize();
-        perNodeParallelBatchCnt = cfg.getPerNodeParallelBatchCount();
-        prefetchBlocks = cfg.getPrefetchBlocks();
-        seqReadsBeforePrefetch = cfg.getSequentialReadsBeforePrefetch();
-        trashPurgeTimeout = cfg.getTrashPurgeTimeout();
-    }
-
-    /**
-     * Gets GGFS instance name. If {@code null}, then instance with default
-     * name will be used.
-     *
-     * @return GGFS instance name.
-     */
-    @Nullable public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets GGFS instance name.
-     *
-     * @param name GGFS instance name.
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * Cache name to store GGFS meta information. If {@code null}, then instance
-     * with default meta-cache name will be used.
-     *
-     * @return Cache name to store GGFS meta information.
-     */
-    @Nullable public String getMetaCacheName() {
-        return metaCacheName;
-    }
-
-    /**
-     * Sets cache name to store GGFS meta information.
-     *
-     * @param metaCacheName Cache name to store GGFS meta information.
-     */
-    public void setMetaCacheName(String metaCacheName) {
-        this.metaCacheName = metaCacheName;
-    }
-
-    /**
-     * Cache name to store GGFS data.
-     *
-     * @return Cache name to store GGFS data.
-     */
-    @Nullable public String getDataCacheName() {
-        return dataCacheName;
-    }
-
-    /**
-     * Sets cache name to store GGFS data.
-     *
-     * @param dataCacheName Cache name to store GGFS data.
-     */
-    public void setDataCacheName(String dataCacheName) {
-        this.dataCacheName = dataCacheName;
-    }
-
-    /**
-     * Get file's data block size.
-     *
-     * @return File's data block size.
-     */
-    public int getBlockSize() {
-        return blockSize;
-    }
-
-    /**
-     * Sets file's data block size.
-     *
-     * @param blockSize File's data block size (bytes) or {@code 0} to reset default value.
-     */
-    public void setBlockSize(int blockSize) {
-        A.ensure(blockSize >= 0, "blockSize >= 0");
-
-        this.blockSize = blockSize == 0 ? DFLT_BLOCK_SIZE : blockSize;
-    }
-
-    /**
-     * Get number of pre-fetched blocks if specific file's chunk is requested.
-     *
-     * @return The number of pre-fetched blocks.
-     */
-    public int getPrefetchBlocks() {
-        return prefetchBlocks;
-    }
-
-    /**
-     * Sets the number of pre-fetched blocks if specific file's chunk is requested.
-     *
-     * @param prefetchBlocks New number of pre-fetched blocks.
-     */
-    public void setPrefetchBlocks(int prefetchBlocks) {
-        A.ensure(prefetchBlocks >= 0, "prefetchBlocks >= 0");
-
-        this.prefetchBlocks = prefetchBlocks;
-    }
-
-    /**
-     * Get amount of sequential block reads before prefetch is triggered. The
-     * higher this value, the longer GGFS will wait before starting to prefetch
-     * values ahead of time. Depending on the use case, this can either help
-     * or hurt performance.
-     * <p>
-     * Default is {@code 0} which means that pre-fetching will start right away.
-     * <h1 class="header">Integration With Hadoop</h1>
-     * This parameter can be also overridden for individual Hadoop MapReduce tasks by passing
-     * {@code org.apache.ignite.ignitefs.hadoop.GridGgfsHadoopParameters.PARAM_GGFS_SEQ_READS_BEFORE_PREFETCH}
-     * configuration property directly to Hadoop MapReduce task.
-     * <p>
-     * <b>NOTE:</b> Integration with Hadoop is available only in {@code In-Memory Accelerator For Hadoop} edition.
-     *
-     * @return Amount of sequential block reads.
-     */
-    public int getSequentialReadsBeforePrefetch() {
-        return seqReadsBeforePrefetch;
-    }
-
-    /**
-     * Sets amount of sequential block reads before prefetch is triggered. The
-     * higher this value, the longer GGFS will wait before starting to prefetch
-     * values ahead of time. Depending on the use case, this can either help
-     * or hurt performance.
-     * <p>
-     * Default is {@code 0} which means that pre-fetching will start right away.
-     * <h1 class="header">Integration With Hadoop</h1>
-     * This parameter can be also overridden for individual Hadoop MapReduce tasks by passing
-     * {@code org.apache.ignite.ignitefs.hadoop.GridGgfsHadoopParameters.PARAM_GGFS_SEQ_READS_BEFORE_PREFETCH}
-     * configuration property directly to Hadoop MapReduce task.
-     * <p>
-     * <b>NOTE:</b> Integration with Hadoop is available only in {@code In-Memory Accelerator For Hadoop} edition.
-     *
-     * @param seqReadsBeforePrefetch Amount of sequential block reads before prefetch is triggered.
-     */
-    public void setSequentialReadsBeforePrefetch(int seqReadsBeforePrefetch) {
-        A.ensure(seqReadsBeforePrefetch >= 0, "seqReadsBeforePrefetch >= 0");
-
-        this.seqReadsBeforePrefetch = seqReadsBeforePrefetch;
-    }
-
-    /**
-     * Get read/write buffer size for {@code GGFS} stream operations in bytes.
-     *
-     * @return Read/write buffers size (bytes).
-     */
-    public int getStreamBufferSize() {
-        return bufSize;
-    }
-
-    /**
-     * Sets read/write buffers size for {@code GGFS} stream operations (bytes).
-     *
-     * @param bufSize Read/write buffers size for stream operations (bytes) or {@code 0} to reset default value.
-     */
-    public void setStreamBufferSize(int bufSize) {
-        A.ensure(bufSize >= 0, "bufSize >= 0");
-
-        this.bufSize = bufSize == 0 ? DFLT_BUF_SIZE : bufSize;
-    }
-
-    /**
-     * Gets number of file blocks buffered on local node before sending batch to remote node.
-     *
-     * @return Per node buffer size.
-     */
-    public int getPerNodeBatchSize() {
-        return perNodeBatchSize;
-    }
-
-    /**
-     * Sets number of file blocks collected on local node before sending batch to remote node.
-     *
-     * @param perNodeBatchSize Per node buffer size.
-     */
-    public void setPerNodeBatchSize(int perNodeBatchSize) {
-        this.perNodeBatchSize = perNodeBatchSize;
-    }
-
-    /**
-     * Gets number of batches that can be concurrently sent to remote node.
-     *
-     * @return Number of batches for each node.
-     */
-    public int getPerNodeParallelBatchCount() {
-        return perNodeParallelBatchCnt;
-    }
-
-    /**
-     * Sets number of file block batches that can be concurrently sent to remote node.
-     *
-     * @param perNodeParallelBatchCnt Per node parallel load operations.
-     */
-    public void setPerNodeParallelBatchCount(int perNodeParallelBatchCnt) {
-        this.perNodeParallelBatchCnt = perNodeParallelBatchCnt;
-    }
-
-    /**
-     * Gets map of IPC endpoint configuration properties. There are 2 different
-     * types of endpoint supported: {@code shared-memory}, and {@code TCP}.
-     * <p>
-     * The following configuration properties are supported for {@code shared-memory}
-     * endpoint:
-     * <ul>
-     *     <li>{@code type} - value is {@code shmem} to specify {@code shared-memory} approach.</li>
-     *     <li>{@code port} - endpoint port.</li>
-     *     <li>{@code size} - memory size allocated for single endpoint communication.</li>
-     *     <li>
-     *         {@code tokenDirectoryPath} - path, either absolute or relative to {@code IGNITE_HOME} to
-     *         store shared memory tokens.
-     *     </li>
-     * </ul>
-     * <p>
-     * The following configuration properties are supported for {@code TCP} approach:
-     * <ul>
-     *     <li>{@code type} - value is {@code tcp} to specify {@code TCP} approach.</li>
-     *     <li>{@code port} - endpoint bind port.</li>
-     *     <li>
-     *         {@code host} - endpoint bind host. If omitted '127.0.0.1' will be used.
-     *     </li>
-     * </ul>
-     * <p>
-     * Note that {@code shared-memory} approach is not supported on Windows environments.
-     * In case GGFS is failed to bind to particular port, further attempts will be performed every 3 seconds.
-     *
-     * @return Map of IPC endpoint configuration properties. In case the value is not set, defaults will be used. Default
-     * type for Windows is "tcp", for all other platforms - "shmem". Default port is {@link #DFLT_IPC_PORT}.
-     */
-    @Nullable public Map<String,String> getIpcEndpointConfiguration() {
-        return ipcEndpointCfg;
-    }
-
-    /**
-     * Sets IPC endpoint configuration to publish GGFS over.
-     *
-     * @param ipcEndpointCfg Map of IPC endpoint config properties.
-     */
-    public void setIpcEndpointConfiguration(@Nullable Map<String,String> ipcEndpointCfg) {
-        this.ipcEndpointCfg = ipcEndpointCfg;
-    }
-
-    /**
-     * Get IPC endpoint enabled flag. In case it is set to {@code true} endpoint will be created and bound to specific
-     * port. Otherwise endpoint will not be created. Default value is {@link #DFLT_IPC_ENDPOINT_ENABLED}.
-     *
-     * @return {@code True} in case endpoint is enabled.
-     */
-    public boolean isIpcEndpointEnabled() {
-        return ipcEndpointEnabled;
-    }
-
-    /**
-     * Set IPC endpoint enabled flag. See {@link #isIpcEndpointEnabled()}.
-     *
-     * @param ipcEndpointEnabled IPC endpoint enabled flag.
-     */
-    public void setIpcEndpointEnabled(boolean ipcEndpointEnabled) {
-        this.ipcEndpointEnabled = ipcEndpointEnabled;
-    }
-
-    /**
-     * Gets port number for management endpoint. All GGFS nodes should have this port open
-     * for Visor Management Console to work with GGFS.
-     * <p>
-     * Default value is {@link #DFLT_MGMT_PORT}
-     *
-     * @return Port number or {@code -1} if management endpoint should be disabled.
-     */
-    public int getManagementPort() {
-        return mgmtPort;
-    }
-
-    /**
-     * Sets management endpoint port.
-     *
-     * @param mgmtPort port number or {@code -1} to disable management endpoint.
-     */
-    public void setManagementPort(int mgmtPort) {
-        this.mgmtPort = mgmtPort;
-    }
-
-    /**
-     * Gets mode to specify how {@code GGFS} interacts with Hadoop file system, like {@code HDFS}.
-     * Secondary Hadoop file system is provided for pass-through, write-through, and read-through
-     * purposes.
-     * <p>
-     * Default mode is {@link org.apache.ignite.ignitefs.IgfsMode#DUAL_ASYNC}. If secondary Hadoop file system is
-     * not configured, this mode will work just like {@link org.apache.ignite.ignitefs.IgfsMode#PRIMARY} mode.
-     *
-     * @return Mode to specify how GGFS interacts with secondary HDFS file system.
-     */
-    public IgfsMode getDefaultMode() {
-        return dfltMode;
-    }
-
-    /**
-     * Sets {@code GGFS} mode to specify how it should interact with secondary
-     * Hadoop file system, like {@code HDFS}. Secondary Hadoop file system is provided
-     * for pass-through, write-through, and read-through purposes.
-     *
-     * @param dfltMode {@code GGFS} mode.
-     */
-    public void setDefaultMode(IgfsMode dfltMode) {
-        this.dfltMode = dfltMode;
-    }
-
-    /**
-     * Gets the secondary file system. Secondary file system is provided for pass-through, write-through,
-     * and read-through purposes.
-     *
-     * @return Secondary file system.
-     */
-    public Igfs getSecondaryFileSystem() {
-        return secondaryFs;
-    }
-
-    /**
-     * Sets the secondary file system. Secondary file system is provided for pass-through, write-through,
-     * and read-through purposes.
-     *
-     * @param fileSystem
-     */
-    public void setSecondaryFileSystem(Igfs fileSystem) {
-        secondaryFs = fileSystem;
-    }
-
-    /**
-     * Gets map of path prefixes to {@code GGFS} modes used for them.
-     * <p>
-     * If path doesn't correspond to any specified prefix or mappings are not provided, then
-     * {@link #getDefaultMode()} is used.
-     * <p>
-     * Several folders under {@code '/apache/ignite'} folder have predefined mappings which cannot be overridden.
-     * <li>{@code /apache/ignite/primary} and all it's sub-folders will always work in {@code PRIMARY} mode.</li>
-     * <p>
-     * And in case secondary file system URI is provided:
-     * <li>{@code /apache/ignite/proxy} and all it's sub-folders will always work in {@code PROXY} mode.</li>
-     * <li>{@code /apache/ignite/sync} and all it's sub-folders will always work in {@code DUAL_SYNC} mode.</li>
-     * <li>{@code /apache/ignite/async} and all it's sub-folders will always work in {@code DUAL_ASYNC} mode.</li>
-     *
-     * @return Map of paths to {@code GGFS} modes.
-     */
-    @Nullable public Map<String, IgfsMode> getPathModes() {
-        return pathModes;
-    }
-
-    /**
-     * Sets map of path prefixes to {@code GGFS} modes used for them.
-     * <p>
-     * If path doesn't correspond to any specified prefix or mappings are not provided, then
-     * {@link #getDefaultMode()} is used.
-     *
-     * @param pathModes Map of paths to {@code GGFS} modes.
-     */
-    public void setPathModes(Map<String, IgfsMode> pathModes) {
-        this.pathModes = pathModes;
-    }
-
-    /**
-     * Gets the length of file chunk to send before delaying the fragmentizer.
-     *
-     * @return File chunk length in bytes.
-     */
-    public long getFragmentizerThrottlingBlockLength() {
-        return fragmentizerThrottlingBlockLen;
-    }
-
-    /**
-     * Sets length of file chunk to transmit before throttling is delayed.
-     *
-     * @param fragmentizerThrottlingBlockLen Block length in bytes.
-     */
-    public void setFragmentizerThrottlingBlockLength(long fragmentizerThrottlingBlockLen) {
-        this.fragmentizerThrottlingBlockLen = fragmentizerThrottlingBlockLen;
-    }
-
-    /**
-     * Gets throttle delay for fragmentizer.
-     *
-     * @return Throttle delay in milliseconds.
-     */
-    public long getFragmentizerThrottlingDelay() {
-        return fragmentizerThrottlingDelay;
-    }
-
-    /**
-     * Sets delay in milliseconds for which fragmentizer is paused.
-     *
-     * @param fragmentizerThrottlingDelay Delay in milliseconds.
-     */
-    public void setFragmentizerThrottlingDelay(long fragmentizerThrottlingDelay) {
-        this.fragmentizerThrottlingDelay = fragmentizerThrottlingDelay;
-    }
-
-    /**
-     * Gets number of files that can be processed by fragmentizer concurrently.
-     *
-     * @return Number of files to process concurrently.
-     */
-    public int getFragmentizerConcurrentFiles() {
-        return fragmentizerConcurrentFiles;
-    }
-
-    /**
-     * Sets number of files to process concurrently by fragmentizer.
-     *
-     * @param fragmentizerConcurrentFiles Number of files to process concurrently.
-     */
-    public void setFragmentizerConcurrentFiles(int fragmentizerConcurrentFiles) {
-        this.fragmentizerConcurrentFiles = fragmentizerConcurrentFiles;
-    }
-
-    /**
-     * Gets amount of local memory (in % of local GGFS max space size) available for local writes
-     * during file creation.
-     * <p>
-     * If current GGFS space size is less than {@code fragmentizerLocalWritesRatio * maxSpaceSize},
-     * then file blocks will be written to the local node first and then asynchronously distributed
-     * among cluster nodes (fragmentized).
-     * <p>
-     * Default value is {@link #DFLT_FRAGMENTIZER_LOCAL_WRITES_RATIO}.
-     *
-     * @return Ratio for local writes space.
-     */
-    public float getFragmentizerLocalWritesRatio() {
-        return fragmentizerLocWritesRatio;
-    }
-
-    /**
-     * Sets ratio for space available for local file writes.
-     *
-     * @param fragmentizerLocWritesRatio Ratio for local file writes.
-     * @see #getFragmentizerLocalWritesRatio()
-     */
-    public void setFragmentizerLocalWritesRatio(float fragmentizerLocWritesRatio) {
-        this.fragmentizerLocWritesRatio = fragmentizerLocWritesRatio;
-    }
-
-    /**
-     * Gets flag indicating whether GGFS fragmentizer is enabled. If fragmentizer is disabled, files will be
-     * written in distributed fashion.
-     *
-     * @return Flag indicating whether fragmentizer is enabled.
-     */
-    public boolean isFragmentizerEnabled() {
-        return fragmentizerEnabled;
-    }
-
-    /**
-     * Sets property indicating whether fragmentizer is enabled.
-     *
-     * @param fragmentizerEnabled {@code True} if fragmentizer is enabled.
-     */
-    public void setFragmentizerEnabled(boolean fragmentizerEnabled) {
-        this.fragmentizerEnabled = fragmentizerEnabled;
-    }
-
-    /**
-     * Get maximum space available for data cache to store file system entries.
-     *
-     * @return Maximum space available for data cache.
-     */
-    public long getMaxSpaceSize() {
-        return maxSpace;
-    }
-
-    /**
-     * Set maximum space in bytes available in data cache.
-     *
-     * @param maxSpace Maximum space available in data cache.
-     */
-    public void setMaxSpaceSize(long maxSpace) {
-        this.maxSpace = maxSpace;
-    }
-
-    /**
-     * Gets maximum timeout awaiting for trash purging in case data cache oversize is detected.
-     *
-     * @return Maximum timeout awaiting for trash purging in case data cache oversize is detected.
-     */
-    public long getTrashPurgeTimeout() {
-        return trashPurgeTimeout;
-    }
-
-    /**
-     * Sets maximum timeout awaiting for trash purging in case data cache oversize is detected.
-     *
-     * @param trashPurgeTimeout Maximum timeout awaiting for trash purging in case data cache oversize is detected.
-     */
-    public void setTrashPurgeTimeout(long trashPurgeTimeout) {
-        this.trashPurgeTimeout = trashPurgeTimeout;
-    }
-
-    /**
-     * Get DUAL mode put operation executor service. This executor service will process cache PUT requests for
-     * data which came from the secondary file system and about to be written to GGFS data cache.
-     * In case no executor service is provided, default one will be created with maximum amount of threads equals
-     * to amount of processor cores.
-     *
-     * @return Get DUAL mode put operation executor service
-     */
-    @Nullable public ExecutorService getDualModePutExecutorService() {
-        return dualModePutExec;
-    }
-
-    /**
-     * Set DUAL mode put operations executor service.
-     *
-     * @param dualModePutExec Dual mode put operations executor service.
-     */
-    public void setDualModePutExecutorService(ExecutorService dualModePutExec) {
-        this.dualModePutExec = dualModePutExec;
-    }
-
-    /**
-     * Get DUAL mode put operation executor service shutdown flag.
-     *
-     * @return DUAL mode put operation executor service shutdown flag.
-     */
-    public boolean getDualModePutExecutorServiceShutdown() {
-        return dualModePutExecShutdown;
-    }
-
-    /**
-     * Set DUAL mode put operations executor service shutdown flag.
-     *
-     * @param dualModePutExecShutdown Dual mode put operations executor service shutdown flag.
-     */
-    public void setDualModePutExecutorServiceShutdown(boolean dualModePutExecShutdown) {
-        this.dualModePutExecShutdown = dualModePutExecShutdown;
-    }
-
-    /**
-     * Get maximum amount of pending data read from the secondary file system and waiting to be written to data
-     * cache. {@code 0} or negative value stands for unlimited size.
-     * <p>
-     * By default this value is set to {@code 0}. It is recommended to set positive value in case your
-     * application performs frequent reads of large amount of data from the secondary file system in order to
-     * avoid issues with increasing GC pauses or out-of-memory error.
-     *
-     * @return Maximum amount of pending data read from the secondary file system
-     */
-    public long getDualModeMaxPendingPutsSize() {
-        return dualModeMaxPendingPutsSize;
-    }
-
-    /**
-     * Set maximum amount of data in pending put operations.
-     *
-     * @param dualModeMaxPendingPutsSize Maximum amount of data in pending put operations.
-     */
-    public void setDualModeMaxPendingPutsSize(long dualModeMaxPendingPutsSize) {
-        this.dualModeMaxPendingPutsSize = dualModeMaxPendingPutsSize;
-    }
-
-    /**
-     * Get maximum default range size of a file being split during GGFS task execution. When GGFS task is about to
-     * be executed, it requests file block locations first. Each location is defined as {@link org.apache.ignite.ignitefs.mapreduce.IgfsFileRange} which
-     * has length. In case this parameter is set to positive value, then GGFS will split single file range into smaller
-     * ranges with length not greater that this parameter. The only exception to this case is when maximum task range
-     * length is smaller than file block size. In this case maximum task range size will be overridden and set to file
-     * block size.
-     * <p>
-     * Note that this parameter is applied when task is split into jobs before {@link org.apache.ignite.ignitefs.mapreduce.IgfsRecordResolver} is
-     * applied. Therefore, final file ranges being assigned to particular jobs could be greater than value of this
-     * parameter depending on file data layout and selected resolver type.
-     * <p>
-     * Setting this parameter might be useful when file is highly colocated and have very long consequent data chunks
-     * so that task execution suffers from insufficient parallelism. E.g., in case you have one GGFS node in topology
-     * and want to process 1Gb file, then only single range of length 1Gb will be returned. This will result in
-     * a single job which will be processed in one thread. But in case you provide this configuration parameter and set
-     * maximum range length to 16Mb, then 64 ranges will be returned resulting in 64 jobs which could be executed in
-     * parallel.
-     * <p>
-     * Note that some {@code GridGgfs.execute()} methods can override value of this parameter.
-     * <p>
-     * In case value of this parameter is set to {@code 0} or negative value, it is simply ignored. Default value is
-     * {@code 0}.
-     *
-     * @return Maximum range size of a file being split during GGFS task execution.
-     */
-    public long getMaximumTaskRangeLength() {
-        return maxTaskRangeLen;
-    }
-
-    /**
-     * Set maximum default range size of a file being split during GGFS task execution.
-     * See {@link #getMaximumTaskRangeLength()} for more details.
-     *
-     * @param maxTaskRangeLen Set maximum default range size of a file being split during GGFS task execution.
-     */
-    public void setMaximumTaskRangeLength(long maxTaskRangeLen) {
-        this.maxTaskRangeLen = maxTaskRangeLen;
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(IgniteFsConfiguration.class, this);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/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 2e88d15..4ec97a5 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
@@ -689,7 +689,7 @@ public interface EventType {
      * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for
      * internal Ignite events and should not be used by user-defined events.
      *
-     * @see IgniteFsEvent
+     * @see IgfsEvent
      */
     public static final int EVT_GGFS_FILE_CREATED = 116;
 
@@ -701,7 +701,7 @@ public interface EventType {
      * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for
      * internal Ignite events and should not be used by user-defined events.
      *
-     * @see IgniteFsEvent
+     * @see IgfsEvent
      */
     public static final int EVT_GGFS_FILE_RENAMED = 117;
 
@@ -713,7 +713,7 @@ public interface EventType {
      * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for
      * internal Ignite events and should not be used by user-defined events.
      *
-     * @see IgniteFsEvent
+     * @see IgfsEvent
      */
     public static final int EVT_GGFS_FILE_DELETED = 118;
 
@@ -725,7 +725,7 @@ public interface EventType {
      * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for
      * internal Ignite events and should not be used by user-defined events.
      *
-     * @see IgniteFsEvent
+     * @see IgfsEvent
      */
     public static final int EVT_GGFS_FILE_OPENED_READ = 119;
 
@@ -737,7 +737,7 @@ public interface EventType {
      * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for
      * internal Ignite events and should not be used by user-defined events.
      *
-     * @see IgniteFsEvent
+     * @see IgfsEvent
      */
     public static final int EVT_GGFS_FILE_OPENED_WRITE = 120;
 
@@ -749,7 +749,7 @@ public interface EventType {
      * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for
      * internal Ignite events and should not be used by user-defined events.
      *
-     * @see IgniteFsEvent
+     * @see IgfsEvent
      */
     public static final int EVT_GGFS_META_UPDATED = 121;
 
@@ -761,7 +761,7 @@ public interface EventType {
      * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for
      * internal Ignite events and should not be used by user-defined events.
      *
-     * @see IgniteFsEvent
+     * @see IgfsEvent
      */
     public static final int EVT_GGFS_FILE_CLOSED_WRITE = 122;
 
@@ -773,7 +773,7 @@ public interface EventType {
      * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for
      * internal Ignite events and should not be used by user-defined events.
      *
-     * @see IgniteFsEvent
+     * @see IgfsEvent
      */
     public static final int EVT_GGFS_FILE_CLOSED_READ = 123;
 
@@ -785,7 +785,7 @@ public interface EventType {
      * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for
      * internal Ignite events and should not be used by user-defined events.
      *
-     * @see IgniteFsEvent
+     * @see IgfsEvent
      */
     public static final int EVT_GGFS_DIR_CREATED = 124;
 
@@ -797,7 +797,7 @@ public interface EventType {
      * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for
      * internal Ignite events and should not be used by user-defined events.
      *
-     * @see IgniteFsEvent
+     * @see IgfsEvent
      */
     public static final int EVT_GGFS_DIR_RENAMED = 125;
 
@@ -809,7 +809,7 @@ public interface EventType {
      * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for
      * internal Ignite events and should not be used by user-defined events.
      *
-     * @see IgniteFsEvent
+     * @see IgfsEvent
      */
     public static final int EVT_GGFS_DIR_DELETED = 126;
 
@@ -821,7 +821,7 @@ public interface EventType {
      * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for
      * internal Ignite events and should not be used by user-defined events.
      *
-     * @see IgniteFsEvent
+     * @see IgfsEvent
      */
     public static final int EVT_GGFS_FILE_PURGED = 127;
 
@@ -1062,7 +1062,7 @@ public interface EventType {
      * {@link org.apache.ignite.IgniteEvents#localListen(org.apache.ignite.lang.IgnitePredicate, int...)} method to
      * subscribe to all GGFS events.
      *
-     * @see IgniteFsEvent
+     * @see IgfsEvent
      */
     public static final int[] EVTS_SECURE_SESSION = {
         EVT_SECURE_SESSION_VALIDATION_SUCCEEDED,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/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
new file mode 100644
index 0000000..1d52231
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/events/IgfsEvent.java
@@ -0,0 +1,197 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.events;
+
+import org.apache.ignite.cluster.*;
+import org.apache.ignite.ignitefs.*;
+import org.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+
+import java.util.*;
+
+import static org.apache.ignite.events.EventType.*;
+
+/**
+ * GGFS event.
+ * <p>
+ * Grid events are used for notification about what happens within the grid. Note that by
+ * design Ignite keeps all events generated on the local node locally and it provides
+ * APIs for performing a distributed queries across multiple nodes:
+ * <ul>
+ *      <li>
+ *          {@link org.apache.ignite.IgniteEvents#remoteQuery(org.apache.ignite.lang.IgnitePredicate, long, int...)} -
+ *          asynchronously querying events occurred on the nodes specified, including remote nodes.
+ *      </li>
+ *      <li>
+ *          {@link org.apache.ignite.IgniteEvents#localQuery(org.apache.ignite.lang.IgnitePredicate, int...)} -
+ *          querying only local events stored on this local node.
+ *      </li>
+ *      <li>
+ *          {@link org.apache.ignite.IgniteEvents#localListen(org.apache.ignite.lang.IgnitePredicate, int...)} -
+ *          listening to local grid events (events from remote nodes not included).
+ *      </li>
+ * </ul>
+ * User can also wait for events using method {@link org.apache.ignite.IgniteEvents#waitForLocal(org.apache.ignite.lang.IgnitePredicate, int...)}.
+ * <h1 class="header">Events and Performance</h1>
+ * Note that by default all events in Ignite are enabled and therefore generated and stored
+ * by whatever event storage SPI is configured. Ignite can and often does generate thousands events per seconds
+ * under the load and therefore it creates a significant additional load on the system. If these events are
+ * not needed by the application this load is unnecessary and leads to significant performance degradation.
+ * <p>
+ * It is <b>highly recommended</b> to enable only those events that your application logic requires
+ * by using {@link org.apache.ignite.configuration.IgniteConfiguration#getIncludeEventTypes()} method in Ignite configuration. Note that certain
+ * 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
+ */
+public class IgfsEvent extends EventAdapter {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /** File path. */
+    private final IgfsPath path;
+
+    /** New file path (for RENAME event). */
+    private IgfsPath newPath;
+
+    /** Data size (for data transfer events). */
+    private long dataSize;
+
+    /** Updated metadata properties (for metadata update events). */
+    @GridToStringInclude
+    private Map<String, String> meta;
+
+    /**
+     * Constructs an event instance.
+     *
+     * @param path File or directory path.
+     * @param node Node.
+     * @param type Event type.
+     */
+    public IgfsEvent(IgfsPath path, ClusterNode node, int type) {
+        super(node, "GGFS event.", type);
+
+        this.path = path;
+    }
+
+    /**
+     * Constructs an event instance for path modification event
+     * ({@link EventType#EVT_GGFS_FILE_RENAMED},
+     * {@link EventType#EVT_GGFS_DIR_RENAMED}).
+     *
+     * @param path File or directory path.
+     * @param newPath New file or directory path.
+     * @param node Node.
+     * @param type Event type.
+     */
+    public IgfsEvent(IgfsPath path, IgfsPath newPath, ClusterNode node, int type) {
+        this(path, node, type);
+
+        this.newPath = newPath;
+    }
+
+    /**
+     * Constructs an event instance for close events:
+     * ({@link EventType#EVT_GGFS_FILE_CLOSED_READ},
+     * {@link EventType#EVT_GGFS_FILE_CLOSED_WRITE}).
+     *
+     * @param path File path.
+     * @param node Node.
+     * @param type Event type.
+     * @param dataSize Transferred data size in bytes.
+     */
+    public IgfsEvent(IgfsPath path, ClusterNode node, int type, long dataSize) {
+        this(path, node, type);
+
+        this.dataSize = dataSize;
+    }
+
+    /**
+     * Constructs an event instance for file metadata update events
+     * ({@link EventType#EVT_GGFS_META_UPDATED}).
+     *
+     * @param path File path.
+     * @param node Node.
+     * @param type Event type.
+     * @param meta Modified properties.
+     */
+    public IgfsEvent(IgfsPath path, ClusterNode node, int type, Map<String, String> meta) {
+        this(path, node, type);
+
+        this.meta = meta;
+    }
+
+    /**
+     * Path of the file or directory, on which event has occurred.
+     *
+     * @return File path.
+     */
+    public IgfsPath path() {
+        return path;
+    }
+
+    /**
+     * New file or directory path for this event (used in
+     * {@link EventType#EVT_GGFS_FILE_RENAMED} event).
+     *
+     * @return New file or directory path or {@code null},
+     *         if not relevant for this event.
+     */
+    @Nullable public IgfsPath newPath() {
+        return newPath;
+    }
+
+    /**
+     * Transferred data size for this event.
+     *
+     * @return Transferred data size in bytes.
+     */
+    public long dataSize() {
+        return dataSize;
+    }
+
+    /**
+     * Updated file metadata properties.
+     *
+     * @return Updated metadata properties or {@code null},
+     *         if not relevant for this event.
+     */
+    @Nullable public Map<String, String> updatedMeta() {
+        return meta;
+    }
+
+    /**
+     * Checks if this is a directory-related event.
+     *
+     * @return {@code True} if this event is directory-related.
+     */
+    public boolean isDirectory() {
+        int t = type();
+
+        return t == EVT_GGFS_DIR_CREATED || t == EVT_GGFS_DIR_RENAMED || t == EVT_GGFS_DIR_DELETED;
+    }
+
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return S.toString(IgfsEvent.class, this, super.toString());
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/main/java/org/apache/ignite/events/IgniteFsEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/IgniteFsEvent.java b/modules/core/src/main/java/org/apache/ignite/events/IgniteFsEvent.java
deleted file mode 100644
index 6e6a7cb..0000000
--- a/modules/core/src/main/java/org/apache/ignite/events/IgniteFsEvent.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.events;
-
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.ignitefs.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-import static org.apache.ignite.events.EventType.*;
-
-/**
- * GGFS event.
- * <p>
- * Grid events are used for notification about what happens within the grid. Note that by
- * design Ignite keeps all events generated on the local node locally and it provides
- * APIs for performing a distributed queries across multiple nodes:
- * <ul>
- *      <li>
- *          {@link org.apache.ignite.IgniteEvents#remoteQuery(org.apache.ignite.lang.IgnitePredicate, long, int...)} -
- *          asynchronously querying events occurred on the nodes specified, including remote nodes.
- *      </li>
- *      <li>
- *          {@link org.apache.ignite.IgniteEvents#localQuery(org.apache.ignite.lang.IgnitePredicate, int...)} -
- *          querying only local events stored on this local node.
- *      </li>
- *      <li>
- *          {@link org.apache.ignite.IgniteEvents#localListen(org.apache.ignite.lang.IgnitePredicate, int...)} -
- *          listening to local grid events (events from remote nodes not included).
- *      </li>
- * </ul>
- * User can also wait for events using method {@link org.apache.ignite.IgniteEvents#waitForLocal(org.apache.ignite.lang.IgnitePredicate, int...)}.
- * <h1 class="header">Events and Performance</h1>
- * Note that by default all events in Ignite are enabled and therefore generated and stored
- * by whatever event storage SPI is configured. Ignite can and often does generate thousands events per seconds
- * under the load and therefore it creates a significant additional load on the system. If these events are
- * not needed by the application this load is unnecessary and leads to significant performance degradation.
- * <p>
- * It is <b>highly recommended</b> to enable only those events that your application logic requires
- * by using {@link org.apache.ignite.configuration.IgniteConfiguration#getIncludeEventTypes()} method in Ignite configuration. Note that certain
- * 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
- */
-public class IgniteFsEvent extends EventAdapter {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /** File path. */
-    private final IgfsPath path;
-
-    /** New file path (for RENAME event). */
-    private IgfsPath newPath;
-
-    /** Data size (for data transfer events). */
-    private long dataSize;
-
-    /** Updated metadata properties (for metadata update events). */
-    @GridToStringInclude
-    private Map<String, String> meta;
-
-    /**
-     * Constructs an event instance.
-     *
-     * @param path File or directory path.
-     * @param node Node.
-     * @param type Event type.
-     */
-    public IgniteFsEvent(IgfsPath path, ClusterNode node, int type) {
-        super(node, "GGFS event.", type);
-
-        this.path = path;
-    }
-
-    /**
-     * Constructs an event instance for path modification event
-     * ({@link EventType#EVT_GGFS_FILE_RENAMED},
-     * {@link EventType#EVT_GGFS_DIR_RENAMED}).
-     *
-     * @param path File or directory path.
-     * @param newPath New file or directory path.
-     * @param node Node.
-     * @param type Event type.
-     */
-    public IgniteFsEvent(IgfsPath path, IgfsPath newPath, ClusterNode node, int type) {
-        this(path, node, type);
-
-        this.newPath = newPath;
-    }
-
-    /**
-     * Constructs an event instance for close events:
-     * ({@link EventType#EVT_GGFS_FILE_CLOSED_READ},
-     * {@link EventType#EVT_GGFS_FILE_CLOSED_WRITE}).
-     *
-     * @param path File path.
-     * @param node Node.
-     * @param type Event type.
-     * @param dataSize Transferred data size in bytes.
-     */
-    public IgniteFsEvent(IgfsPath path, ClusterNode node, int type, long dataSize) {
-        this(path, node, type);
-
-        this.dataSize = dataSize;
-    }
-
-    /**
-     * Constructs an event instance for file metadata update events
-     * ({@link EventType#EVT_GGFS_META_UPDATED}).
-     *
-     * @param path File path.
-     * @param node Node.
-     * @param type Event type.
-     * @param meta Modified properties.
-     */
-    public IgniteFsEvent(IgfsPath path, ClusterNode node, int type, Map<String, String> meta) {
-        this(path, node, type);
-
-        this.meta = meta;
-    }
-
-    /**
-     * Path of the file or directory, on which event has occurred.
-     *
-     * @return File path.
-     */
-    public IgfsPath path() {
-        return path;
-    }
-
-    /**
-     * New file or directory path for this event (used in
-     * {@link EventType#EVT_GGFS_FILE_RENAMED} event).
-     *
-     * @return New file or directory path or {@code null},
-     *         if not relevant for this event.
-     */
-    @Nullable public IgfsPath newPath() {
-        return newPath;
-    }
-
-    /**
-     * Transferred data size for this event.
-     *
-     * @return Transferred data size in bytes.
-     */
-    public long dataSize() {
-        return dataSize;
-    }
-
-    /**
-     * Updated file metadata properties.
-     *
-     * @return Updated metadata properties or {@code null},
-     *         if not relevant for this event.
-     */
-    @Nullable public Map<String, String> updatedMeta() {
-        return meta;
-    }
-
-    /**
-     * Checks if this is a directory-related event.
-     *
-     * @return {@code True} if this event is directory-related.
-     */
-    public boolean isDirectory() {
-        int t = type();
-
-        return t == EVT_GGFS_DIR_CREATED || t == EVT_GGFS_DIR_RENAMED || t == EVT_GGFS_DIR_DELETED;
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(IgniteFsEvent.class, this, super.toString());
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/main/java/org/apache/ignite/ignitefs/IgfsMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/ignitefs/IgfsMetrics.java b/modules/core/src/main/java/org/apache/ignite/ignitefs/IgfsMetrics.java
index 59a27d0..5d17f86 100644
--- a/modules/core/src/main/java/org/apache/ignite/ignitefs/IgfsMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/ignitefs/IgfsMetrics.java
@@ -33,7 +33,7 @@ public interface IgfsMetrics {
 
     /**
      * Gets maximum amount of data that can be stored on local node. This metrics is either
-     * equal to {@link org.apache.ignite.configuration.IgniteFsConfiguration#getMaxSpaceSize()}, or, if it is {@code 0}, equal to
+     * equal to {@link org.apache.ignite.configuration.IgfsConfiguration#getMaxSpaceSize()}, or, if it is {@code 0}, equal to
      * {@code 80%} of maximum heap size allocated for JVM.
      *
      * @return Maximum GGFS local space size.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/main/java/org/apache/ignite/ignitefs/IgfsMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/ignitefs/IgfsMode.java b/modules/core/src/main/java/org/apache/ignite/ignitefs/IgfsMode.java
index 824ab68..7ce3437 100644
--- a/modules/core/src/main/java/org/apache/ignite/ignitefs/IgfsMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/ignitefs/IgfsMode.java
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.*;
  * Secondary Hadoop file system is provided for pass-through, write-through, and
  * read-through purposes.
  * <p>
- * This mode is configured via {@link org.apache.ignite.configuration.IgniteFsConfiguration#getDefaultMode()}
+ * This mode is configured via {@link org.apache.ignite.configuration.IgfsConfiguration#getDefaultMode()}
  * configuration property.
  */
 public enum IgfsMode {
@@ -39,7 +39,7 @@ public enum IgfsMode {
      * through to secondary Hadoop file system. If this mode is enabled, then
      * secondary Hadoop file system must be configured.
      *
-     * @see org.apache.ignite.configuration.IgniteFsConfiguration#getSecondaryHadoopFileSystemUri()
+     * @see org.apache.ignite.configuration.IgfsConfiguration#getSecondaryHadoopFileSystemUri()
      */
     PROXY,
 
@@ -50,7 +50,7 @@ public enum IgfsMode {
      * If secondary Hadoop file system is not configured, then this mode behaves like
      * {@link #PRIMARY} mode.
      *
-     * @see org.apache.ignite.configuration.IgniteFsConfiguration#getSecondaryHadoopFileSystemUri()
+     * @see org.apache.ignite.configuration.IgfsConfiguration#getSecondaryHadoopFileSystemUri()
      */
     DUAL_SYNC,
 
@@ -61,7 +61,7 @@ public enum IgfsMode {
      * If secondary Hadoop file system is not configured, then this mode behaves like
      * {@link #PRIMARY} mode.
      *
-     * @see org.apache.ignite.configuration.IgniteFsConfiguration#getSecondaryHadoopFileSystemUri()
+     * @see org.apache.ignite.configuration.IgfsConfiguration#getSecondaryHadoopFileSystemUri()
      */
     DUAL_ASYNC;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsTask.java b/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsTask.java
index 2d0983a..dcd293c 100644
--- a/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsTask.java
@@ -37,7 +37,7 @@ import java.util.*;
  * <p>
  * Each file participating in GGFS task is split into {@link IgfsFileRange}s first. Normally range is a number of
  * consequent bytes located on a single node (see {@code IgniteFsGroupDataBlocksKeyMapper}). In case maximum range size
- * is provided (either through {@link org.apache.ignite.configuration.IgniteFsConfiguration#getMaximumTaskRangeLength()} or {@code GridGgfs.execute()}
+ * is provided (either through {@link org.apache.ignite.configuration.IgfsConfiguration#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/88bf1443/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsTaskArgs.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsTaskArgs.java b/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsTaskArgs.java
index 5ed7283..4f6dc3e 100644
--- a/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsTaskArgs.java
+++ b/modules/core/src/main/java/org/apache/ignite/ignitefs/mapreduce/IgfsTaskArgs.java
@@ -33,7 +33,7 @@ import java.util.*;
  *     <li>{@link IgfsRecordResolver} 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 org.apache.ignite.configuration.IgniteFsConfiguration#getMaximumTaskRangeLength()})</li>
+ *     <li>Maximum file range length for that task (see {@link org.apache.ignite.configuration.IgfsConfiguration#getMaximumTaskRangeLength()})</li>
  * </ul>
  */
 public interface IgfsTaskArgs<T> {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/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 29af665..af19ddf 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,13 +1561,13 @@ public class IgnitionEx {
             myCfg.setMarshalLocalJobs(cfg.isMarshalLocalJobs());
             myCfg.setNodeId(nodeId);
 
-            IgniteFsConfiguration[] ggfsCfgs = cfg.getGgfsConfiguration();
+            IgfsConfiguration[] ggfsCfgs = cfg.getGgfsConfiguration();
 
             if (ggfsCfgs != null) {
-                IgniteFsConfiguration[] clone = ggfsCfgs.clone();
+                IgfsConfiguration[] clone = ggfsCfgs.clone();
 
                 for (int i = 0; i < ggfsCfgs.length; i++)
-                    clone[i] = new IgniteFsConfiguration(ggfsCfgs[i]);
+                    clone[i] = new IgfsConfiguration(ggfsCfgs[i]);
 
                 myCfg.setGgfsConfiguration(clone);
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/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 6f75e32..e12e419 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,10 +237,10 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
 
         mxBean = new CacheMetricsMXBeanImpl(this);
 
-        IgniteFsConfiguration[] ggfsCfgs = gridCfg.getGgfsConfiguration();
+        IgfsConfiguration[] ggfsCfgs = gridCfg.getGgfsConfiguration();
 
         if (ggfsCfgs != null) {
-            for (IgniteFsConfiguration ggfsCfg : ggfsCfgs) {
+            for (IgfsConfiguration 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/88bf1443/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 c7f739c..c871722 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,10 +561,10 @@ public class GridCacheProcessor extends GridProcessorAdapter {
         maxPreloadOrder = validatePreloadOrder(ctx.config().getCacheConfiguration());
 
         // Internal caches which should not be returned to user.
-        IgniteFsConfiguration[] ggfsCfgs = ctx.grid().configuration().getGgfsConfiguration();
+        IgfsConfiguration[] ggfsCfgs = ctx.grid().configuration().getGgfsConfiguration();
 
         if (ggfsCfgs != null) {
-            for (IgniteFsConfiguration ggfsCfg : ggfsCfgs) {
+            for (IgfsConfiguration ggfsCfg : ggfsCfgs) {
                 sysCaches.add(ggfsCfg.getMetaCacheName());
                 sysCaches.add(ggfsCfg.getDataCacheName());
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/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 6ef5d84..0f52729 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,10 +1584,10 @@ public class GridCacheUtils {
      * @return {@code True} in this is GGFS data or meta cache.
      */
     public static boolean isGgfsCache(IgniteConfiguration cfg, @Nullable String cacheName) {
-        IgniteFsConfiguration[] ggfsCfgs = cfg.getGgfsConfiguration();
+        IgfsConfiguration[] ggfsCfgs = cfg.getGgfsConfiguration();
 
         if (ggfsCfgs != null) {
-            for (IgniteFsConfiguration ggfsCfg : ggfsCfgs) {
+            for (IgfsConfiguration 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/88bf1443/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsAsyncImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsAsyncImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsAsyncImpl.java
index b07b020..eaf2195 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsAsyncImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsAsyncImpl.java
@@ -192,7 +192,7 @@ public class IgfsAsyncImpl extends AsyncSupportAdapter<IgniteFs> implements Igfs
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteFsConfiguration configuration() {
+    @Override public IgfsConfiguration configuration() {
         return ggfs.configuration();
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsContext.java
index 95ecbc2..e122a2c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsContext.java
@@ -37,7 +37,7 @@ public class IgfsContext {
     private final GridKernalContext ctx;
 
     /** Configuration. */
-    private final IgniteFsConfiguration cfg;
+    private final IgfsConfiguration cfg;
 
     /** Managers. */
     private List<IgfsManager> mgrs = new LinkedList<>();
@@ -68,7 +68,7 @@ public class IgfsContext {
      */
     public IgfsContext(
         GridKernalContext ctx,
-        IgniteFsConfiguration cfg,
+        IgfsConfiguration cfg,
         IgfsMetaManager metaMgr,
         IgfsDataManager dataMgr,
         IgfsServerManager srvMgr,
@@ -102,7 +102,7 @@ public class IgfsContext {
     /**
      * @return GGFS configuration.
      */
-    public IgniteFsConfiguration configuration() {
+    public IgfsConfiguration configuration() {
         return cfg;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsDataManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsDataManager.java
index 7e89fd6..1eac285 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsDataManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsDataManager.java
@@ -306,7 +306,7 @@ public class IgfsDataManager extends IgfsManager {
         IgniteDataLoader<IgfsBlockKey, byte[]> ldr =
             ggfsCtx.kernalContext().<IgfsBlockKey, byte[]>dataLoad().dataLoader(dataCachePrj.name());
 
-        IgniteFsConfiguration cfg = ggfsCtx.configuration();
+        IgfsConfiguration cfg = ggfsCtx.configuration();
 
         if (cfg.getPerNodeBatchSize() > 0)
             ldr.perNodeBufferSize(cfg.getPerNodeBatchSize());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsDeleteWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsDeleteWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsDeleteWorker.java
index 5e19d54..9e57b2b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsDeleteWorker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsDeleteWorker.java
@@ -224,7 +224,7 @@ public class IgfsDeleteWorker extends IgfsThread {
 
                     if (evts.isRecordable(EVT_GGFS_FILE_PURGED)) {
                         if (info.path() != null)
-                            evts.record(new IgniteFsEvent(info.path(),
+                            evts.record(new IgfsEvent(info.path(),
                                 ggfsCtx.kernalContext().discovery().localNode(), EVT_GGFS_FILE_PURGED));
                         else
                             LT.warn(log, null, "Removing file without path info: " + info);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsFileInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsFileInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsFileInfo.java
index 99e5ddf..3c095cc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsFileInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsFileInfo.java
@@ -99,13 +99,13 @@ public final class IgfsFileInfo implements Externalizable {
     }
 
     /**
-     * Constructs directory or file info with {@link org.apache.ignite.configuration.IgniteFsConfiguration#DFLT_BLOCK_SIZE default} block size.
+     * Constructs directory or file info with {@link org.apache.ignite.configuration.IgfsConfiguration#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 IgfsFileInfo(boolean isDir, @Nullable Map<String, String> props) {
-        this(isDir, null, isDir ? 0 : IgniteFsConfiguration.DFLT_BLOCK_SIZE, 0, null, null, props, null, false,
+        this(isDir, null, isDir ? 0 : IgfsConfiguration.DFLT_BLOCK_SIZE, 0, null, null, props, null, false,
             System.currentTimeMillis(), false);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsImpl.java
index 15d6f07..51f6e62 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsImpl.java
@@ -71,7 +71,7 @@ public final class IgfsImpl implements IgfsEx {
     private IgfsDataManager data;
 
     /** FS configuration. */
-    private IgniteFsConfiguration cfg;
+    private IgfsConfiguration cfg;
 
     /** Ggfs context. */
     private IgfsContext ggfsCtx;
@@ -376,7 +376,7 @@ public final class IgfsImpl implements IgfsEx {
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteFsConfiguration configuration() {
+    @Override public IgfsConfiguration configuration() {
         return cfg;
     }
 
@@ -613,7 +613,7 @@ public final class IgfsImpl implements IgfsEx {
 
                 if (info != null) {
                     if (evts.isRecordable(EVT_GGFS_META_UPDATED))
-                        evts.record(new IgniteFsEvent(path, localNode(), EVT_GGFS_META_UPDATED, props));
+                        evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_META_UPDATED, props));
 
                     return new IgfsFileImpl(path, info, data.groupBlockSize());
                 }
@@ -721,7 +721,7 @@ public final class IgfsImpl implements IgfsEx {
 
                 if (srcDesc.isFile) { // Renamed a file.
                     if (evts.isRecordable(EVT_GGFS_FILE_RENAMED))
-                        evts.record(new IgniteFsEvent(
+                        evts.record(new IgfsEvent(
                             src,
                             newDest ? dest : new IgfsPath(dest, destFileName),
                             localNode(),
@@ -729,7 +729,7 @@ public final class IgfsImpl implements IgfsEx {
                 }
                 else { // Renamed a directory.
                     if (evts.isRecordable(EVT_GGFS_DIR_RENAMED))
-                        evts.record(new IgniteFsEvent(src, dest, localNode(), EVT_GGFS_DIR_RENAMED));
+                        evts.record(new IgfsEvent(src, dest, localNode(), EVT_GGFS_DIR_RENAMED));
                 }
             }
             catch (IgniteCheckedException e) {
@@ -781,10 +781,10 @@ public final class IgfsImpl implements IgfsEx {
                 if (res && desc != null) {
                     if (desc.isFile) {
                         if (evts.isRecordable(EVT_GGFS_FILE_DELETED))
-                            evts.record(new IgniteFsEvent(path, localNode(), EVT_GGFS_FILE_DELETED));
+                            evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_FILE_DELETED));
                     }
                     else if (evts.isRecordable(EVT_GGFS_DIR_DELETED))
-                        evts.record(new IgniteFsEvent(path, localNode(), EVT_GGFS_DIR_DELETED));
+                        evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_DIR_DELETED));
                 }
 
                 return res;
@@ -900,7 +900,7 @@ 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 IgniteFsEvent(curPath, localNode(), EVT_GGFS_DIR_CREATED));
+                                evts.record(new IgfsEvent(curPath, localNode(), EVT_GGFS_DIR_CREATED));
                         }
                         catch (IgniteCheckedException e) {
                             if (log.isDebugEnabled())
@@ -1108,7 +1108,7 @@ public final class IgfsImpl implements IgfsEx {
                         cfg.getPrefetchBlocks(), seqReadsBeforePrefetch, desc.reader(), metrics);
 
                     if (evts.isRecordable(EVT_GGFS_FILE_OPENED_READ))
-                        evts.record(new IgniteFsEvent(path, localNode(), EVT_GGFS_FILE_OPENED_READ));
+                        evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_FILE_OPENED_READ));
 
                     return os;
                 }
@@ -1129,7 +1129,7 @@ public final class IgfsImpl implements IgfsEx {
                     cfg.getPrefetchBlocks(), seqReadsBeforePrefetch, null, metrics);
 
                 if (evts.isRecordable(EVT_GGFS_FILE_OPENED_READ))
-                    evts.record(new IgniteFsEvent(path, localNode(), EVT_GGFS_FILE_OPENED_READ));
+                    evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_FILE_OPENED_READ));
 
                 return os;
             }
@@ -1211,7 +1211,7 @@ public final class IgfsImpl implements IgfsEx {
                         bufSize == 0 ? cfg.getStreamBufferSize() : bufSize, mode, batch);
 
                     if (evts.isRecordable(EVT_GGFS_FILE_OPENED_WRITE))
-                        evts.record(new IgniteFsEvent(path, localNode(), EVT_GGFS_FILE_OPENED_WRITE));
+                        evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_FILE_OPENED_WRITE));
 
                     return os;
                 }
@@ -1259,11 +1259,11 @@ public final class IgfsImpl implements IgfsEx {
                     deleteFile(path, new FileDescriptor(parentId, fileName, oldId, oldInfo.isFile()), false);
 
                     if (evts.isRecordable(EVT_GGFS_FILE_DELETED))
-                        evts.record(new IgniteFsEvent(path, localNode(), EVT_GGFS_FILE_DELETED));
+                        evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_FILE_DELETED));
                 }
 
                 if (evts.isRecordable(EVT_GGFS_FILE_CREATED))
-                    evts.record(new IgniteFsEvent(path, localNode(), EVT_GGFS_FILE_CREATED));
+                    evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_FILE_CREATED));
 
                 info = meta.lock(info.id());
 
@@ -1271,7 +1271,7 @@ public final class IgfsImpl implements IgfsEx {
                     bufSize == 0 ? cfg.getStreamBufferSize() : bufSize, mode, batch);
 
                 if (evts.isRecordable(EVT_GGFS_FILE_OPENED_WRITE))
-                    evts.record(new IgniteFsEvent(path, localNode(), EVT_GGFS_FILE_OPENED_WRITE));
+                    evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_FILE_OPENED_WRITE));
 
                 return os;
             }
@@ -1348,7 +1348,7 @@ public final class IgfsImpl implements IgfsEx {
                         info = meta.info(oldId);
 
                     if (evts.isRecordable(EVT_GGFS_FILE_CREATED))
-                        evts.record(new IgniteFsEvent(path, localNode(), EVT_GGFS_FILE_CREATED));
+                        evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_FILE_CREATED));
                 }
 
                 if (!info.isFile())
@@ -1357,7 +1357,7 @@ public final class IgfsImpl implements IgfsEx {
                 info = meta.lock(info.id());
 
                 if (evts.isRecordable(EVT_GGFS_FILE_OPENED_WRITE))
-                    evts.record(new IgniteFsEvent(path, localNode(), EVT_GGFS_FILE_OPENED_WRITE));
+                    evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_FILE_OPENED_WRITE));
 
                 return new IgfsEventAwareOutputStream(path, info, parentId, bufSize == 0 ?
                     cfg.getStreamBufferSize() : bufSize, mode, batch);
@@ -1788,7 +1788,7 @@ public final class IgfsImpl implements IgfsEx {
 
     /**
      * Executes GGFS task with overridden maximum range length (see
-     * {@link org.apache.ignite.configuration.IgniteFsConfiguration#getMaximumTaskRangeLength()} for more information).
+     * {@link org.apache.ignite.configuration.IgfsConfiguration#getMaximumTaskRangeLength()} for more information).
      *
      * @param task Task to execute.
      * @param rslvr Optional resolver to control split boundaries.
@@ -1822,7 +1822,7 @@ public final class IgfsImpl implements IgfsEx {
 
     /**
      * Executes GGFS task asynchronously with overridden maximum range length (see
-     * {@link org.apache.ignite.configuration.IgniteFsConfiguration#getMaximumTaskRangeLength()} for more information).
+     * {@link org.apache.ignite.configuration.IgfsConfiguration#getMaximumTaskRangeLength()} for more information).
      *
      * @param taskCls Task class to execute.
      * @param rslvr Optional resolver to control split boundaries.
@@ -2011,7 +2011,7 @@ public final class IgfsImpl implements IgfsEx {
                 metrics.decrementFilesOpenedForWrite();
 
                 if (evts.isRecordable(EVT_GGFS_FILE_CLOSED_WRITE))
-                    evts.record(new IgniteFsEvent(path, localNode(), EVT_GGFS_FILE_CLOSED_WRITE, bytes()));
+                    evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_FILE_CLOSED_WRITE, bytes()));
             }
         }
     }
@@ -2051,7 +2051,7 @@ public final class IgfsImpl implements IgfsEx {
                 metrics.decrementFilesOpenedForRead();
 
                 if (evts.isRecordable(EVT_GGFS_FILE_CLOSED_READ))
-                    evts.record(new IgniteFsEvent(path, localNode(), EVT_GGFS_FILE_CLOSED_READ, bytes()));
+                    evts.record(new IgfsEvent(path, localNode(), EVT_GGFS_FILE_CLOSED_READ, bytes()));
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsMetaManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsMetaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsMetaManager.java
index eadda09..9520c51 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsMetaManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsMetaManager.java
@@ -51,7 +51,7 @@ import static org.apache.ignite.transactions.IgniteTxIsolation.*;
 @SuppressWarnings("all")
 public class IgfsMetaManager extends IgfsManager {
     /** GGFS configuration. */
-    private IgniteFsConfiguration cfg;
+    private IgfsConfiguration cfg;
 
     /** Metadata cache. */
     private GridCache<Object, Object> metaCache;
@@ -1605,7 +1605,7 @@ public class IgfsMetaManager extends IgfsManager {
                 assert path != null;
 
                 // Events to fire (can be done outside of a transaction).
-                final Deque<IgniteFsEvent> pendingEvts = new LinkedList<>();
+                final Deque<IgfsEvent> pendingEvts = new LinkedList<>();
 
                 SynchronizationTask<IgfsSecondaryOutputStreamDescriptor> task =
                     new SynchronizationTask<IgfsSecondaryOutputStreamDescriptor>() {
@@ -1645,7 +1645,7 @@ public class IgfsMetaManager extends IgfsManager {
                                     IgfsPath evtPath = parent0;
 
                                     while (!parentPath.equals(evtPath)) {
-                                        pendingEvts.addFirst(new IgniteFsEvent(evtPath, locNode, EVT_GGFS_DIR_CREATED));
+                                        pendingEvts.addFirst(new IgfsEvent(evtPath, locNode, EVT_GGFS_DIR_CREATED));
 
                                         evtPath = evtPath.parent();
 
@@ -1690,7 +1690,7 @@ public class IgfsMetaManager extends IgfsManager {
                                             try {
                                                 t.get(); // Ensure delete succeeded.
 
-                                                evts.record(new IgniteFsEvent(path, locNode, EVT_GGFS_FILE_PURGED));
+                                                evts.record(new IgfsEvent(path, locNode, EVT_GGFS_FILE_PURGED));
                                             }
                                             catch (IgniteCheckedException e) {
                                                 LT.warn(log, e, "Old file deletion failed in DUAL mode [path=" + path +
@@ -1704,12 +1704,12 @@ public class IgfsMetaManager extends IgfsManager {
 
                                 // Record DELETE event if needed.
                                 if (evts.isRecordable(EVT_GGFS_FILE_DELETED))
-                                    pendingEvts.add(new IgniteFsEvent(path, locNode, EVT_GGFS_FILE_DELETED));
+                                    pendingEvts.add(new IgfsEvent(path, locNode, EVT_GGFS_FILE_DELETED));
                             }
 
                             // Record CREATE event if needed.
                             if (evts.isRecordable(EVT_GGFS_FILE_CREATED))
-                                pendingEvts.add(new IgniteFsEvent(path, locNode, EVT_GGFS_FILE_CREATED));
+                                pendingEvts.add(new IgfsEvent(path, locNode, EVT_GGFS_FILE_CREATED));
 
                             return new IgfsSecondaryOutputStreamDescriptor(parentInfo.id(), newInfo, out);
                         }
@@ -1731,7 +1731,7 @@ public class IgfsMetaManager extends IgfsManager {
                     return synchronizeAndExecute(task, fs, false, path.parent());
                 }
                 finally {
-                    for (IgniteFsEvent evt : pendingEvts)
+                    for (IgfsEvent evt : pendingEvts)
                         evts.record(evt);
                 }
             }
@@ -1953,7 +1953,7 @@ public class IgfsMetaManager extends IgfsManager {
                     return true; // No additional handling for root directory is needed.
 
                 // Events to fire (can be done outside of a transaction).
-                final Deque<IgniteFsEvent> pendingEvts = new LinkedList<>();
+                final Deque<IgfsEvent> pendingEvts = new LinkedList<>();
 
                 SynchronizationTask<Boolean> task = new SynchronizationTask<Boolean>() {
                     @Override public Boolean onSuccess(Map<IgfsPath, IgfsFileInfo> infos) throws Exception {
@@ -1979,7 +1979,7 @@ public class IgfsMetaManager extends IgfsManager {
                             IgfsPath evtPath = path;
 
                             while (!parentPath.equals(evtPath)) {
-                                pendingEvts.addFirst(new IgniteFsEvent(evtPath, locNode, EVT_GGFS_DIR_CREATED));
+                                pendingEvts.addFirst(new IgfsEvent(evtPath, locNode, EVT_GGFS_DIR_CREATED));
 
                                 evtPath = evtPath.parent();
 
@@ -2003,7 +2003,7 @@ public class IgfsMetaManager extends IgfsManager {
                     return synchronizeAndExecute(task, fs, false, path.parent());
                 }
                 finally {
-                    for (IgniteFsEvent evt : pendingEvts)
+                    for (IgfsEvent evt : pendingEvts)
                         evts.record(evt);
                 }
             }
@@ -2037,7 +2037,7 @@ public class IgfsMetaManager extends IgfsManager {
                     return false; // Root directory cannot be renamed.
 
                 // Events to fire (can be done outside of a transaction).
-                final Collection<IgniteFsEvent> pendingEvts = new LinkedList<>();
+                final Collection<IgfsEvent> pendingEvts = new LinkedList<>();
 
                 SynchronizationTask<Boolean> task = new SynchronizationTask<Boolean>() {
                     @Override public Boolean onSuccess(Map<IgfsPath, IgfsFileInfo> infos) throws Exception {
@@ -2077,14 +2077,14 @@ public class IgfsMetaManager extends IgfsManager {
                         // Record event if needed.
                         if (srcInfo.isFile()) {
                             if (evts.isRecordable(EVT_GGFS_FILE_RENAMED))
-                                pendingEvts.add(new IgniteFsEvent(
+                                pendingEvts.add(new IgfsEvent(
                                     src,
                                     destInfo == null ? dest : new IgfsPath(dest, src.name()),
                                     locNode,
                                     EVT_GGFS_FILE_RENAMED));
                         }
                         else if (evts.isRecordable(EVT_GGFS_DIR_RENAMED))
-                            pendingEvts.add(new IgniteFsEvent(src, dest, locNode, EVT_GGFS_DIR_RENAMED));
+                            pendingEvts.add(new IgfsEvent(src, dest, locNode, EVT_GGFS_DIR_RENAMED));
 
                         return true;
                     }
@@ -2102,7 +2102,7 @@ public class IgfsMetaManager extends IgfsManager {
                     return synchronizeAndExecute(task, fs, false, src, dest);
                 }
                 finally {
-                    for (IgniteFsEvent evt : pendingEvts)
+                    for (IgfsEvent evt : pendingEvts)
                         evts.record(evt);
                 }
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsProcessor.java
index ffbf963..b8d918a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsProcessor.java
@@ -73,17 +73,17 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
         if (ctx.config().isDaemon())
             return;
 
-        IgniteFsConfiguration[] cfgs = ctx.config().getGgfsConfiguration();
+        IgfsConfiguration[] cfgs = ctx.config().getGgfsConfiguration();
 
         assert cfgs != null && cfgs.length > 0;
 
         validateLocalGgfsConfigurations(cfgs);
 
         // Start GGFS instances.
-        for (IgniteFsConfiguration cfg : cfgs) {
+        for (IgfsConfiguration cfg : cfgs) {
             IgfsContext ggfsCtx = new IgfsContext(
                 ctx,
-                new IgniteFsConfiguration(cfg),
+                new IgfsConfiguration(cfg),
                 new IgfsMetaManager(),
                 new IgfsDataManager(),
                 new IgfsServerManager(),
@@ -218,7 +218,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
 
         assert gridCfg.getGgfsConfiguration() != null;
 
-        for (IgniteFsConfiguration ggfsCfg : gridCfg.getGgfsConfiguration()) {
+        for (IgfsConfiguration ggfsCfg : gridCfg.getGgfsConfiguration()) {
             CacheConfiguration cacheCfg = cacheCfgs.get(ggfsCfg.getDataCacheName());
 
             if (cacheCfg == null)
@@ -258,10 +258,10 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
      * @param cfgs GGFS configurations
      * @throws IgniteCheckedException If any of GGFS configurations is invalid.
      */
-    private void validateLocalGgfsConfigurations(IgniteFsConfiguration[] cfgs) throws IgniteCheckedException {
+    private void validateLocalGgfsConfigurations(IgfsConfiguration[] cfgs) throws IgniteCheckedException {
         Collection<String> cfgNames = new HashSet<>();
 
-        for (IgniteFsConfiguration cfg : cfgs) {
+        for (IgfsConfiguration cfg : cfgs) {
             String name = cfg.getName();
 
             if (cfgNames.contains(name))

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsServerManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsServerManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsServerManager.java
index 88ba40b..7b51e37 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsServerManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgfsServerManager.java
@@ -29,7 +29,7 @@ import org.apache.ignite.thread.*;
 import java.util.*;
 import java.util.concurrent.*;
 
-import static org.apache.ignite.configuration.IgniteFsConfiguration.*;
+import static org.apache.ignite.configuration.IgfsConfiguration.*;
 
 /**
  * GGFS server manager.
@@ -49,7 +49,7 @@ public class IgfsServerManager extends IgfsManager {
 
     /** {@inheritDoc} */
     @Override protected void start0() throws IgniteCheckedException {
-        IgniteFsConfiguration ggfsCfg = ggfsCtx.configuration();
+        IgfsConfiguration ggfsCfg = ggfsCtx.configuration();
         Map<String,String> cfg = ggfsCfg.getIpcEndpointConfiguration();
 
         if (F.isEmpty(cfg)) {


Mime
View raw message