ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-5090 Remove cache start size from WebConsole and Visor.
Date Wed, 26 Apr 2017 16:41:45 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-5090 a87383d7b -> 06baef2a5


IGNITE-5090 Remove cache start size from WebConsole and Visor.


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

Branch: refs/heads/ignite-5090
Commit: 06baef2a5e6bdd7f1a34ca5febe8c643d952ab67
Parents: a87383d
Author: Alexey Kuznetsov <akuznetsov@gridgain.com>
Authored: Wed Apr 26 23:41:29 2017 +0700
Committer: Alexey Kuznetsov <akuznetsov@gridgain.com>
Committed: Wed Apr 26 23:41:29 2017 +0700

----------------------------------------------------------------------
 .../internal/visor/node/VisorBasicConfiguration.java   | 13 +++++++++++++
 modules/web-console/backend/app/mongo.js               |  1 -
 .../configuration/generator/ConfigurationGenerator.js  |  2 --
 .../configuration/generator/PlatformGenerator.js       |  2 --
 .../configuration/generator/defaults/Cache.service.js  |  1 -
 .../app/modules/states/configuration/caches/memory.pug |  9 ---------
 6 files changed, 13 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/06baef2a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
index a70cfdd..0a3a8ea 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
@@ -113,6 +113,9 @@ public class VisorBasicConfiguration extends VisorDataTransferObject {
     /** Whether update checker is enabled. */
     private boolean updateNtf;
 
+    /** Full metrics enabled flag. */
+    private long metricsUpdateFreq;
+
     /**
      * Default constructor.
      */
@@ -148,6 +151,7 @@ public class VisorBasicConfiguration extends VisorDataTransferObject {
         quiet = boolValue(IGNITE_QUIET, true);
         successFile = getProperty(IGNITE_SUCCESS_FILE);
         updateNtf = boolValue(IGNITE_UPDATE_NOTIFIER, true);
+        metricsUpdateFreq = c.getMetricsUpdateFrequency();
     }
 
     /**
@@ -297,6 +301,13 @@ public class VisorBasicConfiguration extends VisorDataTransferObject
{
         return updateNtf;
     }
 
+    /**
+     * @return Job metrics update frequency in milliseconds.
+     */
+    public long getMetricsUpdateFrequency() {
+        return metricsUpdateFreq;
+    }
+
     /** {@inheritDoc} */
     @Override protected void writeExternalData(ObjectOutput out) throws IOException {
         U.writeString(out, igniteInstanceName);
@@ -320,6 +331,7 @@ public class VisorBasicConfiguration extends VisorDataTransferObject {
         out.writeBoolean(quiet);
         U.writeString(out, successFile);
         out.writeBoolean(updateNtf);
+        out.writeLong(metricsUpdateFreq);
     }
 
     /** {@inheritDoc} */
@@ -345,6 +357,7 @@ public class VisorBasicConfiguration extends VisorDataTransferObject {
         quiet = in.readBoolean();
         successFile = U.readString(in);
         updateNtf = in.readBoolean();
+        metricsUpdateFreq = in.readLong();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/06baef2a/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 3038ad2..4228641 100644
--- a/modules/web-console/backend/app/mongo.js
+++ b/modules/web-console/backend/app/mongo.js
@@ -179,7 +179,6 @@ module.exports.factory = function(passportMongo, settings, pluginMongo,
mongoose
         },
 
         backups: Number,
-        startSize: Number,
 
         onheapCacheEnabled: Boolean,
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/06baef2a/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 a76d486..f4901a9 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
@@ -1486,8 +1486,6 @@ export default class IgniteConfigurationGenerator {
     static cacheMemory(cache, ccfg = this.cacheConfigurationBean(cache)) {
         this._evictionPolicy(ccfg, 'evictionPolicy', cache.evictionPolicy, cacheDflts.evictionPolicy);
 
-        ccfg.intProperty('startSize');
-
         return ccfg;
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/06baef2a/modules/web-console/frontend/app/modules/configuration/generator/PlatformGenerator.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/generator/PlatformGenerator.js
b/modules/web-console/frontend/app/modules/configuration/generator/PlatformGenerator.js
index 807303d..d8426fa 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/PlatformGenerator.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/PlatformGenerator.js
@@ -296,8 +296,6 @@ export default ['JavaTypes', 'igniteClusterPlatformDefaults', 'igniteCachePlatfo
         static cacheMemory(cache, ccfg = this.cacheConfigurationBean(cache)) {
             // this._evictionPolicy(ccfg, 'evictionPolicy', cache.evictionPolicy, cacheDflts.evictionPolicy);
 
-            ccfg.intProperty('startSize');
-
             return ccfg;
         }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/06baef2a/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.service.js
b/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.service.js
index 4efc892..e77d1d3 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.service.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.service.js
@@ -26,7 +26,6 @@ const DFLT_CACHE = {
         clsName: 'org.apache.ignite.cache.PartitionLossPolicy',
         value: 'IGNORE'
     },
-    startSize: 1500000,
     sqlOnheapRowCacheSize: 10240,
     longQueryWarningTimeout: 3000,
     snapshotableIndex: false,

http://git-wip-us.apache.org/repos/asf/ignite/blob/06baef2a/modules/web-console/frontend/app/modules/states/configuration/caches/memory.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/configuration/caches/memory.pug
b/modules/web-console/frontend/app/modules/states/configuration/caches/memory.pug
index 8384be9..4ea9160 100644
--- a/modules/web-console/frontend/app/modules/states/configuration/caches/memory.pug
+++ b/modules/web-console/frontend/app/modules/states/configuration/caches/memory.pug
@@ -41,14 +41,5 @@ include /app/helpers/jade/mixins
                             <li>First In First Out (FIFO) - Eviction policy based on
FIFO algorithm and supports batch eviction</li>\
                             <li>SORTED - Eviction policy which will select the minimum
cache entry for eviction</li>\
                         </ul>')
-                .settings-row
-                    +number('Start size:', `${model}.startSize`, '"startSize"', 'true', '1500000',
'0',
-                        'In terms of size and capacity, Ignite internal cache map acts exactly
like a normal Java HashMap: it has some initial capacity\
-                        (which is pretty small by default), which doubles as data arrives.
The process of internal cache map resizing is CPU-intensive\
-                        and time-consuming, and if you load a huge dataset into cache (which
is a normal use case), the map will have to resize a lot of times.\
-                        To avoid that, you can specify the initial cache map capacity, comparable
to the expected size of your dataset.\
-                        This will save a lot of CPU resources during the load time, because
the map would not have to resize.\
-                        For example, if you expect to load 10 million entries into cache,
you can set this property to 10 000 000.\
-                        This will save you from cache internal map resizes.')
             .col-sm-6
                 +preview-xml-java(model, 'cacheMemory')


Mime
View raw message