Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 223129650 -> 7373fe518
# IGNITE-843 Changes after review. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7373fe51 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7373fe51 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7373fe51 Branch: refs/heads/ignite-843 Commit: 7373fe518a4555c7cdfdc6c5b6d79c00dddfd14e Parents: 2231296 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Fri Jun 12 22:49:44 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Fri Jun 12 22:49:44 2015 +0700 ---------------------------------------------------------------------- .../nodejs/public/form-models/clusters.json | 214 ++++++++----------- modules/webconfig/nodejs/views/caches.jade | 2 +- modules/webconfig/nodejs/views/clusters.jade | 2 +- 3 files changed, 89 insertions(+), 129 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7373fe51/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 257d2fd..019e260 100644 --- a/modules/webconfig/nodejs/public/form-models/clusters.json +++ b/modules/webconfig/nodejs/public/form-models/clusters.json @@ -206,11 +206,21 @@ } ] } + }, + { + "label": "Caches", + "type": "dropdown-multiple", + "model": "caches", + "placeholder": "Choose caches", + "items": "caches", + "tip": [ + "Select caches to start in cluster" + ] } ], "advanced": [ { - "label": "Atomic data structures", + "label": "Atomic configuration", "model": "atomicConfiguration", "fields": [ { @@ -248,55 +258,63 @@ ] }, { - "label": "Cache configuration", + "label": "Communication", "fields": [ { - "label": "Caches", - "type": "dropdown-multiple", - "model": "caches", - "placeholder": "Choose caches", - "items": "caches" + "label": "Timeout", + "type": "text", + "model": "networkTimeout", + "placeholder": "5,000", + "tip": [ + "Maximum timeout in milliseconds for network requests." + ] }, { - "label": "Enable cache sanity check", - "type": "check", - "model": "cacheSanityCheckEnabled", - "tip": [ - "Flag indicating whether cache sanity check is enabled. If enabled, then Ignite", - "will perform the following checks and throw an exception if check fails:", - "<ul>", - "<li>Cache entry is not externally locked with lock(...) or lockAsync(...) methods when entry is enlisted to transaction.</li>", - "<li>Each entry in affinity group-lock transaction has the same affinity key as was specified on affinity transaction start.</li>", - "<li>Each entry in partition group-lock transaction belongs to the same partition as was specified on partition transaction start.</li>", - "</ul>", - "<p>", - "These checks are not required for cache operation, but help to find subtle bugs.", - "Disabling of this checks usually yields a noticeable performance gain." + "label": "Send retry delay", + "type": "text", + "model": "networkSendRetryDelay", + "placeholder": "1,000", + "tip": [ + "Interval in milliseconds between message send retries." ] - } - ] - }, - { - "label": "Clock synchronization", - "fields": [ + }, { - "label": "Samples size", + "label": "Send retry count", "type": "text", - "model": "clockSyncSamples", - "placeholder": "8", + "model": "networkSendRetryCount", + "placeholder": "3", "tip": [ - "Number of samples used to synchronize clocks between different nodes.", - "Clock synchronization is used for cache version assignment in CLOCK order mode." + "Message send retries count." ] }, { - "label": "Frequency", + "label": "Segment check frequency", "type": "text", - "model": "clockSyncFrequency", - "placeholder": "120,000", + "model": "segmentCheckFrequency", + "placeholder": "10,000", "tip": [ - "frequency at which clock is synchronized between nodes, in milliseconds.", - "Clock synchronization is used for cache version assignment in CLOCK order mode." + "Network segment check frequency in milliseconds.", + "If 0, periodic segment check is disabled and segment is checked only on topology changes (if segmentation resolvers are configured)." + ] + }, + { + "label": "Wait for segment on start", + "type": "check", + "model": "waitForSegmentOnStart", + "tip": [ + "Wait for segment on start flag.", + "If enabled, node should wait for correct segment on start.", + "If node detects that segment is incorrect on startup and enabled, node waits until segment becomes correct.", + "If segment is incorrect on startup and disabled, exception is thrown." + ] + }, + { + "label": "Discovery startup delay", + "type": "text", + "model": "discoveryStartupDelay", + "placeholder": "600,000", + "tip": [ + "This value is used to expire messages from waiting list whenever node discovery discrepancies happen." ] } ] @@ -305,28 +323,13 @@ "label": "Deployment", "fields": [ { - "label": "Samples size", + "label": "Mode", "type": "dropdown", "model": "deploymentMode", "placeholder": "shared", "items": "deploymentModes", "tip": [ - "Number of samples used to synchronize clocks between different nodes.", - "Clock synchronization is used for cache version assignment in CLOCK order mode." - ] - } - ] - }, - { - "label": "Discovery", - "fields": [ - { - "label": "Startup delay", - "type": "text", - "model": "discoveryStartupDelay", - "placeholder": "600,000", - "tip": [ - "Time in milliseconds after which a certain metric value is considered expired." + "Task classes and resources sharing mode." ] } ] @@ -419,69 +422,6 @@ ] }, { - "label": "Network", - "fields": [ - { - "label": "Localhost", - "type": "text", - "model": "localHost", - "placeholder": "0.0.0.0", - "tip": [ - "System-wide local address or host for all Ignite components to bind to.", - "If provided it will override all default local bind settings within Ignite or any of its SPIs." - ] - }, - { - "label": "Timeout", - "type": "text", - "model": "networkTimeout", - "placeholder": "5,000", - "tip": [ - "Maximum timeout in milliseconds for network requests." - ] - }, - { - "label": "Send retry delay", - "type": "text", - "model": "networkSendRetryDelay", - "placeholder": "1,000", - "tip": [ - "Interval in milliseconds between message send retries." - ] - }, - { - "label": "Send retry count", - "type": "text", - "model": "networkSendRetryCount", - "placeholder": "3", - "tip": [ - "Message send retries count." - ] - }, - { - "label": "Segment check frequency", - "type": "text", - "model": "segmentCheckFrequency", - "placeholder": "10,000", - "tip": [ - "Network segment check frequency in milliseconds.", - "If 0, periodic segment check is disabled and segment is checked only on topology changes (if segmentation resolvers are configured)." - ] - }, - { - "label": "Wait for segment on start", - "type": "check", - "model": "waitForSegmentOnStart", - "tip": [ - "Wait for segment on start flag.", - "If enabled, node should wait for correct segment on start.", - "If node detects that segment is incorrect on startup and enabled, node waits until segment becomes correct.", - "If segment is incorrect on startup and disabled, exception is thrown." - ] - } - ] - }, - { "label": "Peer Class Loading", "fields": [ { @@ -524,9 +464,29 @@ ] }, { - "label": "Time server", + "label": "Time configuration", "fields": [ { + "label": "Samples size", + "type": "text", + "model": "clockSyncSamples", + "placeholder": "8", + "tip": [ + "Number of samples used to synchronize clocks between different nodes.", + "Clock synchronization is used for cache version assignment in CLOCK order mode." + ] + }, + { + "label": "Frequency", + "type": "text", + "model": "clockSyncFrequency", + "placeholder": "120,000", + "tip": [ + "frequency at which clock is synchronized between nodes, in milliseconds.", + "Clock synchronization is used for cache version assignment in CLOCK order mode." + ] + }, + { "label": "Port base", "type": "text", "model": "timeServerPortBase", @@ -661,6 +621,15 @@ "items": "segmentationPolicy" }, { + "label": "Resolve attempts count", + "type": "text", + "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", @@ -670,15 +639,6 @@ "If enabled all segmentation resolvers should succeed for node to be in correct segment.", "If disabled at least one segmentation resolver should succeed for node to be in correct segment." ] - }, - { - "label": "Resolve attempts count", - "type": "text", - "model": "segmentationResolveAttempts", - "placeholder": "2", - "tip": [ - "Each configured resolver will have this attempts number to pass segmentation check prior to check failure." - ] } ] }, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7373fe51/modules/webconfig/nodejs/views/caches.jade ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/views/caches.jade b/modules/webconfig/nodejs/views/caches.jade index cbc4349..de17b897 100644 --- a/modules/webconfig/nodejs/views/caches.jade +++ b/modules/webconfig/nodejs/views/caches.jade @@ -50,6 +50,6 @@ block content +form-row .panel-heading .panel-title - a(bs-collapse-toggle ng-init='expanded=false; lbl="Show advanced settings..."' ng-click='expanded = true; lbl=expanded ? "Hide advanced settings... " : "Show advanced settings..."') {{lbl}} + a(bs-collapse-toggle ng-init='expanded=false; lbl="Show advanced settings..."' ng-click='expanded = !expanded; lbl=expanded ? "Hide advanced settings... " : "Show advanced settings..."') {{lbl}} button.btn.btn-primary(ng-click='saveItem()' ng-disabled='cachesForm.$invalid') Save button.btn.btn-primary(ng-click='removeItem()' ng-show='backupItem._id') Remove http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7373fe51/modules/webconfig/nodejs/views/clusters.jade ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/views/clusters.jade b/modules/webconfig/nodejs/views/clusters.jade index e0b4396..1ee92ea 100644 --- a/modules/webconfig/nodejs/views/clusters.jade +++ b/modules/webconfig/nodejs/views/clusters.jade @@ -60,6 +60,6 @@ block content +form-row .panel-title h3 - a(bs-collapse-toggle ng-init='expanded=false; lbl="Show advanced settings..."' ng-click='expanded = true; lbl=expanded ? "Hide advanced settings... " : "Show advanced settings..."') {{lbl}} + a(bs-collapse-toggle ng-init='expanded=false; lbl="Show advanced settings..."' ng-click='expanded = !expanded; lbl=expanded ? "Hide advanced settings... " : "Show advanced settings..."') {{lbl}} button.btn.btn-primary(ng-click='saveItem()' ng-disabled='clustersForm.$invalid') Save button.btn.btn-primary(ng-click='removeItem()' ng-show='backupItem._id') Remove \ No newline at end of file
