Repository: ignite Updated Branches: refs/heads/ignite-843-rc1 9f84f957b -> e43d52438
IGNITE-843 Merged deployment and p2p section. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e43d5243 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e43d5243 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e43d5243 Branch: refs/heads/ignite-843-rc1 Commit: e43d52438519ce5c1afffcea0224837b9b26f273 Parents: 9f84f95 Author: Andrey <[email protected]> Authored: Wed Oct 14 09:28:54 2015 +0700 Committer: Andrey <[email protected]> Committed: Wed Oct 14 09:28:54 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/models/clusters.json | 107 +++++++++---------- .../main/js/routes/generator/generator-java.js | 38 +++---- .../main/js/routes/generator/generator-xml.js | 38 +++---- 3 files changed, 77 insertions(+), 106 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e43d5243/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 651a5bb..7baaf53 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 @@ -681,7 +681,7 @@ ] }, { - "label": "Deployment", + "label": "Class deployment", "group": "deployment", "previewMinLines": 1, "tip": [ @@ -689,7 +689,7 @@ ], "fields": [ { - "label": "Mode", + "label": "Deployment mode", "id": "deploymentMode", "type": "dropdown", "model": "deploymentMode", @@ -705,6 +705,52 @@ " <li>CONTINUOUS - same as SHARED deployment mode, but resources will not be undeployed even after all master nodes left grid</li>", "</ul>" ] + }, + { + "label": "Enable peer class loading", + "id": "peerClassLoadingEnabled", + "type": "check", + "model": "peerClassLoadingEnabled", + "tip": [ + "Enables/disables peer class loading" + ] + }, + { + "label": "Missed resources cache size", + "id": "peerClassLoadingMissedResourcesCacheSize", + "type": "number", + "model": "peerClassLoadingMissedResourcesCacheSize", + "hide": "!backupItem.peerClassLoadingEnabled", + "placeholder": 100, + "tip": [ + "If size greater than 0, missed resources will be cached and next resource request ignored", + "If size is 0, then request for the resource will be sent to the remote node every time this resource is requested" + ] + }, + { + "label": "Pool size", + "id": "peerClassLoadingThreadPoolSize", + "type": "number", + "model": "peerClassLoadingThreadPoolSize", + "hide": "!backupItem.peerClassLoadingEnabled", + "placeholder": "availableProcessors", + "tip": [ + "Thread pool size to use for peer class loading" + ] + }, + { + "label": "Local class path exclude", + "id": "peerClassLoadingLocalClassPathExclude", + "type": "table-simple", + "model": "peerClassLoadingLocalClassPathExclude", + "hide": "!backupItem.peerClassLoadingEnabled", + "focusId": "PeerClsPathExclude", + "addTip": "Add package name", + "removeTip": "Remove package name", + "tableTip": [ + "List of packages from the system classpath that need to be peer-to-peer loaded from task originating node", + "'*' is supported at the end of the package name which means that all sub-packages and their classes are included like in Java package import clause" + ] } ] }, @@ -994,7 +1040,7 @@ "fields": [ { "label": "Marshaller", - "model": "marshaller", + "id": "marshaller", "type": "dropdown-details", "settings": true, "path": "marshaller", @@ -1122,61 +1168,6 @@ ] }, { - "label": "Peer class loading", - "group": "p2p", - "tip": [ - "Cluster peer class loading settings" - ], - "fields": [ - { - "label": "Enable peer class loading", - "id": "peerClassLoadingEnabled", - "type": "check", - "model": "peerClassLoadingEnabled", - "tip": [ - "Enables/disables peer class loading" - ] - }, - { - "label": "Missed resources cache size", - "id": "peerClassLoadingMissedResourcesCacheSize", - "type": "number", - "model": "peerClassLoadingMissedResourcesCacheSize", - "disabled": "!backupItem.peerClassLoadingEnabled", - "placeholder": 100, - "tip": [ - "If size greater than 0, missed resources will be cached and next resource request ignored", - "If size is 0, then request for the resource will be sent to the remote node every time this resource is requested" - ] - }, - { - "label": "Pool size", - "id": "peerClassLoadingThreadPoolSize", - "type": "number", - "model": "peerClassLoadingThreadPoolSize", - "disabled": "!backupItem.peerClassLoadingEnabled", - "placeholder": "availableProcessors", - "tip": [ - "Thread pool size to use for peer class loading" - ] - }, - { - "label": "Local class path exclude", - "id": "peerClassLoadingLocalClassPathExclude", - "type": "table-simple", - "model": "peerClassLoadingLocalClassPathExclude", - "disabled": "!backupItem.peerClassLoadingEnabled", - "focusId": "PeerClsPathExclude", - "addTip": "Add package name", - "removeTip": "Remove package name", - "tableTip": [ - "List of packages from the system classpath that need to be peer-to-peer loaded from task originating node", - "'*' is supported at the end of the package name which means that all sub-packages and their classes are included like in Java package import clause" - ] - } - ] - }, - { "label": "SSL configuration", "group": "sslConfiguration", "tip": [ http://git-wip-us.apache.org/repos/asf/ignite/blob/e43d5243/modules/control-center-web/src/main/js/routes/generator/generator-java.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-java.js b/modules/control-center-web/src/main/js/routes/generator/generator-java.js index 9923379..2429f71 100644 --- a/modules/control-center-web/src/main/js/routes/generator/generator-java.js +++ b/modules/control-center-web/src/main/js/routes/generator/generator-java.js @@ -549,6 +549,20 @@ $generatorJava.clusterDeployment = function (cluster, res) { res.needEmptyLine = true; + var p2pEnabled = cluster.peerClassLoadingEnabled; + + if ($commonUtils.isDefined(p2pEnabled)) { + $generatorJava.property(res, 'cfg', cluster, 'peerClassLoadingEnabled', null, null, false); + + if (p2pEnabled) { + $generatorJava.property(res, 'cfg', cluster, 'peerClassLoadingMissedResourcesCacheSize'); + $generatorJava.property(res, 'cfg', cluster, 'peerClassLoadingThreadPoolSize'); + $generatorJava.multiparamProperty(res, 'cfg', cluster, 'peerClassLoadingLocalClassPathExclude'); + } + + res.needEmptyLine = true; + } + return res; }; @@ -699,28 +713,6 @@ $generatorJava.clusterMetrics = function (cluster, res) { return res; }; -// Generate PeerClassLoading group. -$generatorJava.clusterP2p = function (cluster, res) { - if (!res) - res = $generatorCommon.builder(); - - var p2pEnabled = cluster.peerClassLoadingEnabled; - - if ($commonUtils.isDefined(p2pEnabled)) { - $generatorJava.property(res, 'cfg', cluster, 'peerClassLoadingEnabled', null, null, false); - - if (p2pEnabled) { - $generatorJava.property(res, 'cfg', cluster, 'peerClassLoadingMissedResourcesCacheSize'); - $generatorJava.property(res, 'cfg', cluster, 'peerClassLoadingThreadPoolSize'); - $generatorJava.multiparamProperty(res, 'cfg', cluster, 'peerClassLoadingLocalClassPathExclude'); - } - - res.needEmptyLine = true; - } - - return res; -}; - // Generate swap group. $generatorJava.clusterSwap = function (cluster, res) { if (!res) @@ -1559,8 +1551,6 @@ $generatorJava.cluster = function (cluster, javaClass, clientNearCfg) { $generatorJava.clusterMetrics(cluster, res); - $generatorJava.clusterP2p(cluster, res); - $generatorJava.clusterSwap(cluster, res); $generatorJava.clusterTime(cluster, res); http://git-wip-us.apache.org/repos/asf/ignite/blob/e43d5243/modules/control-center-web/src/main/js/routes/generator/generator-xml.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-xml.js b/modules/control-center-web/src/main/js/routes/generator/generator-xml.js index 6af240e..ac07aac 100644 --- a/modules/control-center-web/src/main/js/routes/generator/generator-xml.js +++ b/modules/control-center-web/src/main/js/routes/generator/generator-xml.js @@ -419,6 +419,20 @@ $generatorXml.clusterDeployment = function (cluster, res) { if ($generatorXml.property(res, cluster, 'deploymentMode', null, 'SHARED')) res.needEmptyLine = true; + var p2pEnabled = cluster.peerClassLoadingEnabled; + + if ($commonUtils.isDefined(p2pEnabled)) { + $generatorXml.property(res, cluster, 'peerClassLoadingEnabled', null, false); + + if (p2pEnabled) { + $generatorXml.property(res, cluster, 'peerClassLoadingMissedResourcesCacheSize'); + $generatorXml.property(res, cluster, 'peerClassLoadingThreadPoolSize'); + $generatorXml.listProperty(res, cluster, 'peerClassLoadingLocalClassPathExclude'); + } + + res.needEmptyLine = true; + } + return res; }; @@ -534,28 +548,6 @@ $generatorXml.clusterMetrics = function (cluster, res) { return res; }; -// Generate PeerClassLoading group. -$generatorXml.clusterP2p = function (cluster, res) { - if (!res) - res = $generatorCommon.builder(); - - var p2pEnabled = cluster.peerClassLoadingEnabled; - - if ($commonUtils.isDefined(p2pEnabled)) { - $generatorXml.property(res, cluster, 'peerClassLoadingEnabled', null, false); - - if (p2pEnabled) { - $generatorXml.property(res, cluster, 'peerClassLoadingMissedResourcesCacheSize'); - $generatorXml.property(res, cluster, 'peerClassLoadingThreadPoolSize'); - $generatorXml.listProperty(res, cluster, 'peerClassLoadingLocalClassPathExclude'); - } - - res.needEmptyLine = true; - } - - return res; -}; - // Generate swap group. $generatorXml.clusterSwap = function (cluster, res) { if (!res) @@ -1131,8 +1123,6 @@ $generatorXml.cluster = function (cluster, clientNearCfg) { $generatorXml.clusterMetrics(cluster, res); - $generatorXml.clusterP2p(cluster, res); - $generatorXml.clusterSwap(cluster, res); $generatorXml.clusterTime(cluster, res);
