Repository: ignite Updated Branches: refs/heads/ignite-2.1.2-exchange 323ab3a10 -> ccb790f75
IGNITE-5415 Fixed memory policy configuration. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b9bbeb89 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b9bbeb89 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b9bbeb89 Branch: refs/heads/ignite-2.1.2-exchange Commit: b9bbeb89645400c8cbb0ad98b79bbd73a966349f Parents: 6143bc9 Author: Andrey Novikov <[email protected]> Authored: Mon Jun 19 11:14:43 2017 +0700 Committer: Andrey Novikov <[email protected]> Committed: Mon Jun 19 11:14:43 2017 +0700 ---------------------------------------------------------------------- .../frontend/app/modules/configuration/generator/Beans.js | 8 ++++++++ .../configuration/generator/ConfigurationGenerator.js | 10 ++++++---- .../configuration/generator/JavaTransformer.service.js | 4 ++-- .../app/modules/states/configuration/clusters/memory.pug | 7 ++++--- 4 files changed, 20 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b9bbeb89/modules/web-console/frontend/app/modules/configuration/generator/Beans.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/configuration/generator/Beans.js b/modules/web-console/frontend/app/modules/configuration/generator/Beans.js index 0972eac..f4d86f7 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/Beans.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/Beans.js @@ -214,10 +214,18 @@ export class Bean extends EmptyBean { return this._property(this.properties, 'int', model, name, _.nonNil); } + longProperty(model, name = model) { + return this._property(this.properties, 'long', model, name, _.nonNil); + } + floatProperty(model, name = model) { return this._property(this.properties, 'float', model, name, _.nonNil); } + doubleProperty(model, name = model) { + return this._property(this.properties, 'double', model, name, _.nonNil); + } + property(name, value, hint) { this.properties.push({clsName: 'PROPERTY', name, value, hint}); http://git-wip-us.apache.org/repos/asf/ignite/blob/b9bbeb89/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 f77d7e7..d2471a2 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js @@ -1301,12 +1301,14 @@ export default class IgniteConfigurationGenerator { const plcBean = new Bean('org.apache.ignite.configuration.MemoryPolicyConfiguration', 'policy', plc, clusterDflts.memoryConfiguration.memoryPolicies); plcBean.stringProperty('name') - .intProperty('initialSize') - .intProperty('maxSize') + .longProperty('initialSize') + .longProperty('maxSize') .stringProperty('swapFilePath') .enumProperty('pageEvictionMode') - .intProperty('evictionThreshold') + .doubleProperty('evictionThreshold') .intProperty('emptyPagesPoolSize') + .intProperty('subIntervals') + .longProperty('rateTimeInterval') .boolProperty('metricsEnabled'); if (plcBean.isEmpty()) return; @@ -1315,7 +1317,7 @@ export default class IgniteConfigurationGenerator { }); if (!_.isEmpty(policies)) - memoryBean.arrayProperty('memoryPolicies', 'memoryPolicies', policies, 'org.apache.ignite.configuration.MemoryPolicyConfiguration'); + memoryBean.varArgProperty('memoryPolicies', 'memoryPolicies', policies, 'org.apache.ignite.configuration.MemoryPolicyConfiguration'); if (memoryBean.isEmpty()) return cfg; http://git-wip-us.apache.org/repos/asf/ignite/blob/b9bbeb89/modules/web-console/frontend/app/modules/configuration/generator/JavaTransformer.service.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/configuration/generator/JavaTransformer.service.js b/modules/web-console/frontend/app/modules/configuration/generator/JavaTransformer.service.js index 01f118d..8739608 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/JavaTransformer.service.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/JavaTransformer.service.js @@ -384,12 +384,12 @@ export default class IgniteJavaTransformer extends AbstractTransformer { return 'null'; switch (clsName) { - case 'var': - return item; case 'byte': return `(byte) ${item}`; case 'float': return `${item}f`; + case 'double': + return `${item}`; case 'long': return `${item}L`; case 'java.io.Serializable': http://git-wip-us.apache.org/repos/asf/ignite/blob/b9bbeb89/modules/web-console/frontend/app/modules/states/configuration/clusters/memory.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/states/configuration/clusters/memory.pug b/modules/web-console/frontend/app/modules/states/configuration/clusters/memory.pug index 1184a4e..0ba1ab4 100644 --- a/modules/web-console/frontend/app/modules/states/configuration/clusters/memory.pug +++ b/modules/web-console/frontend/app/modules/states/configuration/clusters/memory.pug @@ -107,9 +107,6 @@ include /app/helpers/jade/mixins .settings-row +number('Empty pages pool size:', 'model.emptyPagesPoolSize', '"MemoryPolicyEmptyPagesPoolSize" + $index', 'true', '100', '11', 'The minimal number of empty pages to be present in reuse lists for this memory policy') - .settings-row - +checkbox('Metrics enabled', 'model.metricsEnabled', '"MemoryPolicyMetricsEnabled" + $index', - 'Whether memory metrics are enabled by default on node startup') //- Since ignite 2.1 .div(ng-if='$ctrl.available("2.1.0")') @@ -119,5 +116,9 @@ include /app/helpers/jade/mixins .settings-row +number('Rate time interval:', 'model.rateTimeInterval', '"MemoryPolicyRateTimeInterval" + $index', 'true', '60000', '1000', 'Time interval for allocation rate and eviction rate monitoring purposes') + + .settings-row + +checkbox('Metrics enabled', 'model.metricsEnabled', '"MemoryPolicyMetricsEnabled" + $index', + 'Whether memory metrics are enabled by default on node startup') .col-sm-6 +preview-xml-java(model, 'clusterMemory')
