ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [1/2] ignite git commit: IGNITE-4990: Removed deprecated properties from FileSystemConfiguration. This closes #1816.
Date Tue, 18 Apr 2017 12:25:34 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-2.0 ded9974e1 -> eaf7350c6


IGNITE-4990: Removed deprecated properties from FileSystemConfiguration. This closes #1816.


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

Branch: refs/heads/ignite-2.0
Commit: d8480bdc22048ffadd3716f5d3a1f1c6a1797a0f
Parents: 3b93f79
Author: devozerov <vozerov@gridgain.com>
Authored: Tue Apr 18 15:24:19 2017 +0300
Committer: devozerov <vozerov@gridgain.com>
Committed: Tue Apr 18 15:24:19 2017 +0300

----------------------------------------------------------------------
 .../configuration/FileSystemConfiguration.java  | 172 -------------------
 .../visor/node/VisorIgfsConfiguration.java      |  65 -------
 .../processors/igfs/IgfsSizeSelfTest.java       |   5 -
 modules/web-console/backend/app/mongo.js        |   4 -
 .../generator/AbstractTransformer.js            |   5 -
 .../generator/ConfigurationGenerator.js         |  11 --
 .../generator/defaults/IGFS.service.js          |   3 -
 .../modules/states/configuration/igfs/dual.pug  |  42 -----
 .../modules/states/configuration/igfs/misc.pug  |   2 -
 .../frontend/views/configuration/igfs.tpl.pug   |   1 -
 10 files changed, 310 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/d8480bdc/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java
