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-2510 Fixed swap spi validation.
Date Mon, 01 Feb 2016 07:11:07 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 1a566244e -> ff4d8f8ed


IGNITE-2510 Fixed swap spi validation.


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

Branch: refs/heads/ignite-843-rc2
Commit: ff4d8f8ed4dd6a9c6c4cfacce7dd5e26233edf7e
Parents: 1a56624
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Mon Feb 1 14:11:11 2016 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Mon Feb 1 14:11:11 2016 +0700

----------------------------------------------------------------------
 .../main/js/controllers/clusters-controller.js  | 51 ++++++--------------
 .../src/main/js/controllers/common-module.js    | 10 ++++
 2 files changed, 25 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ff4d8f8e/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 8eb6c9c..63b5433 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
@@ -139,6 +139,16 @@ consoleModule.controller('clustersController', function ($http, $timeout,
$scope
                 $scope.selectItem($scope.clusters[0]);
         }
 
+        function clusterCaches(item) {
+            return _.reduce($scope.caches, function (memo, cache) {
+                if (item && _.contains(item.caches, cache.value)) {
+                    memo.push(cache.cache);
+                }
+
+                return memo;
+            }, []);
+        }
+
         $loading.start('loadingClustersScreen');
 
         // When landing on the page, get clusters and show them.
@@ -397,15 +407,6 @@ consoleModule.controller('clustersController', function ($http, $timeout,
$scope
                         if ($common.isEmptyString(type.typeName))
                             return showPopoverMessage($scope.ui, 'binary', 'typeName' + typeIx,
'Type name should be specified');
 
-                        if (!$common.isEmptyString(type.typeName) && !$common.isValidJavaClass('Type
name', type.typeName, false, 'typeName' + typeIx, false, $scope.ui, 'binary'))
-                            return false;
-
-                        if (!$common.isEmptyString(type.idMapper) && !$common.isValidJavaClass('ID
mapper', type.idMapper, false, 'idMapper' + typeIx, false, $scope.ui, 'binary'))
-                            return false;
-
-                        if (!$common.isEmptyString(type.serializer) && !$common.isValidJavaClass('Serializer',
type.serializer, false, 'serializer' + typeIx, false, $scope.ui, 'binary'))
-                            return false;
-
                         if (_.find(b.typeConfigurations, sameName))
                             return showPopoverMessage($scope.ui, 'binary', 'typeName' + typeIx,
'Type with such name is already specified');
                     }
@@ -415,12 +416,6 @@ consoleModule.controller('clustersController', function ($http, $timeout,
$scope
             var c = item.communication;
 
             if ($common.isDefined(c)) {
-                if (!$common.isEmptyString(c.listener) && !$common.isValidJavaClass('Communication
listener', c.listener, false, 'comListener', false, $scope.ui, 'communication'))
-                    return false;
-
-                if (!$common.isEmptyString(c.addressResolver) && !$common.isValidJavaClass('Address
resolver', c.addressResolver, false, 'comAddressResolver', false, $scope.ui, 'communication'))
-                    return false;
-
                 if ($common.isDefined(c.unacknowledgedMessagesBufferSize)) {
                     if ($common.isDefined(c.messageQueueLimit))
                         if (c.unacknowledgedMessagesBufferSize < 5 * c.messageQueueLimit)
@@ -435,34 +430,13 @@ consoleModule.controller('clustersController', function ($http, $timeout,
$scope
             var r = item.connector;
 
             if ($common.isDefined(r)) {
-                if (!$common.isEmptyString(r.messageInterceptor) && !$common.isValidJavaClass('Message
interceptor', r.messageInterceptor, false, 'connectorMessageInterceptor', false, $scope.ui,
'connector'))
-                    return false;
-
                 if (r.sslEnabled && $common.isEmptyString(r.sslFactory))
                     return showPopoverMessage($scope.ui, 'connector', 'connectorSslFactory',
'SSL factory should not be empty');
-
-                if (r.sslEnabled && !$common.isEmptyString(r.sslFactory) &&
!$common.isValidJavaClass('SSL factory', r.sslFactory, false, 'connectorSslFactory', false,
$scope.ui, 'connector'))
-                    return false;
             }
 
             var d = item.discovery;
 
             if (d) {
-                if (!$common.isEmptyString(d.addressResolver) && !$common.isValidJavaClass('Address
resolver', d.addressResolver, false, 'discoAddressResolver', false, $scope.ui, 'discovery'))
-                    return false;
-
-                if (!$common.isEmptyString(d.listener) && !$common.isValidJavaClass('Discovery
listener', d.listener, false, 'discoListener', false, $scope.ui, 'discovery'))
-                    return false;
-
-                if (!$common.isEmptyString(d.dataExchange) && !$common.isValidJavaClass('Data
exchange', d.dataExchange, false, 'dataExchange', false, $scope.ui, 'discovery'))
-                    return false;
-
-                if (!$common.isEmptyString(d.metricsProvider) && !$common.isValidJavaClass('Metrics
provider', d.metricsProvider, false, 'metricsProvider', false, $scope.ui, 'discovery'))
-                    return false;
-
-                if (!$common.isEmptyString(d.authenticator) && !$common.isValidJavaClass('Node
authenticator', d.authenticator, false, 'authenticator', false, $scope.ui, 'discovery'))
-                    return false;
-
                 if (d.kind === 'Vm' && d.Vm && d.Vm.addresses.length ===
0)
                     return showPopoverMessage($scope.ui, 'general', 'addresses', 'Addresses
are not specified');
 
@@ -562,6 +536,11 @@ consoleModule.controller('clustersController', function ($http, $timeout,
$scope
         $scope.saveItem = function () {
             var item = $scope.backupItem;
 
+            var swapSpi = $common.autoClusterSwapSpiConfiguration(item, clusterCaches(item));
+
+            if (swapSpi)
+                angular.extend(item, swapSpi);
+
             if (validate(item))
                 save(item);
         };

http://git-wip-us.apache.org/repos/asf/ignite/blob/ff4d8f8e/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index ab688f2..3e5cf07 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -1107,6 +1107,16 @@ consoleModule.service('$common', [
                         writeThrough: dflt || cache.writeThrough
                     };
                 }
+            },
+            autoClusterSwapSpiConfiguration: function (cluster, caches) {
+                var swapConfigured = cluster.swapSpaceSpi && cluster.swapSpaceSpi.kind;
+
+                if (!swapConfigured && _.find(caches, function (cache) {
+                    return cache.swapEnabled;
+                }))
+                    return {swapSpaceSpi: {kind: 'FileSwapSpaceSpi'}};
+
+                return undefined;
             }
         };
     }]);


Mime
View raw message