Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 9ed3c6a2e -> a94f85a37
IGNITE-843 Fixed defaults. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a94f85a3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a94f85a3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a94f85a3 Branch: refs/heads/ignite-843-rc2 Commit: a94f85a375da10eddfc25e5be993077588aadd16 Parents: 9ed3c6a Author: vsisko <[email protected]> Authored: Thu Feb 4 11:19:30 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Thu Feb 4 11:19:30 2016 +0700 ---------------------------------------------------------------------- .../configuration/clusters/communication.jade | 4 ++-- .../configuration/clusters/deployment.jade | 2 +- .../states/configuration/clusters/metrics.jade | 2 +- .../states/configuration/clusters/swap.jade | 2 +- .../main/js/controllers/clusters-controller.js | 6 ++++++ .../main/js/helpers/generator/generator-java.js | 20 ++++++++++---------- .../main/js/helpers/generator/generator-xml.js | 20 ++++++++++---------- 7 files changed, 31 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a94f85a3/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/communication.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/communication.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/communication.jade index 7d447ac..1d05703 100644 --- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/communication.jade +++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/communication.jade @@ -72,7 +72,7 @@ form.panel.panel-default(name='communication' novalidate) data-id='discoveryStartupDelay' data-name='discoveryStartupDelay' data-ng-model='backupItem.discoveryStartupDelay' - data-placeholder='600000' + data-placeholder='60000' ) .settings-row ignite-form-field @@ -309,7 +309,7 @@ form.panel.panel-default(name='communication' novalidate) data-id='selectorsCount' data-name='selectorsCount' data-ng-model='#{model}.selectorsCount' - data-placeholder='4' + data-placeholder='min(4, availableProcessors)' ) .settings-row ignite-form-field http://git-wip-us.apache.org/repos/asf/ignite/blob/a94f85a3/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade index 2949f16..8966325 100644 --- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade +++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade @@ -94,7 +94,7 @@ form.panel.panel-default(name='#{form}' novalidate) data-id='peerClassLoadingThreadPoolSize' data-name='peerClassLoadingThreadPoolSize' data-ng-model='#{model}.peerClassLoadingThreadPoolSize' - data-placeholder='availableProcessors' + data-placeholder=2 data-ng-disabled='!#{enabled}' ) .settings-row http://git-wip-us.apache.org/repos/asf/ignite/blob/a94f85a3/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/metrics.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/metrics.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/metrics.jade index 2148e28..49188f4 100644 --- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/metrics.jade +++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/metrics.jade @@ -72,7 +72,7 @@ form.panel.panel-default(name='metrics' novalidate) data-id='metricsUpdateFrequency' data-name='metricsUpdateFrequency' data-ng-model='#{model}.metricsUpdateFrequency' - data-placeholder='60000' + data-placeholder='2000' ) .col-sm-6 .preview-panel(ng-init='mode = false') http://git-wip-us.apache.org/repos/asf/ignite/blob/a94f85a3/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/swap.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/swap.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/swap.jade index 83cb652..99f7a0b 100644 --- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/swap.jade +++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/swap.jade @@ -73,7 +73,7 @@ form.panel.panel-default(name='swapSpaceSpi' novalidate) data-id='readStripesNumber' data-name='readStripesNumber' data-ng-model='#{model}.FileSwapSpaceSpi.readStripesNumber' - data-placeholder='available CPU cores' + data-placeholder='availableProcessors' ) .details-row ignite-form-field http://git-wip-us.apache.org/repos/asf/ignite/blob/a94f85a3/modules/control-center-web/src/main/js/controllers/clusters-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js index 147ae51..a072930 100644 --- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js +++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js @@ -320,6 +320,12 @@ consoleModule.controller('clustersController', function ($http, $timeout, $scope binaryConfiguration: { typeConfigurations: [], compactFooter: true + }, + communication: { + tcpNoDelay: true + }, + connector: { + noDelay: true } }; http://git-wip-us.apache.org/repos/asf/ignite/blob/a94f85a3/modules/control-center-web/src/main/js/helpers/generator/generator-java.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js index 445a5a0..9f4123e 100644 --- a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js +++ b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js @@ -555,16 +555,16 @@ $generatorJava.clusterAtomics = function (cluster, res) { $generatorJava.declareVariable(res, 'atomicCfg', 'org.apache.ignite.configuration.AtomicConfiguration'); - $generatorJava.enumProperty(res, 'atomicCfg', atomics, 'cacheMode', 'org.apache.ignite.cache.CacheMode'); + $generatorJava.enumProperty(res, 'atomicCfg', atomics, 'cacheMode', 'org.apache.ignite.cache.CacheMode', null, 'PARTITIONED'); var cacheMode = atomics.cacheMode ? atomics.cacheMode : 'PARTITIONED'; var hasData = cacheMode !== 'PARTITIONED'; - hasData = $generatorJava.property(res, 'atomicCfg', atomics, 'atomicSequenceReserveSize') || hasData; + hasData = $generatorJava.property(res, 'atomicCfg', atomics, 'atomicSequenceReserveSize', null, null, 1000) || hasData; if (cacheMode === 'PARTITIONED') - hasData = $generatorJava.property(res, 'atomicCfg', atomics, 'backups') || hasData; + hasData = $generatorJava.property(res, 'atomicCfg', atomics, 'backups', null, null, 0) || hasData; res.needEmptyLine = true; @@ -751,8 +751,8 @@ $generatorJava.clusterDeployment = function (cluster, res) { $generatorJava.property(res, 'cfg', cluster, 'peerClassLoadingEnabled', null, null, false); if (p2pEnabled) { - $generatorJava.property(res, 'cfg', cluster, 'peerClassLoadingMissedResourcesCacheSize'); - $generatorJava.property(res, 'cfg', cluster, 'peerClassLoadingThreadPoolSize'); + $generatorJava.property(res, 'cfg', cluster, 'peerClassLoadingMissedResourcesCacheSize', null, null, 100); + $generatorJava.property(res, 'cfg', cluster, 'peerClassLoadingThreadPoolSize', null, null, 2); $generatorJava.multiparamProperty(res, 'cfg', cluster, 'peerClassLoadingLocalClassPathExclude'); } @@ -785,7 +785,7 @@ $generatorJava.clusterDiscovery = function (disco, res) { $generatorJava.property(res, 'discovery', disco, 'heartbeatFrequency', null, null, 2000); $generatorJava.property(res, 'discovery', disco, 'maxMissedHeartbeats', null, null, 1); $generatorJava.property(res, 'discovery', disco, 'maxMissedClientHeartbeats', null, null, 5); - $generatorJava.property(res, 'discovery', disco, 'topHistorySize', null, null, 100); + $generatorJava.property(res, 'discovery', disco, 'topHistorySize', null, null, 1000); if ($commonUtils.isDefinedAndNotEmpty(disco.listener)) { $generatorJava.beanProperty(res, 'discovery', disco, 'listener', 'listener', disco.listener, {}, true); @@ -896,7 +896,7 @@ $generatorJava.clusterMarshaller = function (cluster, res) { } $generatorJava.property(res, 'cfg', cluster, 'marshalLocalJobs', null, null, false); - $generatorJava.property(res, 'cfg', cluster, 'marshallerCacheKeepAliveTime'); + $generatorJava.property(res, 'cfg', cluster, 'marshallerCacheKeepAliveTime', null, null, 10000); $generatorJava.property(res, 'cfg', cluster, 'marshallerCacheThreadPoolSize', null, 'setMarshallerCachePoolSize'); res.needEmptyLine = true; @@ -910,9 +910,9 @@ $generatorJava.clusterMetrics = function (cluster, res) { res = $generatorCommon.builder(); $generatorJava.property(res, 'cfg', cluster, 'metricsExpireTime'); - $generatorJava.property(res, 'cfg', cluster, 'metricsHistorySize'); - $generatorJava.property(res, 'cfg', cluster, 'metricsLogFrequency'); - $generatorJava.property(res, 'cfg', cluster, 'metricsUpdateFrequency'); + $generatorJava.property(res, 'cfg', cluster, 'metricsHistorySize', null, null, 10000); + $generatorJava.property(res, 'cfg', cluster, 'metricsLogFrequency', null, null, 60000); + $generatorJava.property(res, 'cfg', cluster, 'metricsUpdateFrequency', null, null, 2000); res.needEmptyLine = true; http://git-wip-us.apache.org/repos/asf/ignite/blob/a94f85a3/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js index 8039e59..def6954 100644 --- a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js +++ b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js @@ -387,12 +387,12 @@ $generatorXml.clusterAtomics = function (cluster, res) { var hasData = cacheMode !== 'PARTITIONED'; - $generatorXml.property(res, atomics, 'cacheMode'); + $generatorXml.property(res, atomics, 'cacheMode', null, 'PARTITIONED'); - hasData = $generatorXml.property(res, atomics, 'atomicSequenceReserveSize') || hasData; + hasData = $generatorXml.property(res, atomics, 'atomicSequenceReserveSize', null, 1000) || hasData; if (cacheMode === 'PARTITIONED') - hasData = $generatorXml.property(res, atomics, 'backups') || hasData; + hasData = $generatorXml.property(res, atomics, 'backups', null, 0) || hasData; res.endBlock('</bean>'); res.endBlock('</property>'); @@ -510,8 +510,8 @@ $generatorXml.clusterDeployment = function (cluster, res) { $generatorXml.property(res, cluster, 'peerClassLoadingEnabled', null, false); if (p2pEnabled) { - $generatorXml.property(res, cluster, 'peerClassLoadingMissedResourcesCacheSize'); - $generatorXml.property(res, cluster, 'peerClassLoadingThreadPoolSize'); + $generatorXml.property(res, cluster, 'peerClassLoadingMissedResourcesCacheSize', null, 100); + $generatorXml.property(res, cluster, 'peerClassLoadingThreadPoolSize', null, 2); $generatorXml.listProperty(res, cluster, 'peerClassLoadingLocalClassPathExclude'); } @@ -540,7 +540,7 @@ $generatorXml.clusterDiscovery = function (disco, res) { $generatorXml.property(res, disco, 'heartbeatFrequency', null, 2000); $generatorXml.property(res, disco, 'maxMissedHeartbeats', null, 1); $generatorXml.property(res, disco, 'maxMissedClientHeartbeats', null, 5); - $generatorXml.property(res, disco, 'topHistorySize', null, 100); + $generatorXml.property(res, disco, 'topHistorySize', null, 1000); if ($commonUtils.isDefinedAndNotEmpty(disco.listener)) $generatorXml.beanProperty(res, disco, 'listener', {className: disco.listener}, true); if ($commonUtils.isDefinedAndNotEmpty(disco.dataExchange)) @@ -616,7 +616,7 @@ $generatorXml.clusterMarshaller = function (cluster, res) { } $generatorXml.property(res, cluster, 'marshalLocalJobs', null, false); - $generatorXml.property(res, cluster, 'marshallerCacheKeepAliveTime'); + $generatorXml.property(res, cluster, 'marshallerCacheKeepAliveTime', null, 10000); $generatorXml.property(res, cluster, 'marshallerCacheThreadPoolSize', 'marshallerCachePoolSize'); res.needEmptyLine = true; @@ -630,9 +630,9 @@ $generatorXml.clusterMetrics = function (cluster, res) { res = $generatorCommon.builder(); $generatorXml.property(res, cluster, 'metricsExpireTime'); - $generatorXml.property(res, cluster, 'metricsHistorySize'); - $generatorXml.property(res, cluster, 'metricsLogFrequency'); - $generatorXml.property(res, cluster, 'metricsUpdateFrequency'); + $generatorXml.property(res, cluster, 'metricsHistorySize', null, 10000); + $generatorXml.property(res, cluster, 'metricsLogFrequency', null, 60000); + $generatorXml.property(res, cluster, 'metricsUpdateFrequency', null, 2000); res.needEmptyLine = true;
