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 Minor fixes.
Date Wed, 30 Dec 2015 10:41:42 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 b9e70d82d -> 4377f027d


IGNITE-843 Minor fixes.


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

Branch: refs/heads/ignite-843-rc2
Commit: 4377f027d6cd14d4736464d643c06449dd8f28eb
Parents: b9e70d8
Author: vsisko <vsisko@gridgain.com>
Authored: Wed Dec 30 17:41:28 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Wed Dec 30 17:41:28 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/clusters-controller.js          | 9 +++++++++
 .../src/main/js/controllers/models/clusters.json            | 5 ++++-
 .../src/main/js/helpers/generator/generator-java.js         | 2 +-
 .../src/main/js/helpers/generator/generator-xml.js          | 2 +-
 .../src/main/js/views/includes/controls.jade                | 4 ++--
 5 files changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/4377f027/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 492cbbc..0496772 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
@@ -621,6 +621,15 @@ consoleModule.controller('clustersController', function ($http, $timeout,
$scope
                     return showPopoverMessage($scope.panels, 'general', 'serviceAccountId',
'Account ID should not be empty');
             }
 
+            var swapKind = item.swapSpaceSpi.kind;
+
+            if ($common.isDefined(swapKind)) {
+                var sparsity = item.swapSpaceSpi[swapKind].maximumSparsity;
+
+                if (sparsity < 0 || sparsity >= 1)
+                    return showPopoverMessage($scope.panels, 'swap', 'maximumSparsity', 'Maximum
sparsity should be more or equal 0 and less than 1');
+            }
+
             if (item.sslEnabled) {
                 if (!$common.isDefined(item.sslContextFactory) || $common.isEmptyString(item.sslContextFactory.keyStoreFilePath))
                     return showPopoverMessage($scope.panels, 'sslConfiguration', 'keyStoreFilePath',
'Key store file should not be empty');

http://git-wip-us.apache.org/repos/asf/ignite/blob/4377f027/modules/control-center-web/src/main/js/controllers/models/clusters.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/clusters.json b/modules/control-center-web/src/main/js/controllers/models/clusters.json
index 8f8c560..bcb69a0 100644
--- a/modules/control-center-web/src/main/js/controllers/models/clusters.json
+++ b/modules/control-center-web/src/main/js/controllers/models/clusters.json
@@ -538,7 +538,7 @@
           "id": "discoveryStartupDelay",
           "type": "number",
           "model": "discoveryStartupDelay",
-          "placeholder": 600000,
+          "placeholder": 60000,
           "tip": [
             "This value is used to expire messages from waiting list whenever node discovery
discrepancies happen"
           ]
@@ -1688,9 +1688,12 @@
                 },
                 {
                   "label": "Maximum sparsity",
+                  "id": "maximumSparsity",
                   "type": "number",
                   "path": "swapSpaceSpi.FileSwapSpaceSpi",
                   "model": "maximumSparsity",
+                  "max": 1,
+                  "step": 0.05,
                   "placeholder": 0.5,
                   "tip": [
                     "This property defines maximum acceptable wasted file space to whole
file size ratio",

http://git-wip-us.apache.org/repos/asf/ignite/blob/4377f027/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 7d741cc..423d043 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
@@ -669,7 +669,7 @@ $generatorJava.clusterCommunication = function (cluster, res) {
     $generatorJava.property(res, 'cfg', cluster, 'networkSendRetryCount', null, null, 3);
     $generatorJava.property(res, 'cfg', cluster, 'segmentCheckFrequency');
     $generatorJava.property(res, 'cfg', cluster, 'waitForSegmentOnStart', null, null, false);
-    $generatorJava.property(res, 'cfg', cluster, 'discoveryStartupDelay', null, null, 600000);
+    $generatorJava.property(res, 'cfg', cluster, 'discoveryStartupDelay', null, null, 60000);
 
     res.needEmptyLine = true;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/4377f027/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 c7a9cb4..2db7ff9 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
@@ -450,7 +450,7 @@ $generatorXml.clusterCommunication = function (cluster, res) {
     $generatorXml.property(res, cluster, 'networkSendRetryCount', undefined, 3);
     $generatorXml.property(res, cluster, 'segmentCheckFrequency');
     $generatorXml.property(res, cluster, 'waitForSegmentOnStart', null, false);
-    $generatorXml.property(res, cluster, 'discoveryStartupDelay', undefined, 600000);
+    $generatorXml.property(res, cluster, 'discoveryStartupDelay', undefined, 60000);
 
     res.needEmptyLine = true;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/4377f027/modules/control-center-web/src/main/js/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade
index e7e94f7..8181add 100644
--- a/modules/control-center-web/src/main/js/views/includes/controls.jade
+++ b/modules/control-center-web/src/main/js/views/includes/controls.jade
@@ -170,7 +170,7 @@ mixin details-row(lblClasses, fieldClasses)
             .div(class=fieldClasses)
                 +tipField('detail.tip')
                 .input-tip
-                    input.form-control(id='{{::detail.id}}' name='{{detail.model}}' type='number'
placeholder='{{::detail.placeholder}}' min='{{detail.min ? detail.min : 0}}' max='{{detail.max
? detail.max : Number.MAX_VALUE}}')&attributes(detailCommon)
+                    input.form-control(id='{{::detail.id}}' name='{{detail.model}}' type='number'
placeholder='{{::detail.placeholder}}' min='{{detail.min ? detail.min : 0}}' max='{{detail.max
? detail.max : Number.MAX_VALUE}}' step='{{detail.step ? detail.step : 1}}')&attributes(detailCommon)
                     +ico-exclamation('{{detail.model}}', 'min', 'Value is less than allowable
minimum.')
                     +ico-exclamation('{{detail.model}}', 'max', 'Value is more than allowable
maximum.')
                     +ico-exclamation('{{detail.model}}', 'number', 'Invalid value. Only numbers
allowed.')
@@ -364,7 +364,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
             div(class=fieldClasses)
                 +tipField('field.tip')
                 .input-tip
-                    input.form-control(id='{{::field.id}}' name='{{field.model}}' type='number'
placeholder='{{::field.placeholder}}' min='{{field.min ? field.min : 0}}' max='{{field.max
? field.max : Number.MAX_VALUE}}')&attributes(fieldCommon)&attributes(fieldDisabled)
+                    input.form-control(id='{{::field.id}}' name='{{field.model}}' type='number'
placeholder='{{::field.placeholder}}' min='{{field.min ? field.min : 0}}' max='{{field.max
? field.max : Number.MAX_VALUE}}' step='{{field.step ? field.step: 1}}')&attributes(fieldCommon)&attributes(fieldDisabled)
                     +ico-exclamation('{{field.model}}', 'min', 'Value is less than allowable
minimum.')
                     +ico-exclamation('{{field.model}}', 'max', 'Value is more than allowable
maximum.')
                     +ico-exclamation('{{field.model}}', 'number', 'Invalid value. Only numbers
allowed.')


Mime
View raw message