ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [3/3] ignite git commit: IGNITE-843 Missing validations.
Date Fri, 05 Feb 2016 08:16:37 GMT
IGNITE-843 Missing validations.


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

Branch: refs/heads/ignite-843-rc2
Commit: 200399c4e25d33da8bb8b34a4a414c54dbc7e4e9
Parents: 7be639e
Author: vsisko <vsisko@gridgain.com>
Authored: Fri Feb 5 15:16:40 2016 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Fri Feb 5 15:16:40 2016 +0700

----------------------------------------------------------------------
 .../app/modules/states/configuration/clusters/communication.jade | 4 +++-
 .../js/app/modules/states/configuration/clusters/deployment.jade | 2 +-
 .../main/js/app/modules/states/configuration/clusters/swap.jade  | 4 ++--
 .../src/main/js/controllers/clusters-controller.js               | 3 +++
 .../src/main/js/helpers/generator/generator-common.js            | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/200399c4/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 8031cfb..b99eee0 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
@@ -128,12 +128,14 @@ form.panel.panel-default(name='communication' novalidate)
                         ignite-form-field-label
                             | Shared memory port:
                         ignite-form-field-tooltip
-                            | Local port to accept shared memory connections
+                            | Local port to accept shared memory connections#[br]
+                            | If set to #[b -1] shared memory communication will be disabled
                         ignite-form-field-input-number(
                             data-id='sharedMemoryPort'
                             data-name='sharedMemoryPort'
                             data-ng-model='#{model}.sharedMemoryPort'
                             data-placeholder='48100'
+                            data-min='-1'
                             data-max='65535'
                         )
                 .settings-row

http://git-wip-us.apache.org/repos/asf/ignite/blob/200399c4/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 23888a3..e54206e 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=2
+                            data-placeholder='2'
                             data-ng-disabled='!#{enabled}'
                         )
                 .settings-row

http://git-wip-us.apache.org/repos/asf/ignite/blob/200399c4/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 f58dc84..83698ce 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
@@ -87,8 +87,8 @@ form.panel.panel-default(name='swapSpaceSpi' novalidate)
                                     data-name='maximumSparsity'
                                     data-ng-model='#{model}.FileSwapSpaceSpi.maximumSparsity'
                                     data-placeholder='0.5'
-                                    data-max=0.999
-                                    data-min=0
+                                    data-max='0.999'
+                                    data-min='0'
                                 )
                         .details-row
                             ignite-form-field

http://git-wip-us.apache.org/repos/asf/ignite/blob/200399c4/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 8c27dce..7524378 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
@@ -311,6 +311,9 @@ consoleModule.controller('clustersController', function ($http, $timeout,
$scope
                         if (c.unacknowledgedMessagesBufferSize < 5 * c.ackSendThreshold)
                             return showPopoverMessage($scope.ui, 'communication', 'unacknowledgedMessagesBufferSize',
'Maximum number of stored unacknowledged messages should be at least 5 * ack send threshold');
                 }
+
+                if (c.sharedMemoryPort === 0)
+                    return showPopoverMessage($scope.ui, 'communication', 'sharedMemoryPort',
'Shared memory port should be more than 0 or -1');
             }
 
             var r = item.connector;

http://git-wip-us.apache.org/repos/asf/ignite/blob/200399c4/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
index 2af69c9..e3b16e2 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
@@ -433,7 +433,7 @@ $generatorCommon.CONNECTOR_CONFIGURATION = {
         sendBufferSize: {dflt: 32768},
         sendQueueLimit: {dflt: 0},
         directBuffer: {dflt: false},
-        noDelay: {dflt: false},
+        noDelay: {dflt: true},
         selectorCount: null,
         threadPoolSize: null,
         messageInterceptor: {type: 'bean'},


Mime
View raw message