You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/10/27 10:08:32 UTC
ignite git commit: IGNITE-1200 IGFS preview fixes + placeholders.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 0ebd7a567 -> b5daaf1e6
IGNITE-1200 IGFS preview fixes + placeholders.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b5daaf1e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b5daaf1e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b5daaf1e
Branch: refs/heads/ignite-843-rc1
Commit: b5daaf1e618da9bf537565a420174c3430a46be2
Parents: 0ebd7a5
Author: vsisko <vs...@gridgain.com>
Authored: Tue Oct 27 16:08:33 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Oct 27 16:08:33 2015 +0700
----------------------------------------------------------------------
.../main/js/controllers/clusters-controller.js | 11 +++++++
.../src/main/js/controllers/igfs-controller.js | 16 +++++++++-
.../src/main/js/controllers/models/caches.json | 6 +++-
.../main/js/controllers/models/clusters.json | 13 ++++++++
.../src/main/js/controllers/models/igfs.json | 32 ++++++++++----------
.../main/js/routes/generator/generator-java.js | 6 ++--
.../main/js/routes/generator/generator-xml.js | 6 ++--
7 files changed, 68 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5daaf1e/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 cbdc298..faece3a 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
@@ -99,6 +99,7 @@ consoleModule.controller('clustersController', [
deployment: {xml: '', java: '', allDefaults: true},
discovery: {xml: '', java: '', allDefaults: true},
events: {xml: '', java: '', allDefaults: true},
+ igfs: {xml: '', java: '', allDefaults: true},
marshaller: {xml: '', java: '', allDefaults: true},
metrics: {xml: '', java: '', allDefaults: true},
swap: {xml: '', java: '', allDefaults: true},
@@ -234,6 +235,12 @@ consoleModule.controller('clustersController', [
var srcItem = $scope.selectedItem ? $scope.selectedItem : prepareNewItem();
+ var igfss = _.map(_.filter($scope.igfss, function(igfs) {
+ return _.indexOf(val.igfss, igfs.value) >= 0;
+ }), function(igfs) {
+ return igfs.igfs;
+ });
+
$scope.ui.checkDirty(val, srcItem);
$scope.preview.general.xml = $generatorXml.clusterCaches(clusterCaches, null, $generatorXml.clusterGeneral(val)).asString();
@@ -260,6 +267,10 @@ consoleModule.controller('clustersController', [
$scope.preview.events.java = $generatorJava.clusterEvents(val).asString();
$scope.preview.events.allDefaults = $common.isEmptyString($scope.preview.events.xml);
+ $scope.preview.igfs.xml = $generatorXml.igfss(igfss).asString();
+ $scope.preview.igfs.java = $generatorJava.igfss(igfss, 'cfg').asString();
+ $scope.preview.igfs.allDefaults = $common.isEmptyString($scope.preview.igfs.xml);
+
$scope.preview.marshaller.xml = $generatorXml.clusterMarshaller(val).asString();
$scope.preview.marshaller.java = $generatorJava.clusterMarshaller(val).asString();
$scope.preview.marshaller.allDefaults = $common.isEmptyString($scope.preview.marshaller.xml);
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5daaf1e/modules/control-center-web/src/main/js/controllers/igfs-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/igfs-controller.js b/modules/control-center-web/src/main/js/controllers/igfs-controller.js
index b201cdf..581d1c8 100644
--- a/modules/control-center-web/src/main/js/controllers/igfs-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/igfs-controller.js
@@ -94,6 +94,20 @@ consoleModule.controller('igfsController', [
};
$scope.tablePairValid = function (item, field, index) {
+ var pairValue = $table.tablePairValue(field, index);
+
+ var model = item[field.model];
+
+ if ($common.isDefined(model)) {
+ var idx = _.findIndex(model, function (pair) {
+ return pair.path == pairValue.key
+ });
+
+ // Found duplicate.
+ if (idx >= 0 && idx != index)
+ return showPopoverMessage(null, null, $table.tableFieldId(index, 'KeyPathMode'), 'Such path already exists!');
+ }
+
return true;
};
@@ -170,7 +184,7 @@ consoleModule.controller('igfsController', [
$scope.preview.misc.xml = $generatorXml.igfsMisc(val).asString();
$scope.preview.misc.java = $generatorJava.igfsMisc(val, varName).asString();
- $scope.preview.misc.allDefaults = $common.isEmptyString($scope.preview.general.xml);
+ $scope.preview.misc.allDefaults = $common.isEmptyString($scope.preview.misc.xml);
}
}, true);
})
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5daaf1e/modules/control-center-web/src/main/js/controllers/models/caches.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/caches.json b/modules/control-center-web/src/main/js/controllers/models/caches.json
index 133ecbf..2790a30 100644
--- a/modules/control-center-web/src/main/js/controllers/models/caches.json
+++ b/modules/control-center-web/src/main/js/controllers/models/caches.json
@@ -746,7 +746,11 @@
"items": "writeSynchronizationMode",
"tip": [
"Write synchronization mode",
- "This mode controls whether the main caller should wait for update on other nodes to complete or not"
+ "<ul>",
+ " <li>FULL_SYNC - Ignite will wait for write or commit replies from all nodes</li>",
+ " <li>FULL_ASYNC - Ignite will not wait for write or commit responses from participating nodes</li>",
+ " <li>PRIMARY_SYNC - Makes sense for PARTITIONED mode. Ignite will wait for write or commit to complete on primary node</li>",
+ "</ul>"
]
}
]
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5daaf1e/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 5739ea3..52098ca 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
@@ -458,6 +458,7 @@
"type": "text",
"path": "communication",
"model": "listener",
+ "placeholder": "Enter fully qualified class name",
"tip": [
"Communication listener"
]
@@ -665,6 +666,7 @@
"type": "number",
"path": "communication",
"model": "selectorsCount",
+ "placeholder": 4,
"tip": [
"Count of selectors te be used in TCP server"
]
@@ -675,6 +677,7 @@
"type": "text",
"path": "communication",
"model": "addressResolver",
+ "placeholder": "Enter fully qualified class name",
"tip": [
"Address resolver"
]
@@ -803,6 +806,7 @@
"type": "text",
"path": "discovery",
"model": "addressResolver",
+ "placeholder": "Enter fully qualified class name",
"tip": [
"Class name of resolution between external and internal addresses provider"
]
@@ -813,6 +817,7 @@
"type": "number",
"path": "discovery",
"model": "socketTimeout",
+ "placeholder": 5000,
"tip": [
"Socket operations timeout"
]
@@ -823,6 +828,7 @@
"type": "number",
"path": "discovery",
"model": "ackTimeout",
+ "placeholder": 5000,
"tip": [
"Message acknowledgement timeout"
]
@@ -921,6 +927,7 @@
"type": "text",
"path": "discovery",
"model": "listener",
+ "placeholder": "Enter fully qualified class name",
"tip": [
"Grid discovery listener"
]
@@ -931,6 +938,7 @@
"type": "text",
"path": "discovery",
"model": "dataExchange",
+ "placeholder": "Enter fully qualified class name",
"tip": [
"Class name of handler for initial data exchange between Ignite nodes"
]
@@ -941,6 +949,7 @@
"type": "text",
"path": "discovery",
"model": "metricsProvider",
+ "placeholder": "Enter fully qualified class name",
"tip": [
"Class name of metric provider to discovery SPI"
]
@@ -984,6 +993,7 @@
"type": "text",
"path": "discovery",
"model": "authenticator",
+ "placeholder": "Enter fully qualified class name",
"tip": [
"Node authenticator"
]
@@ -1231,6 +1241,7 @@
"model": "keyStoreFilePath",
"required": true,
"hide": "!backupItem.sslEnabled",
+ "placeholder": "Path to the key store file",
"tip": [
"Path to the key store file",
"This is a mandatory parameter since ssl context could not be initialized without key manager"
@@ -1283,6 +1294,7 @@
"path": "sslContextFactory",
"model": "trustStoreFilePath",
"hide": "!backupItem.sslEnabled || trustManagersConfigured()",
+ "placeholder": "Path to the trust store file",
"tip": [
"Path to the trust store file"
]
@@ -1556,6 +1568,7 @@
"type": "text",
"path": "transactionConfiguration",
"model": "txManagerLookupClassName",
+ "placeholder": "Enter fully qualified class name",
"tip": [
"Class name of transaction manager finder for integration for JEE app servers"
]
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5daaf1e/modules/control-center-web/src/main/js/controllers/models/igfs.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/igfs.json b/modules/control-center-web/src/main/js/controllers/models/igfs.json
index 6d1ad1c..0d08f4c 100644
--- a/modules/control-center-web/src/main/js/controllers/models/igfs.json
+++ b/modules/control-center-web/src/main/js/controllers/models/igfs.json
@@ -217,6 +217,7 @@
"id": "dualModePutExecutorService",
"type": "text",
"model": "dualModePutExecutorService",
+ "placeholder": "Enter fully qualified class name",
"tip": [
"DUAL mode put operation executor service"
]
@@ -226,7 +227,6 @@
"id": "dualModePutExecutorServiceShutdown",
"type": "check",
"model": "dualModePutExecutorServiceShutdown",
- "placeholder": "Enter fully qualified class name",
"tip": [
"DUAL mode put operation executor service shutdown flag"
]
@@ -299,21 +299,6 @@
]
},
{
- "label": "Path modes",
- "id": "pathModes",
- "ui": "table-pair",
- "type": "pathModes",
- "model": "pathModes",
- "keyName": "path",
- "valueName": "mode",
- "focusId": "PathMode",
- "addTip": "Add path mode",
- "removeTip": "Remove path",
- "tip": [
- "Map of path prefixes to IGFS modes used for them"
- ]
- },
- {
"label": "Per node batch size",
"id": "perNodeBatchSize",
"type": "number",
@@ -362,6 +347,21 @@
"tip": [
"Maximum timeout awaiting for trash purging in case data cache oversize is detected"
]
+ },
+ {
+ "label": "Path modes",
+ "id": "pathModes",
+ "ui": "table-pair",
+ "type": "pathModes",
+ "model": "pathModes",
+ "keyName": "path",
+ "valueName": "mode",
+ "focusId": "PathMode",
+ "addTip": "Add path mode",
+ "removeTip": "Remove path",
+ "tip": [
+ "Map of path prefixes to IGFS modes used for them"
+ ]
}
]
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5daaf1e/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 9ec4a68..935ac0c 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
@@ -575,8 +575,8 @@ $generatorJava.clusterDiscovery = function (disco, res) {
res.needEmptyLine = false;
}
- $generatorJava.property(res, 'discovery', disco, 'socketTimeout');
- $generatorJava.property(res, 'discovery', disco, 'ackTimeout');
+ $generatorJava.property(res, 'discovery', disco, 'socketTimeout', undefined, undefined, 5000);
+ $generatorJava.property(res, 'discovery', disco, 'ackTimeout', undefined, undefined, 5000);
$generatorJava.property(res, 'discovery', disco, 'maxAckTimeout', undefined, undefined, 600000);
$generatorJava.property(res, 'discovery', disco, 'networkTimeout', undefined, undefined, 5000);
$generatorJava.property(res, 'discovery', disco, 'joinTimeout', undefined, undefined, 0);
@@ -1588,6 +1588,8 @@ $generatorJava.igfsFragmentizer = function(igfs, varName, res) {
res.needEmptyLine = true;
}
+ else
+ $generatorJava.property(res, varName, igfs, 'fragmentizerEnabled');
return res;
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5daaf1e/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 8f26676..6ad0f92 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
@@ -447,8 +447,8 @@ $generatorXml.clusterDiscovery = function (disco, res) {
$generatorXml.property(res, disco, 'localPortRange', undefined, 100);
if ($commonUtils.isDefinedAndNotEmpty(disco.addressResolver))
$generatorXml.beanProperty(res, disco, 'addressResolver', {className: disco.addressResolver}, true);
- $generatorXml.property(res, disco, 'socketTimeout');
- $generatorXml.property(res, disco, 'ackTimeout');
+ $generatorXml.property(res, disco, 'socketTimeout', undefined, 5000);
+ $generatorXml.property(res, disco, 'ackTimeout', undefined, 5000);
$generatorXml.property(res, disco, 'maxAckTimeout', undefined, 600000);
$generatorXml.property(res, disco, 'discoNetworkTimeout', 'setNetworkTimeout', 5000);
$generatorXml.property(res, disco, 'joinTimeout', undefined, 0);
@@ -1158,6 +1158,8 @@ $generatorXml.igfsFragmentizer = function(igfs, res) {
res.needEmptyLine = true;
}
+ else
+ $generatorXml.property(res, igfs, 'fragmentizerEnabled');
return res;
};