Repository: ignite Updated Branches: refs/heads/ignite-843 f7d350813 -> b6d5d24f5
ignite-843 Changed cluster settings Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b6d5d24f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b6d5d24f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b6d5d24f Branch: refs/heads/ignite-843 Commit: b6d5d24f5a5e114181f7d825bd92af1b8732345a Parents: f7d3508 Author: Andrey <[email protected]> Authored: Thu Oct 8 12:49:29 2015 +0700 Committer: Andrey <[email protected]> Committed: Thu Oct 8 12:49:29 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/models/clusters.json | 30 ++------------------ modules/control-center-web/src/main/js/db.js | 5 ---- 2 files changed, 3 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b6d5d24f/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 1b1c0a1..6901e81 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 @@ -355,7 +355,7 @@ ], "advanced": [ { - "label": "Atomics configuration", + "label": "Atomic configuration", "group": "atomics", "tip": [ "Configuration for atomic data structures", @@ -443,31 +443,6 @@ ] }, { - "label": "Segment check frequency", - "id": "segmentCheckFrequency", - "type": "number", - "model": "segmentCheckFrequency", - "placeholder": 10000, - "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", - "id": "waitForSegmentOnStart", - "type": "check", - "model": "waitForSegmentOnStart", - "tip": [ - "Wait for segment on start flag", - "<ul>", - " <li>If enabled, node should wait for correct segment on start</li>", - " <li>If node detects that segment is incorrect on startup and enabled, node waits until segment becomes correct</li>", - " <li>If segment is incorrect on startup and disabled, exception is thrown</li>", - "</ul>" - ] - }, - { "label": "Discovery startup delay", "id": "discoveryStartupDelay", "type": "number", @@ -666,7 +641,7 @@ ] }, { - "label": "Peer Class Loading", + "label": "Peer class loading", "group": "p2p", "tip": [ "Cluster peer class loading settings" @@ -1093,6 +1068,7 @@ "type": "check", "path": "transactionConfiguration", "model": "txSerializableEnabled", + "hide": "true", "tip": [ "Flag to enable/disable isolation level for cache transactions", "Serializable level does carry certain overhead and if not used, should be disabled" http://git-wip-us.apache.org/repos/asf/ignite/blob/b6d5d24f/modules/control-center-web/src/main/js/db.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/db.js b/modules/control-center-web/src/main/js/db.js index 5c5d24d..1eee5e6 100644 --- a/modules/control-center-web/src/main/js/db.js +++ b/modules/control-center-web/src/main/js/db.js @@ -300,10 +300,6 @@ var ClusterSchema = new Schema({ peerClassLoadingMissedResourcesCacheSize: Number, peerClassLoadingThreadPoolSize: Number, publicThreadPoolSize: Number, - segmentCheckFrequency: Number, - segmentationPolicy: {type: String, enum: ['RESTART_JVM', 'STOP', 'NOOP']}, - allSegmentationResolversPassRequired: Boolean, - segmentationResolveAttempts: Number, swapSpaceSpi: { kind: {type: String, enum: ['FileSwapSpaceSpi']}, FileSwapSpaceSpi: { @@ -326,7 +322,6 @@ var ClusterSchema = new Schema({ txSerializableEnabled: Boolean, txManagerLookupClassName: String }, - waitForSegmentOnStart: Boolean, sslEnabled: Boolean, sslContextFactory: { keyAlgorithm: String,
