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/03 19:02:49 UTC
incubator-ignite git commit: IGNITE-843: WIP on caches page.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 797666d82 -> d43353054
IGNITE-843: WIP on caches page.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d4335305
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d4335305
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d4335305
Branch: refs/heads/ignite-843
Commit: d43353054ce2bae2768fe6ad1dc8b52ec3c98280
Parents: 797666d
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Jun 4 00:02:44 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Jun 4 00:02:44 2015 +0700
----------------------------------------------------------------------
.../public/javascripts/controllers/caches.js | 41 ++++++++--
modules/webconfig/nodejs/views/caches.jade | 79 ++++++--------------
2 files changed, 58 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4335305/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 9d3240e..90ce870 100644
--- a/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
+++ b/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
@@ -18,9 +18,9 @@
configuratorModule.controller('cachesController', ['$scope', '$http', function($scope, $http) {
$scope.templates = [
{value: {}, label: 'None'},
- {value: {mode: 'PART', atomicy: 'ATOMIC'}, label: 'Partitioned'},
- {value: {mode: 'REPL', atomicy: 'ATOMIC'}, label: 'Replicated'},
- {value: {mode: 'LOCAL', atomicy: 'ATOMIC'}, label: 'Local'}
+ {value: {mode: 'PART', atomicity: 'ATOMIC'}, label: 'Partitioned'},
+ {value: {mode: 'REPL', atomicity: 'ATOMIC'}, label: 'Replicated'},
+ {value: {mode: 'LOCAL', atomicity: 'ATOMIC'}, label: 'Local'}
];
$scope.atomicities = [
@@ -29,11 +29,40 @@ configuratorModule.controller('cachesController', ['$scope', '$http', function($
];
$scope.modes = [
- {value: 'PARTITIONED', label: 'Partitioned'},
- {value: 'REPLICATED', label: 'Replicated'},
+ {value: 'PART', label: 'Partitioned'},
+ {value: 'REPL', label: 'Replicated'},
{value: 'LOCAL', label: 'Local'}
];
+ $scope.atomicWriteOrderModes = [
+ {value: 'CLOCK', label: 'Clock'},
+ {value: 'PRIMARY', label: 'Primary'}
+ ];
+
+ $scope.rebalanceModes = [
+ {value: 'SYNC', label: 'Synchronous'},
+ {value: 'ASYNC', label: 'Asynchronous'},
+ {value: 'NONE', label: 'None'}
+ ];
+
+ $scope.memoryModes = [
+ {value: 'ONHT', label: 'Onheap tiered'},
+ {value: 'OFHT', label: 'Offheap tiered'},
+ {value: 'OFHV', label: 'Offheap values'}
+ ];
+
+ //DefaultLockTimeout dfltLockTimeout
+ //invalidate
+ //TransactionManagerLookupClassName tmLookupClsName
+ // swapEnabled
+ // maxConcurrentAsyncOps
+ // writeBehindEnabled
+ // writeBehindFlushSize
+ // writeBehindFlushFreq
+ // writeBehindFlushThreadCnt
+ // writeBehindBatchSize
+ // offHeapMaxMem
+
$scope.caches = [];
// When landing on the page, get caches and show them.
@@ -61,8 +90,6 @@ configuratorModule.controller('cachesController', ['$scope', '$http', function($
.success(function(_id) {
item._id = _id;
- console.log(_id)
-
$scope.caches.push(item);
$scope.selectItem(item);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d4335305/modules/webconfig/nodejs/views/caches.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/caches.jade b/modules/webconfig/nodejs/views/caches.jade
index 357e01e..6bb1914 100644
--- a/modules/webconfig/nodejs/views/caches.jade
+++ b/modules/webconfig/nodejs/views/caches.jade
@@ -34,7 +34,7 @@ block content
tbody
tr(ng-repeat='row in rowCollection')
td.col-sm-6(ng-class="{active: row == selectedItem}")
- a(ng-click='selectItem(row)') {{row.name}}, {{row.cache.mode | displayValue:modes:'Cache mode not set'}}
+ a(ng-click='selectItem(row)') {{row.name}}, {{row.mode | displayValue:modes:'Cache mode not set'}}, {{row.atomicity | displayValue:atomicities:'Cache atomicity not set'}}
.row.col-sm-12
hr
form.form-horizontal(name='editForm' ng-if='backupItem')
@@ -44,83 +44,52 @@ block content
.col-sm-3
input.form-control(type='text' ng-model='backupItem.name')
.settings-row
- span.col-sm-2 Discovery:
+ span.col-sm-2 Mode:
.col-sm-3
- button.form-control(style='text-align: left' ng-model='backupItem.discovery.kind' data-template='/select' data-placeholder='Choose discovery' bs-options='item.value as item.label for item in discoveries' bs-select)
+ button.form-control(style='text-align: left' ng-model='backupItem.mode' data-template='/select' data-placeholder='Choose mode' bs-options='item.value as item.label for item in modes' bs-select)
+ .settings-row
+ span.col-sm-2 Atomicity:
+ .col-sm-3
+ button.form-control(style='text-align: left' ng-model='backupItem.atomicity' data-template='/select' data-placeholder='Choose Atomicity' bs-options='item.value as item.label for item in atomicities' bs-select)
.panel(bs-collapse data-start-collapsed='true')
.panel-collapse(bs-collapse-target)
- h3 Cache configuration
- .settings-row
- input(type='checkbox' ng-model='backupItem.cacheSanityCheckEnabled')
- span Enable cache sanity check.
- h3 Marshaller
- .settings-row
- span.col-sm-2 Keep alive time:
- .col-sm-3
- input.form-control(type='text' ng-model='backupItem.marshCacheKeepAliveTime' placeholder='10,000')
- .settings-row
- span.col-sm-2 Pool size:
- .col-sm-3
- input.form-control(type='text' ng-model='backupItem.marshCachePoolSize' placeholder='max(8, availableProcessors) * 2')
- h3 Network
- .settings-row
- span.col-sm-2 Timeout:
- .col-sm-3
- input.form-control(type='text' ng-model='backupItem.netTimeout' placeholder='5,000')
- .settings-row
- span.col-sm-2 Send retry delay:
- .col-sm-3
- input.form-control(type='text' ng-model='backupItem.sndRetryDelay' placeholder='1,000')
- .settings-row
- span.col-sm-2 Send retry count:
- .col-sm-3
- input.form-control(type='text' ng-model='backupItem.sndRetryCnt' placeholder='3')
- h3 Peer Class Loading
.settings-row
- input(type='checkbox' ng-model='backupItem.p2pEnabled')
- span Enable peer class loading.
- .settings-row
- span.col-sm-2 Local class path exclude:
+ span.col-sm-2 Backups:
.col-sm-3
- input.form-control(type='text' ng-model='backupItem.p2pLocClsPathExcl' placeholder='[]')
+ input.form-control(type='text' ng-model='backupItem.backups' placeholder='0')
+ h3 Rebalance
.settings-row
- span.col-sm-2 Missed resources cache size:
+ span.col-sm-2 Mode:
.col-sm-3
- input.form-control(type='text' ng-model='backupItem.p2pMissedCacheSize' placeholder='100')
+ button.form-control(style='text-align: left' ng-model='backupItem.rebalanceMode' data-template='/select' data-placeholder='Choose Mode' bs-options='item.value as item.label for item in rebalanceModes' bs-select)
.settings-row
span.col-sm-2 Pool size:
.col-sm-3
- input.form-control(type='text' ng-model='backupItem.p2pPoolSize' placeholder='availableProcessors')
- h3 Thread pools size
- .settings-row
- span.col-sm-2 Public:
- .col-sm-3
- input.form-control(type='text' ng-model='backupItem.pubPoolSize' placeholder='max(8, availableProcessors) * 2')
+ input.form-control(type='text' ng-model='backupItem.rebalancePoolSize' placeholder='2')
.settings-row
- span.col-sm-2 System:
+ span.col-sm-2 Order:
.col-sm-3
- input.form-control(type='text' ng-model='backupItem.sysPoolSize' placeholder='max(8, availableProcessors) * 2')
+ input.form-control(type='text' ng-model='backupItem.rebalanceOrder' placeholder='0')
.settings-row
- span.col-sm-2 Management:
+ span.col-sm-2 Batch size:
.col-sm-3
- input.form-control(type='text' ng-model='backupItem.mgmtPoolSize' placeholder='4')
+ input.form-control(type='text' ng-model='backupItem.rebalanceBatchSize' placeholder='512 * 1024')
.settings-row
- span.col-sm-2 Igfs:
+ span.col-sm-2 Timeout:
.col-sm-3
- input.form-control(type='text' ng-model='backupItem.igfsPoolSize' placeholder='availableProcessors')
- h3 Utility
+ input.form-control(type='text' ng-model='backupItem.rebalanceTimeout' placeholder='10000')
.settings-row
- span.col-sm-2 Keep alive time:
+ span.col-sm-2 Delay:
.col-sm-3
- input.form-control(type='text' ng-model='backupItem.utilityCacheKeepAliveTime' placeholder='10,000')
+ input.form-control(type='text' ng-model='backupItem.rebalanceDelay' placeholder='0')
.settings-row
- span.col-sm-2 Pool size:
+ span.col-sm-2 Throttle:
.col-sm-3
- input.form-control(type='text' ng-model='backupItem.utilityCachePoolSize' placeholder='max(8, availableProcessors) * 2')
+ input.form-control(type='text' ng-model='backupItem.rebalanceThrottle' placeholder='0')
.panel-heading
.panel-title
span(bs-collapse-toggle)
a(ng-click='expanded = true' ng-hide='expanded') Show advanced settings...
a(ng-click='expanded = false' ng-show='expanded') Hide advanced settings...
button.btn.btn-primary(ng-click='saveItem(backupItem)' ng-disabled='editForm.$invalid') Save
- button.btn.btn-primary(ng-click='removeItem(selectedItem)' ng-disabled='editForm.$invalid') Remove
\ No newline at end of file
+ button.btn.btn-primary(ng-click='removeItem(selectedItem)' ng-disabled='editForm.$invalid') Remove