index e1aaa711..337506c 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java
@@ -27,7 +27,6 @@ import org.apache.ignite.internal.util.typedef.internal.S;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Map;
-import java.util.concurrent.ExecutorService;
 
 /**
  * {@code IGFS} configuration. More than one file system can be configured within grid.
@@ -47,9 +46,6 @@ public class FileSystemConfiguration {
     /** 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;
 
@@ -74,9 +70,6 @@ public class FileSystemConfiguration {
     /** 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;
 
@@ -140,9 +133,6 @@ public class FileSystemConfiguration {
     /** 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;
 
@@ -152,18 +142,6 @@ public class FileSystemConfiguration {
     /** 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;
 
@@ -208,11 +186,7 @@ public class FileSystemConfiguration {
         colocateMeta = cfg.isColocateMetadata();
         dataCacheCfg = cfg.getDataCacheConfiguration();
         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();
@@ -231,7 +205,6 @@ public class FileSystemConfiguration {
         prefetchBlocks = cfg.getPrefetchBlocks();
         relaxedConsistency = cfg.isRelaxedConsistency();
         seqReadsBeforePrefetch = cfg.getSequentialReadsBeforePrefetch();
-        trashPurgeTimeout = cfg.getTrashPurgeTimeout();
         updateFileLenOnFlush = cfg.isUpdateFileLengthOnFlush();
     }
 
@@ -662,7 +635,6 @@ public class FileSystemConfiguration {
      * Gets throttle delay for fragmentizer.
      *
      * @return Throttle delay in milliseconds.
-     * @return {@code this} for chaining.
      */
     public long getFragmentizerThrottlingDelay() {
         return fragmentizerThrottlingDelay;
@@ -683,7 +655,6 @@ public class FileSystemConfiguration {
      * Gets number of files that can be processed by fragmentizer concurrently.
      *
      * @return Number of files to process concurrently.
-     * @return {@code this} for chaining.
      */
     public int getFragmentizerConcurrentFiles() {
         return fragmentizerConcurrentFiles;
@@ -702,41 +673,6 @@ public class FileSystemConfiguration {
     }
 
     /**
-     * Gets amount of local memory (in % of local IGFS max space size) available for local
writes
-     * during file creation.
-     * <p>
-     * If current IGFS 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.
-     *
-     * @deprecated Parameter is no longer used.
-     */
-    @Deprecated
-    public float getFragmentizerLocalWritesRatio() {
-        return fragmentizerLocWritesRatio;
-    }
-
-    /**
-     * Sets ratio for space available for local file writes.
-     *
-     * @param fragmentizerLocWritesRatio Ratio for local file writes.
-     * @see #getFragmentizerLocalWritesRatio()
-     *
-     * @deprecated Parameter is no longer used.
-     * @return {@code this} for chaining.
-     */
-    @Deprecated
-    public FileSystemConfiguration setFragmentizerLocalWritesRatio(float fragmentizerLocWritesRatio)
{
-        this.fragmentizerLocWritesRatio = fragmentizerLocWritesRatio;
-
-        return this;
-    }
-
-    /**
      * Gets flag indicating whether IGFS fragmentizer is enabled. If fragmentizer is disabled,
files will be
      * written in distributed fashion.
      *
@@ -780,114 +716,6 @@ public class FileSystemConfiguration {
     }
 
     /**
-     * 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.
-     * @deprecated Not used any more.
-     */
-    @Deprecated
-    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.
-     * @deprecated Not used any more.
-     * @return {@code this} for chaining.
-     */
-    @Deprecated
-    public FileSystemConfiguration setTrashPurgeTimeout(long trashPurgeTimeout) {
-        this.trashPurgeTimeout = trashPurgeTimeout;
-
-        return this;
-    }
-
-    /**
-     * 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 IGFS 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.
-     * @deprecated Not used any more.
-     */
-    @Deprecated
-    @Nullable public ExecutorService getDualModePutExecutorService() {
-        return dualModePutExec;
-    }
-
-    /**
-     * Set DUAL mode put operations executor service.
-     *
-     * @param dualModePutExec Dual mode put operations executor service.
-     * @deprecated Not used any more.
-     * @return {@code this} for chaining.
-     */
-    @Deprecated
-    public FileSystemConfiguration setDualModePutExecutorService(ExecutorService dualModePutExec)
{
-        this.dualModePutExec = dualModePutExec;
-
-        return this;
-    }
-
-    /**
-     * Get DUAL mode put operation executor service shutdown flag.
-     *
-     * @return DUAL mode put operation executor service shutdown flag.
-     * @deprecated Not used any more.
-     */
-    @Deprecated
-    public boolean getDualModePutExecutorServiceShutdown() {
-        return dualModePutExecShutdown;
-    }
-
-    /**
-     * Set DUAL mode put operations executor service shutdown flag.
-     *
-     * @param dualModePutExecShutdown Dual mode put operations executor service shutdown
flag.
-     * @deprecated Not used any more.
-     * @return {@code this} for chaining.
-     */
-    @Deprecated
-    public FileSystemConfiguration setDualModePutExecutorServiceShutdown(boolean dualModePutExecShutdown)
{
-        this.dualModePutExecShutdown = dualModePutExecShutdown;
-
-        return this;
-    }
-
-    /**
-     * 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
-     * @deprecated Not used any more.
-     */
-    @Deprecated
-    public long getDualModeMaxPendingPutsSize() {
-        return dualModeMaxPendingPutsSize;
-    }
-
-    /**
-     * Set maximum amount of data in pending put operations.
-     *
-     * @param dualModeMaxPendingPutsSize Maximum amount of data in pending put operations.
-     * @deprecated Not used any more.
-     * @return {@code this} for chaining.
-     */
-    @Deprecated
-    public FileSystemConfiguration setDualModeMaxPendingPutsSize(long dualModeMaxPendingPutsSize)
{
-        this.dualModeMaxPendingPutsSize = dualModeMaxPendingPutsSize;
-
-        return this;
-    }
-
-    /**
      * Get maximum default range size of a file being split during IGFS task execution. When
IGFS task is about to
      * be executed, it requests file block locations first. Each location is defined as {@link
org.apache.ignite.igfs.mapreduce.IgfsFileRange} which
      * has length. In case this parameter is set to positive value, then IGFS will split
single file range into smaller

http://git-wip-us.apache.org/repos/asf/ignite/blob/d8480bdc/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
index 15c1fc6..3b97129 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
@@ -71,24 +71,12 @@ public class VisorIgfsConfiguration extends VisorDataTransferObject {
     /** Map of paths to IGFS modes. */
     private Map<String, IgfsMode> pathModes;
 
-    /** Dual mode PUT operations executor service. */
-    private String dualModePutExecutorSrvc;
-
-    /** Dual mode PUT operations executor service shutdown flag. */
-    private boolean dualModePutExecutorSrvcShutdown;
-
-    /** Maximum amount of data in pending puts. */
-    private long dualModeMaxPendingPutsSize;
-
     /** Maximum range length. */
     private long maxTaskRangeLen;
 
     /** Fragmentizer concurrent files. */
     private int fragmentizerConcurrentFiles;
 
-    /** Fragmentizer local writes ratio. */
-    private float fragmentizerLocWritesRatio;
-
     /** Fragmentizer enabled flag. */
     private boolean fragmentizerEnabled;
 
@@ -113,9 +101,6 @@ public class VisorIgfsConfiguration extends VisorDataTransferObject {
     /** Amount of sequential block reads before prefetch is triggered. */
     private int seqReadsBeforePrefetch;
 
-    /** Trash purge await timeout. */
-    private long trashPurgeTimeout;
-
     /**
      * Default constructor.
      */
@@ -139,12 +124,8 @@ public class VisorIgfsConfiguration extends VisorDataTransferObject {
 
         dfltMode = igfs.getDefaultMode();
         pathModes = igfs.getPathModes();
-        dualModePutExecutorSrvc = compactClass(igfs.getDualModePutExecutorService());
-        dualModePutExecutorSrvcShutdown = igfs.getDualModePutExecutorServiceShutdown();
-        dualModeMaxPendingPutsSize = igfs.getDualModeMaxPendingPutsSize();
         maxTaskRangeLen = igfs.getMaximumTaskRangeLength();
         fragmentizerConcurrentFiles = igfs.getFragmentizerConcurrentFiles();
-        fragmentizerLocWritesRatio = igfs.getFragmentizerLocalWritesRatio();
         fragmentizerEnabled = igfs.isFragmentizerEnabled();
         fragmentizerThrottlingBlockLen = igfs.getFragmentizerThrottlingBlockLength();
         fragmentizerThrottlingDelay = igfs.getFragmentizerThrottlingDelay();
@@ -157,7 +138,6 @@ public class VisorIgfsConfiguration extends VisorDataTransferObject {
         maxSpace = igfs.getMaxSpaceSize();
         mgmtPort = igfs.getManagementPort();
         seqReadsBeforePrefetch = igfs.getSequentialReadsBeforePrefetch();
-        trashPurgeTimeout = igfs.getTrashPurgeTimeout();
     }
 
     /**
@@ -248,27 +228,6 @@ public class VisorIgfsConfiguration extends VisorDataTransferObject {
     }
 
     /**
-     * @return Dual mode PUT operations executor service.
-     */
-    public String getDualModePutExecutorService() {
-        return dualModePutExecutorSrvc;
-    }
-
-    /**
-     * @return Dual mode PUT operations executor service shutdown flag.
-     */
-    public boolean getDualModePutExecutorServiceShutdown() {
-        return dualModePutExecutorSrvcShutdown;
-    }
-
-    /**
-     * @return Maximum amount of data in pending puts.
-     */
-    public long getDualModeMaxPendingPutsSize() {
-        return dualModeMaxPendingPutsSize;
-    }
-
-    /**
      * @return Maximum range length.
      */
     public long getMaxTaskRangeLength() {
@@ -283,13 +242,6 @@ public class VisorIgfsConfiguration extends VisorDataTransferObject {
     }
 
     /**
-     * @return Fragmentizer local writes ratio.
-     */
-    public float getFragmentizerLocalWritesRatio() {
-        return fragmentizerLocWritesRatio;
-    }
-
-    /**
      * @return Fragmentizer enabled flag.
      */
     public boolean isFragmentizerEnabled() {
@@ -345,13 +297,6 @@ public class VisorIgfsConfiguration extends VisorDataTransferObject {
         return seqReadsBeforePrefetch;
     }
 
-    /**
-     * @return Trash purge await timeout.
-     */
-    public long getTrashPurgeTimeout() {
-        return trashPurgeTimeout;
-    }
-
     /** {@inheritDoc} */
     @Override protected void writeExternalData(ObjectOutput out) throws IOException {
         U.writeString(out, name);
@@ -364,12 +309,8 @@ public class VisorIgfsConfiguration extends VisorDataTransferObject {
         out.writeInt(perNodeParallelBatchCnt);
         U.writeEnum(out, dfltMode);
         U.writeMap(out, pathModes);
-        U.writeString(out, dualModePutExecutorSrvc);
-        out.writeBoolean(dualModePutExecutorSrvcShutdown);
-        out.writeLong(dualModeMaxPendingPutsSize);
         out.writeLong(maxTaskRangeLen);
         out.writeInt(fragmentizerConcurrentFiles);
-        out.writeFloat(fragmentizerLocWritesRatio);
         out.writeBoolean(fragmentizerEnabled);
         out.writeLong(fragmentizerThrottlingBlockLen);
         out.writeLong(fragmentizerThrottlingDelay);
@@ -378,7 +319,6 @@ public class VisorIgfsConfiguration extends VisorDataTransferObject {
         out.writeLong(maxSpace);
         out.writeInt(mgmtPort);
         out.writeInt(seqReadsBeforePrefetch);
-        out.writeLong(trashPurgeTimeout);
     }
 
     /** {@inheritDoc} */
@@ -393,12 +333,8 @@ public class VisorIgfsConfiguration extends VisorDataTransferObject {
         perNodeParallelBatchCnt = in.readInt();
         dfltMode = IgfsMode.fromOrdinal(in.readByte());
         pathModes = U.readMap(in);
-        dualModePutExecutorSrvc = U.readString(in);
-        dualModePutExecutorSrvcShutdown = in.readBoolean();
-        dualModeMaxPendingPutsSize = in.readLong();
         maxTaskRangeLen = in.readLong();
         fragmentizerConcurrentFiles = in.readInt();
-        fragmentizerLocWritesRatio = in.readFloat();
         fragmentizerEnabled = in.readBoolean();
         fragmentizerThrottlingBlockLen = in.readLong();
         fragmentizerThrottlingDelay = in.readLong();
@@ -407,7 +343,6 @@ public class VisorIgfsConfiguration extends VisorDataTransferObject {
         maxSpace = in.readLong();
         mgmtPort = in.readInt();
         seqReadsBeforePrefetch = in.readInt();
-        trashPurgeTimeout = in.readLong();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/d8480bdc/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 1fa4f56..645f341 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
@@ -90,15 +90,11 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
     /** IGFS maximum space. */
     private long igfsMaxData;
 
-    /** Trash purge timeout. */
-    private long trashPurgeTimeout;
-
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         cacheMode = null;
         nearEnabled = false;
         igfsMaxData = 0;
-        trashPurgeTimeout = 0;
 
         mgmtPort = 11400;
     }
@@ -118,7 +114,6 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
         igfsCfg.setBlockSize(BLOCK_SIZE);
         igfsCfg.setFragmentizerEnabled(false);
         igfsCfg.setMaxSpaceSize(igfsMaxData);
-        igfsCfg.setTrashPurgeTimeout(trashPurgeTimeout);
         igfsCfg.setManagementPort(++mgmtPort);
 
         CacheConfiguration dataCfg = defaultCacheConfiguration();

http://git-wip-us.apache.org/repos/asf/ignite/blob/d8480bdc/modules/web-console/backend/app/mongo.js
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/app/mongo.js b/modules/web-console/backend/app/mongo.js
index 0e1aad7..3038ad2 100644
--- a/modules/web-console/backend/app/mongo.js
+++ b/modules/web-console/backend/app/mongo.js
@@ -338,9 +338,6 @@ module.exports.factory = function(passportMongo, settings, pluginMongo,
mongoose
         dataCacheName: String,
         metaCacheName: String,
         defaultMode: {type: String, enum: ['PRIMARY', 'PROXY', 'DUAL_SYNC', 'DUAL_ASYNC']},
-        dualModeMaxPendingPutsSize: Number,
-        dualModePutExecutorService: String,
-        dualModePutExecutorServiceShutdown: Boolean,
         fragmentizerConcurrentFiles: Number,
         fragmentizerEnabled: Boolean,
         fragmentizerThrottlingBlockLength: Number,
@@ -362,7 +359,6 @@ module.exports.factory = function(passportMongo, settings, pluginMongo,
mongoose
         perNodeParallelBatchCount: Number,
         prefetchBlocks: Number,
         sequentialReadsBeforePrefetch: Number,
-        trashPurgeTimeout: Number,
         secondaryFileSystemEnabled: Boolean,
         secondaryFileSystem: {
             uri: String,

http://git-wip-us.apache.org/repos/asf/ignite/blob/d8480bdc/modules/web-console/frontend/app/modules/configuration/generator/AbstractTransformer.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/generator/AbstractTransformer.js
b/modules/web-console/frontend/app/modules/configuration/generator/AbstractTransformer.js
index 40641d9..e008fc6 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/AbstractTransformer.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/AbstractTransformer.js
@@ -190,11 +190,6 @@ export default class AbstractTransformer {
         return this.toSection(this.generator.igfsFragmentizer(igfs));
     }
 
-    // Generate IGFS Dual mode group.
-    static igfsDualMode(igfs) {
-        return this.toSection(this.generator.igfsDualMode(igfs));
-    }
-
     // Generate IGFS miscellaneous group.
     static igfsMisc(igfs) {
         return this.toSection(this.generator.igfsMisc(igfs));

http://git-wip-us.apache.org/repos/asf/ignite/blob/d8480bdc/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
index f928459..a76d486 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
@@ -1169,7 +1169,6 @@ export default class IgniteConfigurationGenerator {
 
             this.igfsIPC(igfs, igfsCfg);
             this.igfsFragmentizer(igfs, igfsCfg);
-            this.igfsDualMode(igfs, igfsCfg);
             this.igfsSecondFS(igfs, igfsCfg);
             this.igfsMisc(igfs, igfsCfg);
 
@@ -1837,15 +1836,6 @@ export default class IgniteConfigurationGenerator {
         return cfg;
     }
 
-    // Generate IGFS Dual mode group.
-    static igfsDualMode(igfs, cfg = this.igfsConfigurationBean(igfs)) {
-        cfg.intProperty('dualModeMaxPendingPutsSize')
-            .emptyBeanProperty('dualModePutExecutorService')
-            .intProperty('dualModePutExecutorServiceShutdown');
-
-        return cfg;
-    }
-
     // Generate IGFS miscellaneous group.
     static igfsMisc(igfs, cfg = this.igfsConfigurationBean(igfs)) {
         cfg.intProperty('blockSize')
@@ -1857,7 +1847,6 @@ export default class IgniteConfigurationGenerator {
             .intProperty('perNodeParallelBatchCount')
             .intProperty('prefetchBlocks')
             .intProperty('sequentialReadsBeforePrefetch')
-            .intProperty('trashPurgeTimeout')
             .intProperty('colocateMetadata')
             .intProperty('relaxedConsistency')
             .mapProperty('pathModes', 'pathModes');

http://git-wip-us.apache.org/repos/asf/ignite/blob/d8480bdc/modules/web-console/frontend/app/modules/configuration/generator/defaults/IGFS.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/generator/defaults/IGFS.service.js
b/modules/web-console/frontend/app/modules/configuration/generator/defaults/IGFS.service.js
index 7cdc59a..6c8d16c 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/defaults/IGFS.service.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/defaults/IGFS.service.js
@@ -35,8 +35,6 @@ const DFLT_IGFS = {
     fragmentizerConcurrentFiles: 0,
     fragmentizerThrottlingBlockLength: 16777216,
     fragmentizerThrottlingDelay: 200,
-    dualModeMaxPendingPutsSize: 0,
-    dualModePutExecutorServiceShutdown: false,
     blockSize: 65536,
     bufferSize: 65536,
     maxSpaceSize: 0,
@@ -46,7 +44,6 @@ const DFLT_IGFS = {
     perNodeParallelBatchCount: 8,
     prefetchBlocks: 0,
     sequentialReadsBeforePrefetch: 0,
-    trashPurgeTimeout: 1000,
     colocateMetadata: true,
     relaxedConsistency: true,
     pathModes: {

http://git-wip-us.apache.org/repos/asf/ignite/blob/d8480bdc/modules/web-console/frontend/app/modules/states/configuration/igfs/dual.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/configuration/igfs/dual.pug b/modules/web-console/frontend/app/modules/states/configuration/igfs/dual.pug
deleted file mode 100644
index 613070c..0000000
--- a/modules/web-console/frontend/app/modules/states/configuration/igfs/dual.pug
+++ /dev/null
@@ -1,42 +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.
-
-include /app/helpers/jade/mixins
-
--var form = 'dualMode'
--var model = 'backupItem'
-
-.panel.panel-default(ng-form=form novalidate)
-    .panel-heading(bs-collapse-toggle='' ng-click=`ui.loadPanel('${form}')`)
-        ignite-form-panel-chevron
-        label Dual mode
-        ignite-form-field-tooltip.tipLabel
-            | IGFS supports dual-mode that allows it to work as either a standalone file
system in Hadoop cluster, or work in tandem with HDFS, providing a primary caching layer for
the secondary HDFS#[br]
-            | As a caching layer it provides highly configurable read-through and write-through
behaviour
-        ignite-form-revert
-    .panel-collapse(role='tabpanel' bs-collapse-target id=`${form}`)
-        .panel-body(ng-if=`ui.isPanelLoaded('${form}')`)
-            .col-sm-6
-                .settings-row
-                    +number('Maximum pending puts size:', `${model}.dualModeMaxPendingPutsSize`,
'"dualModeMaxPendingPutsSize"', 'true', '0', 'Number.MIN_SAFE_INTEGER',
-                        'Maximum amount of pending data read from the secondary file system
and waiting to be written to data cache<br/>\
-                        Zero or negative value stands for unlimited size')
-                .settings-row
-                    +java-class('Put executor service:', `${model}.dualModePutExecutorService`,
'"dualModePutExecutorService"', 'true', 'false', 'DUAL mode put operation executor service')
-                .settings-row
-                    +checkbox('Put executor service shutdown', `${model}.dualModePutExecutorServiceShutdown`,
'"dualModePutExecutorServiceShutdown"', 'DUAL mode put operation executor service shutdown
flag')
-            .col-sm-6
-                +preview-xml-java(model, 'igfsDualMode')

http://git-wip-us.apache.org/repos/asf/ignite/blob/d8480bdc/modules/web-console/frontend/app/modules/states/configuration/igfs/misc.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/configuration/igfs/misc.pug b/modules/web-console/frontend/app/modules/states/configuration/igfs/misc.pug
index 7df7e7e..6133feb 100644
--- a/modules/web-console/frontend/app/modules/states/configuration/igfs/misc.pug
+++ b/modules/web-console/frontend/app/modules/states/configuration/igfs/misc.pug
@@ -71,8 +71,6 @@ mixin table-igfs-path-mode-edit(prefix, focusId, index)
                 .settings-row
                     +number('Sequential reads before prefetch:', `${model}.sequentialReadsBeforePrefetch`,
'"sequentialReadsBeforePrefetch"', 'true', '0', '0', 'Amount of sequential block reads before
prefetch is triggered')
                 .settings-row
-                    +number('Trash purge timeout:', `${model}.trashPurgeTimeout`, '"trashPurgeTimeout"',
'true', '1000', '0', 'Maximum timeout awaiting for trash purging in case data cache oversize
is detected')
-                .settings-row
                     +checkbox('Colocate metadata', `${model}.colocateMetadata`, '"colocateMetadata"',
'Whether to co-locate metadata on a single node')
                 .settings-row
                     +checkbox('Relaxed consistency', `${model}.relaxedConsistency`, '"relaxedConsistency"',

http://git-wip-us.apache.org/repos/asf/ignite/blob/d8480bdc/modules/web-console/frontend/views/configuration/igfs.tpl.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/configuration/igfs.tpl.pug b/modules/web-console/frontend/views/configuration/igfs.tpl.pug
index 89e0920..dfc9ed2 100644
--- a/modules/web-console/frontend/views/configuration/igfs.tpl.pug
+++ b/modules/web-console/frontend/views/configuration/igfs.tpl.pug
@@ -45,7 +45,6 @@ include /app/helpers/jade/mixins
                             include /app/modules/states/configuration/igfs/secondary
                             include /app/modules/states/configuration/igfs/ipc
                             include /app/modules/states/configuration/igfs/fragmentizer
-                            include /app/modules/states/configuration/igfs/dual
                             include /app/modules/states/configuration/igfs/misc
 
                             +advanced-options-toggle-default


Mime
View raw message