Remove clockSync in web-console module.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/187bfeab Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/187bfeab Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/187bfeab Branch: refs/heads/ignite-4587 Commit: 187bfeabafa362fc0c03d1c25e595c8af510ebdb Parents: 57218fa Author: Max Kozlov <[email protected]> Authored: Tue Mar 14 16:07:26 2017 +0300 Committer: Max Kozlov <[email protected]> Committed: Tue Mar 14 16:07:26 2017 +0300 ---------------------------------------------------------------------- modules/web-console/backend/app/mongo.js | 2 -- .../configuration/generator/ConfigurationGenerator.js | 4 +--- .../configuration/generator/defaults/Cluster.service.js | 2 -- .../app/modules/states/configuration/clusters/time.jade | 8 -------- 4 files changed, 1 insertion(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/187bfeab/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 242df10..59a1a48 100644 --- a/modules/web-console/backend/app/mongo.js +++ b/modules/web-console/backend/app/mongo.js @@ -548,8 +548,6 @@ module.exports.factory = function(passportMongo, settings, pluginMongo, mongoose compactFooter: Boolean }, caches: [{type: ObjectId, ref: 'Cache'}], - clockSyncSamples: Number, - clockSyncFrequency: Number, deploymentMode: {type: String, enum: ['PRIVATE', 'ISOLATED', 'SHARED', 'CONTINUOUS']}, discoveryStartupDelay: Number, igfsThreadPoolSize: Number, http://git-wip-us.apache.org/repos/asf/ignite/blob/187bfeab/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 d099cb3..3ef63db 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js @@ -1285,9 +1285,7 @@ export default class IgniteConfigurationGenerator { // Generate time group. static clusterTime(cluster, cfg = this.igniteConfigurationBean(cluster)) { - cfg.intProperty('clockSyncSamples') - .intProperty('clockSyncFrequency') - .intProperty('timeServerPortBase') + cfg.intProperty('timeServerPortBase') .intProperty('timeServerPortRange'); return cfg; http://git-wip-us.apache.org/repos/asf/ignite/blob/187bfeab/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 6333ef9..e58c3c7 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 @@ -181,8 +181,6 @@ const DFLT_CLUSTER = { metricsHistorySize: 10000, metricsLogFrequency: 60000, metricsUpdateFrequency: 2000, - clockSyncSamples: 8, - clockSyncFrequency: 120000, timeServerPortBase: 31100, timeServerPortRange: 100, transactionConfiguration: { http://git-wip-us.apache.org/repos/asf/ignite/blob/187bfeab/modules/web-console/frontend/app/modules/states/configuration/clusters/time.jade ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/states/configuration/clusters/time.jade b/modules/web-console/frontend/app/modules/states/configuration/clusters/time.jade index bcb1cb7..5c48013 100644 --- a/modules/web-console/frontend/app/modules/states/configuration/clusters/time.jade +++ b/modules/web-console/frontend/app/modules/states/configuration/clusters/time.jade @@ -30,14 +30,6 @@ include /app/helpers/jade/mixins.jade .panel-body(ng-if='ui.isPanelLoaded("#{form}")') .col-sm-6 .settings-row - +number('Samples size:', model + '.clockSyncSamples', '"clockSyncSamples"', 'true', '8', '0', - 'Number of samples used to synchronize clocks between different nodes<br/>\ - Clock synchronization is used for cache version assignment in CLOCK order mode') - .settings-row - +number('Frequency:', model + '.clockSyncFrequency', '"clockSyncFrequency"', 'true', '120000', '0', - 'Frequency at which clock is synchronized between nodes, in milliseconds<br/>\ - Clock synchronization is used for cache version assignment in CLOCK order mode') - .settings-row +number-min-max('Port base:', model + '.timeServerPortBase', '"timeServerPortBase"', 'true', '31100', '0', '65535', 'Time server provides clock synchronization between nodes<br/>\ Base UPD port number for grid time server. Time server will be started on one of free ports in range')
