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 2018/11/20 20:43:32 UTC
[3/8] ignite git commit: IGNITE-10351 Web Console: Added new fields
sysWorkerBlockedTimeout and checkpointReadLockTimeout to "Configuration"
screen.
IGNITE-10351 Web Console: Added new fields sysWorkerBlockedTimeout and checkpointReadLockTimeout to "Configuration" screen.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/296737a1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/296737a1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/296737a1
Branch: refs/heads/ignite-10044
Commit: 296737a1b63c42a4fa1f398a881872c9f3b21b05
Parents: 8bd59cc
Author: Vasiliy Sisko <vs...@gridgain.com>
Authored: Wed Nov 21 00:17:58 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Nov 21 00:17:58 2018 +0700
----------------------------------------------------------------------
modules/web-console/backend/app/schemas.js | 4 +++-
.../cluster-edit-form/templates/data-storage.pug | 9 +++++++++
.../cluster-edit-form/templates/failover.pug | 9 +++++++++
.../configuration/generator/ConfigurationGenerator.js | 13 +++++++++++--
4 files changed, 32 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/296737a1/modules/web-console/backend/app/schemas.js
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/app/schemas.js b/modules/web-console/backend/app/schemas.js
index cf174f7..69d4a4c 100644
--- a/modules/web-console/backend/app/schemas.js
+++ b/modules/web-console/backend/app/schemas.js
@@ -985,6 +985,7 @@ module.exports.factory = function(mongoose) {
consistentId: String,
failureDetectionTimeout: Number,
clientFailureDetectionTimeout: Number,
+ systemWorkerBlockedTimeout: Number,
workDirectory: String,
lateAffinityAssignment: Boolean,
utilityCacheKeepAliveTime: Number,
@@ -1054,7 +1055,8 @@ module.exports.factory = function(mongoose) {
fileIOFactory: {type: String, enum: ['RANDOM', 'ASYNC']},
walAutoArchiveAfterInactivity: Number,
writeThrottlingEnabled: Boolean,
- walCompactionEnabled: Boolean
+ walCompactionEnabled: Boolean,
+ checkpointReadLockTimeout: Number
},
memoryConfiguration: {
systemCacheInitialSize: Number,
http://git-wip-us.apache.org/repos/asf/ignite/blob/296737a1/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/data-storage.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/data-storage.pug b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/data-storage.pug
index e18b0cb..8f9a33e 100644
--- a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/data-storage.pug
+++ b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/data-storage.pug
@@ -256,6 +256,15 @@ panel-collapsible(ng-show='$ctrl.available("2.3.0")' ng-form=form on-open=`ui.lo
min: '1',
tip: 'Frequency which is a minimal interval when the dirty pages will be written to the Persistent Store'
})
+ .pc-form-grid-col-60(ng-if='$ctrl.available("2.7.0")')
+ +form-field__number({
+ label: 'Checkpoint read lock timeout:',
+ model: `${model}.checkpointReadLockTimeout`,
+ name: '"DataStorageCheckpointReadLockTimeout"',
+ placeholder: 'System workers blocked timeout',
+ min: '1',
+ tip: 'Timeout for checkpoint read lock acquisition'
+ })
.pc-form-grid-col-20
+form-field__number({
label: 'Checkpoint threads:',
http://git-wip-us.apache.org/repos/asf/ignite/blob/296737a1/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/failover.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/failover.pug b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/failover.pug
index 3fafe9f..27797ed 100644
--- a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/failover.pug
+++ b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/failover.pug
@@ -47,6 +47,15 @@ panel-collapsible(ng-form=form on-open=`ui.loadPanel('${form}')`)
min: '1',
tip: 'Failure detection timeout is used to determine how long the communication or discovery SPIs should wait before considering a remote connection failed'
})
+ .pc-form-grid-col-60(ng-if='$ctrl.available("2.7.0")')
+ +form-field__number({
+ label: 'System workers blocked timeout:',
+ model: model + '.systemWorkerBlockedTimeout',
+ name: '"SystemWorkerBlockedTimeout"',
+ placeholder: 'Failure detection timeout',
+ min: '1',
+ tip: 'Maximum inactivity period for system worker'
+ })
.pc-form-grid-col-60
mixin clusters-failover-spi
http://git-wip-us.apache.org/repos/asf/ignite/blob/296737a1/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 d80967e..6fba32a 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
@@ -1131,6 +1131,9 @@ export default class IgniteConfigurationGenerator {
if (available('2.0.0')) {
cfg.longProperty('failureDetectionTimeout')
.longProperty('clientFailureDetectionTimeout');
+
+ if (available('2.7.0'))
+ cfg.longProperty('systemWorkerBlockedTimeout');
}
_.forEach(cluster.failoverSpi, (spi) => {
@@ -1465,8 +1468,14 @@ export default class IgniteConfigurationGenerator {
storageBean.varArgProperty('dataRegionConfigurations', 'dataRegionConfigurations', dataRegionCfgs, 'org.apache.ignite.configuration.DataRegionConfiguration');
storageBean.stringProperty('storagePath')
- .longProperty('checkpointFrequency')
- .intProperty('checkpointThreads')
+ .longProperty('checkpointFrequency');
+
+ if (available('2.7.0')) {
+ storageBean
+ .longProperty('checkpointReadLockTimeout');
+ }
+
+ storageBean.intProperty('checkpointThreads')
.enumProperty('checkpointWriteOrder')
.enumProperty('walMode')
.stringProperty('walPath')