IGNITE-3354: IGFS: Fixed (removed) max space validation logic.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5e915944 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5e915944 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5e915944 Branch: refs/heads/ignite-1232 Commit: 5e9159449b7b7704cfec7c82c846badf7689df43 Parents: 212dc06 Author: vozerov-gridgain <[email protected]> Authored: Wed Jun 22 17:27:13 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Wed Jun 22 17:29:56 2016 +0300 ---------------------------------------------------------------------- .../internal/processors/igfs/IgfsProcessor.java | 24 ------------------ .../igfs/IgfsProcessorValidationSelfTest.java | 26 -------------------- 2 files changed, 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5e915944/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java index 6df9986..85dcb1c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java @@ -38,7 +38,6 @@ import org.apache.ignite.internal.util.ipc.IpcServerEndpoint; import org.apache.ignite.internal.util.typedef.C1; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.X; -import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteClosure; import org.jetbrains.annotations.Nullable; import org.jsr166.ConcurrentHashMap8; @@ -57,7 +56,6 @@ import java.util.concurrent.ConcurrentMap; import static org.apache.ignite.IgniteSystemProperties.IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK; import static org.apache.ignite.IgniteSystemProperties.getBoolean; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; -import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_VALUES; import static org.apache.ignite.igfs.IgfsMode.PROXY; import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_IGFS; @@ -346,28 +344,6 @@ public class IgfsProcessor extends IgfsProcessorAdapter { ipcCfg.getThreadCount()); } - long maxSpaceSize = cfg.getMaxSpaceSize(); - - if (maxSpaceSize > 0) { - // Max space validation. - long maxHeapSize = Runtime.getRuntime().maxMemory(); - long offHeapSize = dataCacheCfg.getOffHeapMaxMemory(); - - if (offHeapSize < 0 && maxSpaceSize > maxHeapSize) - // Offheap is disabled. - throw new IgniteCheckedException("Maximum IGFS space size cannot be greater that size of available heap " + - "memory [maxHeapSize=" + maxHeapSize + ", maxIgfsSpaceSize=" + maxSpaceSize + ']'); - else if (offHeapSize > 0 && maxSpaceSize > maxHeapSize + offHeapSize) - // Offheap is enabled, but limited. - throw new IgniteCheckedException("Maximum IGFS space size cannot be greater than size of available heap " + - "memory and offheap storage [maxHeapSize=" + maxHeapSize + ", offHeapSize=" + offHeapSize + - ", maxIgfsSpaceSize=" + maxSpaceSize + ']'); - } - - if (cfg.getMaxSpaceSize() == 0 && dataCacheCfg.getMemoryMode() == OFFHEAP_VALUES) - U.warn(log, "IGFS max space size is not specified but data cache values are stored off-heap (max " + - "space will be limited to 80% of max JVM heap size): " + cfg.getName()); - boolean secondary = cfg.getDefaultMode() == PROXY; if (cfg.getPathModes() != null) { http://git-wip-us.apache.org/repos/asf/ignite/blob/5e915944/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java index 29bb2cd..97334da 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java @@ -228,32 +228,6 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { /** * @throws Exception If failed. */ - public void testLocalIfOffheapIsDisabledAndMaxSpaceSizeIsGreater() throws Exception { - g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class)); - - g1IgfsCfg2.setMaxSpaceSize(999999999999999999L); - - checkGridStartFails(g1Cfg, "Maximum IGFS space size cannot be greater that size of available heap", true); - } - - /** - * @throws Exception If failed. - */ - public void testLocalIfOffheapIsEnabledAndMaxSpaceSizeIsGreater() throws Exception { - g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class)); - - for (CacheConfiguration cc : g1Cfg.getCacheConfiguration()) - cc.setOffHeapMaxMemory(1000000); - - g1IgfsCfg2.setMaxSpaceSize(999999999999999999L); - - checkGridStartFails(g1Cfg, - "Maximum IGFS space size cannot be greater than size of available heap memory and offheap storage", true); - } - - /** - * @throws Exception If failed. - */ public void testLocalIfNonPrimaryModeAndHadoopFileSystemUriIsNull() throws Exception { g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
