ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-843 Discovery min values.
Date Mon, 08 Feb 2016 02:46:38 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 9d9810105 -> 95b68f768


IGNITE-843 Discovery min values.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/95b68f76
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/95b68f76
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/95b68f76

Branch: refs/heads/ignite-843-rc2
Commit: 95b68f768bccf1a4509d222a123b09f45cdc24b5
Parents: 9d98101
Author: vsisko <vsisko@gridgain.com>
Authored: Mon Feb 8 09:46:48 2016 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Mon Feb 8 09:46:48 2016 +0700

----------------------------------------------------------------------
 .../app/modules/states/configuration/clusters/discovery.jade  | 7 +++++++
 .../src/main/js/controllers/clusters-controller.js            | 3 +++
 2 files changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/95b68f76/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/discovery.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/discovery.jade
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/discovery.jade
index 247169d..80ad274 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/discovery.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/discovery.jade
@@ -149,6 +149,7 @@ form.panel.panel-default(name='discovery' novalidate)
                             data-name='threadPriority'
                             data-ng-model='#{model}.threadPriority'
                             data-placeholder='10'
+                            data-min='1'
                         )
                 .settings-row
                     ignite-form-field
@@ -161,6 +162,7 @@ form.panel.panel-default(name='discovery' novalidate)
                             data-name='heartbeatFrequency'
                             data-ng-model='#{model}.heartbeatFrequency'
                             data-placeholder='2000'
+                            data-min='1'
                         )
                 .settings-row
                     ignite-form-field
@@ -173,6 +175,7 @@ form.panel.panel-default(name='discovery' novalidate)
                             data-name='maxMissedHeartbeats'
                             data-ng-model='#{model}.maxMissedHeartbeats'
                             data-placeholder='1'
+                            data-min='1'
                         )
                 .settings-row
                     ignite-form-field
@@ -185,6 +188,7 @@ form.panel.panel-default(name='discovery' novalidate)
                             data-name='maxMissedClientHeartbeats'
                             data-ng-model='#{model}.maxMissedClientHeartbeats'
                             data-placeholder='5'
+                            data-min='1'
                         )
                 .settings-row
                     ignite-form-field
@@ -242,6 +246,7 @@ form.panel.panel-default(name='discovery' novalidate)
                             data-name='discoReconnectCount'
                             data-ng-model='#{model}.reconnectCount'
                             data-placeholder='10'
+                            data-min='1'
                         )
                 .settings-row
                     ignite-form-field
@@ -254,6 +259,7 @@ form.panel.panel-default(name='discovery' novalidate)
                             data-name='statisticsPrintFrequency'
                             data-ng-model='#{model}.statisticsPrintFrequency'
                             data-placeholder='0'
+                            data-min='1'
                         )
                 .settings-row
                     ignite-form-field
@@ -266,6 +272,7 @@ form.panel.panel-default(name='discovery' novalidate)
                             data-name='ipFinderCleanFrequency'
                             data-ng-model='#{model}.ipFinderCleanFrequency'
                             data-placeholder='60000'
+                            data-min='1'
                         )
                 .settings-row
                     ignite-form-field

http://git-wip-us.apache.org/repos/asf/ignite/blob/95b68f76/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 7524378..573cfa5 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
@@ -326,6 +326,9 @@ consoleModule.controller('clustersController', function ($http, $timeout,
$scope
             var d = item.discovery;
 
             if (d) {
+                if ((d.maxAckTimeout != undefined ? d.maxAckTimeout : 600000) < (d.ackTimeout
|| 5000))
+                    return showPopoverMessage($scope.ui, 'discovery', 'ackTimeout', 'Acknowledgement
timeout should be less than max acknowledgement timeout');
+
                 if (d.kind === 'Vm' && d.Vm && d.Vm.addresses.length ===
0)
                     return showPopoverMessage($scope.ui, 'general', 'addresses', 'Addresses
are not specified');
 


Mime
View raw message