You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/06/22 11:06:39 UTC
[1/2] incubator-ignite git commit: # IGNITE-843 Added section for
swap.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 359ee91ee -> 343a1dcd0
# IGNITE-843 Added section for swap.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b4eb5d5d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b4eb5d5d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b4eb5d5d
Branch: refs/heads/ignite-843
Commit: b4eb5d5d3e8c479eda813e9fac7e47b0fa091bc7
Parents: 7e5141e
Author: AKuznetsov <ak...@gridgain.com>
Authored: Mon Jun 22 16:06:22 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Mon Jun 22 16:06:22 2015 +0700
----------------------------------------------------------------------
modules/webconfig/nodejs/db.js | 30 ++++++---
.../nodejs/public/form-models/clusters.json | 70 ++++++++++++++++++++
.../public/javascripts/controllers/clusters.js | 4 ++
3 files changed, 93 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4eb5d5d/modules/webconfig/nodejs/db.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/db.js b/modules/webconfig/nodejs/db.js
index f8cc2bb..63f1a1e 100644
--- a/modules/webconfig/nodejs/db.js
+++ b/modules/webconfig/nodejs/db.js
@@ -172,11 +172,13 @@ var ClusterSchema = new Schema({
clockSyncFrequency: Number,
deploymentMode: {type: String, enum: ['PRIVATE', 'ISOLATED', 'SHARED', 'CONTINUOUS']},
discoveryStartupDelay: Number,
+ igfsThreadPoolSize: Number,
includeEventTypes: [{
type: String, enum: ['EVTS_CHECKPOINT', 'EVTS_DEPLOYMENT', 'EVTS_ERROR', 'EVTS_DISCOVERY',
'EVTS_JOB_EXECUTION', 'EVTS_TASK_EXECUTION', 'EVTS_CACHE', 'EVTS_CACHE_REBALANCE', 'EVTS_CACHE_LIFECYCLE',
'EVTS_CACHE_QUERY', 'EVTS_SWAPSPACE', 'EVTS_IGFS']
}],
+ managementThreadPoolSize: Number,
marshalLocalJobs: Boolean,
marshCacheKeepAliveTime: Number,
marshCachePoolSize: Number,
@@ -184,22 +186,30 @@ var ClusterSchema = new Schema({
metricsHistorySize: Number,
metricsLogFrequency: Number,
metricsUpdateFrequency: Number,
- localHost: String,
networkTimeout: Number,
networkSendRetryDelay: Number,
networkSendRetryCount: Number,
- segmentCheckFrequency: Number,
- waitForSegmentOnStart: Boolean,
peerClassLoadingEnabled: Boolean,
peerClassLoadingLocalClassPathExclude: [String],
peerClassLoadingMissedResourcesCacheSize: Number,
peerClassLoadingThreadPoolSize: Number,
- timeServerPortBase: Number,
- timeServerPortRange: Number,
publicThreadPoolSize: Number,
+ segmentCheckFrequency: Number,
+ segmentationPolicy: {type: String, enum: ['RESTART_JVM', 'STOP', 'NOOP']},
+ allSegmentationResolversPassRequired: Boolean,
+ segmentationResolveAttempts: Number,
+ swapSpaceSpi: {kind: {type: String, enum: ['FileSwapSpaceSpi']},
+ FileSwapSpaceSpi: {
+ baseDirectory: String,
+ readStripesNumber: Number,
+ maximumSparsity: Number,
+ maxWriteQueueSize: Number,
+ writeBufferSize: Number
+ }
+ },
systemThreadPoolSize: Number,
- managementThreadPoolSize: Number,
- igfsThreadPoolSize: Number,
+ timeServerPortBase: Number,
+ timeServerPortRange: Number,
transactionConfiguration: {
defaultTxConcurrency: {type: String, enum: ['OPTIMISTIC', 'PESSIMISTIC']},
transactionIsolation: {type: String, enum: ['READ_COMMITTED', 'REPEATABLE_READ', 'SERIALIZABLE']},
@@ -208,11 +218,9 @@ var ClusterSchema = new Schema({
pessimisticTxLogSize: Number,
txSerializableEnabled: Boolean
},
- segmentationPolicy: {type: String, enum: ['RESTART_JVM', 'STOP', 'NOOP']},
- allSegmentationResolversPassRequired: Boolean,
- segmentationResolveAttempts: Number,
utilityCacheKeepAliveTime: Number,
- utilityCachePoolSize: Number
+ utilityCachePoolSize: Number,
+ waitForSegmentOnStart: Boolean
});
// Define cluster model.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4eb5d5d/modules/webconfig/nodejs/public/form-models/clusters.json
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/form-models/clusters.json b/modules/webconfig/nodejs/public/form-models/clusters.json
index b8c7bf1..b11b9f8 100644
--- a/modules/webconfig/nodejs/public/form-models/clusters.json
+++ b/modules/webconfig/nodejs/public/form-models/clusters.json
@@ -543,6 +543,76 @@
]
},
{
+ "label": "Swap",
+ "fields": [
+ {
+ "label": "Swap space SPI",
+ "type": "dropdown-details",
+ "group": "swapSpaceSpi",
+ "model": "kind",
+ "items": "swapSpaceSpis",
+ "placeholder": "Choose swap SPI",
+ "tip": [
+ "Provides a mechanism in grid for storing data on disk.",
+ "Ignite cache uses swap space to overflow data to disk if it cannot fit in memory."
+ ],
+ "details": {
+ "FileSwapSpaceSpi": {
+ "fields": [
+ {
+ "label": "Base directory",
+ "type": "text",
+ "model": "baseDirectory",
+ "placeholder": "swapspace",
+ "tip": [
+ "Base directory where to write files."
+ ]
+ },
+ {
+ "label": "Read stripe size",
+ "type": "text",
+ "model": "readStripesNumber",
+ "placeholder": "available CPU cores",
+ "tip": [
+ "Read stripe size defines number of file channels to be used concurrently."
+ ]
+ },
+ {
+ "label": "Maximum sparsity",
+ "type": "text",
+ "model": "maximumSparsity",
+ "placeholder": "0.5",
+ "tip": [
+ "This property defines maximum acceptable wasted file space to whole file size ratio.",
+ "When this ratio becomes higher than specified number compacting thread starts working."
+ ]
+ },
+ {
+ "label": "Max write queue size",
+ "type": "text",
+ "model": "maxWriteQueueSize",
+ "placeholder": "1024 * 1024",
+ "tip": [
+ "Max write queue size in bytes.",
+ "If there are more values are waiting for being written to disk then specified size, SPI will block on store operation."
+ ]
+ },
+ {
+ "label": "Write buffer size",
+ "type": "text",
+ "model": "writeBufferSize",
+ "placeholder": "Available CPU cores",
+ "tip": [
+ "Write buffer size in bytes.", "Write to disk occurs only when this buffer is full."
+ ]
+ }
+ ]
+ }
+ }
+ }
+ ]
+ },
+ {
"label": "Time configuration",
"fields": [
{
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4eb5d5d/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js b/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js
index 3218984..15df43a 100644
--- a/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js
+++ b/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js
@@ -37,6 +37,10 @@ configuratorModule.controller('clustersController', ['$scope', '$alert', '$http'
{value: 'SharedFs', label: 'shared filesystem'}
];
+ $scope.swapSpaceSpis = [
+ {value: 'FileSwapSpaceSpi', label: 'File-based swap'}
+ ];
+
$scope.events = [
{value: 'EVTS_CHECKPOINT', label: 'EVTS_CHECKPOINT'},
{value: 'EVTS_DEPLOYMENT', label: 'EVTS_DEPLOYMENT'},
[2/2] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/343a1dcd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/343a1dcd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/343a1dcd
Branch: refs/heads/ignite-843
Commit: 343a1dcd052ae9eeaab05de8099afc82017aadab
Parents: b4eb5d5 359ee91
Author: AKuznetsov <ak...@gridgain.com>
Authored: Mon Jun 22 16:06:37 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Mon Jun 22 16:06:37 2015 +0700
----------------------------------------------------------------------
.../public/javascripts/controllers/summary.js | 33 ++++++++++++++++++++
modules/webconfig/nodejs/views/summary.jade | 26 ++++++++++++---
2 files changed, 55 insertions(+), 4 deletions(-)
----------------------------------------------------------------------