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/06/26 13:09:24 UTC
[1/2] incubator-ignite git commit: # IGNITE-843 Tooltips for groups.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 7b22d69a5 -> 2bbaa6821
# IGNITE-843 Tooltips for groups.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/caba05f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/caba05f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/caba05f4
Branch: refs/heads/ignite-843
Commit: caba05f43a1e2b2006e8d5ed4624678c6d3fbeea
Parents: 7b22d69
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Jun 26 18:08:56 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Jun 26 18:08:56 2015 +0700
----------------------------------------------------------------------
.../nodejs/public/form-models/clusters.json | 88 ++++++++++++--------
1 file changed, 51 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/caba05f4/modules/webconfig/nodejs/public/form-models/clusters.json
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/form-models/clusters.json b/modules/webconfig/nodejs/public/form-models/clusters.json
index cb43c5b..68b7517 100644
--- a/modules/webconfig/nodejs/public/form-models/clusters.json
+++ b/modules/webconfig/nodejs/public/form-models/clusters.json
@@ -271,7 +271,8 @@
{
"label": "Atomic configuration",
"tip": [
- "Configuration for atomic data structures."
+ "Configuration for atomic data structures.",
+ "Atomics are distributed across the cluster, essentially enabling performing atomic operations (such as increment-and-get or compare-and-set) with the same globally-visible value."
],
"fields": [
{
@@ -315,6 +316,9 @@
},
{
"label": "Communication",
+ "tip": [
+ "Cluster communication network properties."
+ ],
"fields": [
{
"label": "Timeout",
@@ -379,6 +383,9 @@
},
{
"label": "Deployment",
+ "tip": [
+ "Task and resources deployment in cluster."
+ ],
"fields": [
{
"label": "Mode",
@@ -394,6 +401,9 @@
},
{
"label": "Events",
+ "tip": [
+ " Grid events are used for notification about what happens within the grid."
+ ],
"fields": [
{
"label": "Include type",
@@ -410,6 +420,10 @@
},
{
"label": "Marshaller",
+ "tip": [
+ "Marshaller allows to marshal or unmarshal objects in grid.",
+ "It provides serialization/deserialization mechanism for all instances that are sent across networks or are otherwise serialized."
+ ],
"fields": [
{
"label": "Marshaller",
@@ -573,6 +587,42 @@
]
},
{
+ "label": "Segmentation",
+ "fields": [
+ {
+ "label": "Policy",
+ "type": "dropdown",
+ "model": "segmentationPolicy",
+ "placeholder": "STOP",
+ "items": "segmentationPolicy",
+ "tip": [
+ "Policy that defines how node will react on topology segmentation."
+ ]
+ },
+ {
+ "label": "Resolve attempts count",
+ "type": "number",
+ "model": "segmentationResolveAttempts",
+ "placeholder": "2",
+ "tip": [
+ "Each configured resolver will have this attempts number to pass segmentation check prior to check failure."
+ ]
+ },
+ {
+ "label": "All resolvers pass required flag",
+ "type": "check",
+ "model": "allSegmentationResolversPassRequired",
+ "tip": [
+ "All segmentation resolvers pass required flag.",
+ "<ul>",
+ " <li>If enabled all segmentation resolvers should succeed for node to be in correct segment.</li>",
+ " <li>If disabled at least one segmentation resolver should succeed for node to be in correct segment.</li>",
+ "</ul>"
+ ]
+ }
+ ]
+ },
+ {
"label": "Swap",
"fields": [
{
@@ -802,42 +852,6 @@
]
},
{
- "label": "Segmentation",
- "fields": [
- {
- "label": "Policy",
- "type": "dropdown",
- "model": "segmentationPolicy",
- "placeholder": "STOP",
- "items": "segmentationPolicy",
- "tip": [
- "Policy that defines how node will react on topology segmentation."
- ]
- },
- {
- "label": "Resolve attempts count",
- "type": "number",
- "model": "segmentationResolveAttempts",
- "placeholder": "2",
- "tip": [
- "Each configured resolver will have this attempts number to pass segmentation check prior to check failure."
- ]
- },
- {
- "label": "All resolvers pass required flag",
- "type": "check",
- "model": "allSegmentationResolversPassRequired",
- "tip": [
- "All segmentation resolvers pass required flag.",
- "<ul>",
- " <li>If enabled all segmentation resolvers should succeed for node to be in correct segment.</li>",
- " <li>If disabled at least one segmentation resolver should succeed for node to be in correct segment.</li>",
- "</ul>"
- ]
- }
- ]
- },
- {
"label": "Utility",
"fields": [
{
[2/2] incubator-ignite git commit: # IGNITE-843 Wip on validation.
Posted by ak...@apache.org.
# IGNITE-843 Wip on validation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2bbaa682
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2bbaa682
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2bbaa682
Branch: refs/heads/ignite-843
Commit: 2bbaa6821bdd4023ba05a62a64062d4ba7ff7ec4
Parents: caba05f
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Jun 26 18:09:20 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Jun 26 18:09:20 2015 +0700
----------------------------------------------------------------------
.../nodejs/public/javascripts/controllers/caches.js | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2bbaa682/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/javascripts/controllers/caches.js b/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
index 705ca90..9815887 100644
--- a/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
+++ b/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
@@ -126,6 +126,18 @@ configuratorModule.controller('cachesController', ['$scope', '$alert', '$http',
$scope.saveItem = function () {
var item = $scope.backupItem;
+ if (item.cacheStoreFactory && !item.readThrough && !item.writeThrough) {
+ $alert({position: 'top', title: 'Store is configured but read/write through are not enabled!'});
+
+ return;
+ }
+
+ if ((item.readThrough || item.writeThrough) && (!item.cacheStoreFactory || !item.cacheStoreFactory.kind)) {
+ $alert({position: 'top', title: 'Read / write through are enabled but strore is not configured!'});
+
+ return;
+ }
+
$http.post('/rest/caches/save', item)
.success(function (_id) {
var idx = _.findIndex($scope.caches, function (cache) {