You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/10/25 09:41:17 UTC
[43/50] [abbrv] ignite git commit: IGNITE-6560 Minor changes of Data
region configuration.
IGNITE-6560 Minor changes of Data region configuration.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eb81e6cd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eb81e6cd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eb81e6cd
Branch: refs/heads/ignite-3478
Commit: eb81e6cde187d15ad87865d250c05bff8a117f8d
Parents: 27cce61
Author: vsisko <vs...@gridgain.com>
Authored: Tue Oct 24 19:18:02 2017 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Oct 24 19:18:02 2017 +0700
----------------------------------------------------------------------
.../visor/cache/VisorCacheConfiguration.java | 11 ++++++-----
modules/web-console/backend/app/mongo.js | 1 +
.../generator/ConfigurationGenerator.js | 5 ++++-
.../generator/defaults/Cluster.service.js | 2 +-
.../modules/states/configuration/caches/memory.pug | 16 +++++++++++-----
.../states/configuration/clusters/data-storage.pug | 2 +-
6 files changed, 24 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb81e6cd/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
index f2fd195..b012678 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
@@ -143,7 +143,7 @@ public class VisorCacheConfiguration extends VisorDataTransferObject {
private boolean loadPrevVal;
/** Name of {@link DataRegionConfiguration} for this cache */
- private String memPlcName;
+ private String dataRegName;
/** Maximum inline size for sql indexes. */
private int sqlIdxMaxInlineSize;
@@ -219,7 +219,7 @@ public class VisorCacheConfiguration extends VisorDataTransferObject {
evictFilter = compactClass(ccfg.getEvictionFilter());
lsnrConfigurations = compactIterable(ccfg.getCacheEntryListenerConfigurations());
loadPrevVal = ccfg.isLoadPreviousValue();
- memPlcName = ccfg.getDataRegionName();
+ dataRegName = ccfg.getDataRegionName();
sqlIdxMaxInlineSize = ccfg.getSqlIndexMaxInlineSize();
nodeFilter = compactClass(ccfg.getNodeFilter());
qryDetailMetricsSz = ccfg.getQueryDetailMetricsSize();
@@ -462,8 +462,9 @@ public class VisorCacheConfiguration extends VisorDataTransferObject {
/**
* @return {@link DataRegionConfiguration} name.
*/
+ @Deprecated
public String getMemoryPolicyName() {
- return memPlcName;
+ return dataRegName;
}
/**
@@ -551,7 +552,7 @@ public class VisorCacheConfiguration extends VisorDataTransferObject {
U.writeString(out, evictFilter);
U.writeString(out, lsnrConfigurations);
out.writeBoolean(loadPrevVal);
- U.writeString(out, memPlcName);
+ U.writeString(out, dataRegName);
out.writeInt(sqlIdxMaxInlineSize);
U.writeString(out, nodeFilter);
out.writeInt(qryDetailMetricsSz);
@@ -595,7 +596,7 @@ public class VisorCacheConfiguration extends VisorDataTransferObject {
evictFilter = U.readString(in);
lsnrConfigurations = U.readString(in);
loadPrevVal = in.readBoolean();
- memPlcName = U.readString(in);
+ dataRegName = U.readString(in);
sqlIdxMaxInlineSize = in.readInt();
nodeFilter = U.readString(in);
qryDetailMetricsSz = in.readInt();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb81e6cd/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 bfe1ae2..b4bc9fc 100644
--- a/modules/web-console/backend/app/mongo.js
+++ b/modules/web-console/backend/app/mongo.js
@@ -333,6 +333,7 @@ module.exports.factory = function(passportMongo, settings, pluginMongo, mongoose
},
evictionFilter: String,
memoryPolicyName: String,
+ dataRegionName: String,
sqlIndexMaxInlineSize: Number,
topologyValidator: String
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb81e6cd/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 cd635db..d9342e7 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
@@ -1957,9 +1957,12 @@ export default class IgniteConfigurationGenerator {
// Generate cache memory group.
static cacheMemory(cache, available, ccfg = this.cacheConfigurationBean(cache)) {
// Since ignite 2.0
- if (available('2.0.0'))
+ if (available(['2.0.0', '2.3.0']))
ccfg.stringProperty('memoryPolicyName');
+ if (available('2.3.0'))
+ ccfg.stringProperty('dataRegionName');
+
// Removed in ignite 2.0
if (available(['1.0.0', '2.0.0'])) {
ccfg.enumProperty('memoryMode');
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb81e6cd/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cluster.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cluster.service.js b/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cluster.service.js
index 0e786d9..bafb202 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cluster.service.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cluster.service.js
@@ -314,7 +314,7 @@ const DFLT_CLUSTER = {
dataStorageConfiguration: {
systemCacheInitialSize: 41943040,
systemCacheMaxSize: 104857600,
- pageSize: 2048,
+ pageSize: 4096,
storagePath: 'db',
dataRegionConfigurations: {
name: 'default',
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb81e6cd/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 17ceedf..e00f2a6 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
@@ -34,12 +34,18 @@ include /app/helpers/jade/mixins
.panel-body(ng-if=`ui.isPanelLoaded('${form}')`)
.col-sm-6
//- Since ignite 2.0
- div(ng-if='$ctrl.available("2.0.0")')
- .settings-row
+ .settings-row(ng-if='$ctrl.available("2.0.0")')
+checkbox('Onheap cache enabled', model + '.onheapCacheEnabled', '"OnheapCacheEnabled"', 'Checks if the on-heap cache is enabled for the off-heap based page memory')
- .settings-row
- +text('Memory policy name:', model + '.memoryPolicyName', '"MemoryPolicyName"', 'false', 'default',
- 'Name of memory policy configuration for this cache')
+
+ //- Since ignite 2.0 deprecated in ignite 2.3
+ .settings-row(ng-if='$ctrl.available(["2.0.0", "2.3.0"])')
+ +text('Memory policy name:', model + '.memoryPolicyName', '"MemoryPolicyName"', 'false', 'default',
+ 'Name of memory policy configuration for this cache')
+
+ //- Since ignite 2.3
+ .settings-row(ng-if='$ctrl.available("2.3.0")')
+ +text('Data region name:', model + '.dataRegionName', '"DataRegionName"', 'false', 'default',
+ 'Name of data region configuration for this cache')
//- Removed in ignite 2.0
div(ng-if='$ctrl.available(["1.0.0", "2.0.0"])')
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb81e6cd/modules/web-console/frontend/app/modules/states/configuration/clusters/data-storage.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/configuration/clusters/data-storage.pug b/modules/web-console/frontend/app/modules/states/configuration/clusters/data-storage.pug
index 9c2dca1..a635739 100644
--- a/modules/web-console/frontend/app/modules/states/configuration/clusters/data-storage.pug
+++ b/modules/web-console/frontend/app/modules/states/configuration/clusters/data-storage.pug
@@ -34,7 +34,7 @@ include /app/helpers/jade/mixins
.col-sm-6
.settings-row
+number-min-max('Page size:', model + '.pageSize', '"DataStorageConfigurationPageSize"',
- 'true', '2048', '1024', '16384', 'Every memory region is split on pages of fixed size')
+ 'true', '4096', '1024', '16384', 'Every memory region is split on pages of fixed size')
.settings-row
+number('Concurrency level:', model + '.concurrencyLevel', '"DataStorageConfigurationConcurrencyLevel"',
'true', 'availableProcessors', '2', 'The number of concurrent segments in Ignite internal page mapping tables')