Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 098B917A23 for ; Fri, 10 Jul 2015 11:52:32 +0000 (UTC) Received: (qmail 63561 invoked by uid 500); 10 Jul 2015 11:52:31 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 63531 invoked by uid 500); 10 Jul 2015 11:52:31 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 63522 invoked by uid 99); 10 Jul 2015 11:52:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Jul 2015 11:52:31 +0000 X-ASF-Spam-Status: No, hits=-2000.6 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 10 Jul 2015 11:50:21 +0000 Received: (qmail 60390 invoked by uid 99); 10 Jul 2015 11:50:52 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Jul 2015 11:50:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5326FE00E0; Fri, 10 Jul 2015 11:50:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.incubator.apache.org Message-Id: <46511e9590a547d9a3fa3337881bcde7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-ignite git commit: IGNITE-843 WIP changes after review. Date: Fri, 10 Jul 2015 11:50:52 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 181fd9858 -> 44a028ca0 IGNITE-843 WIP 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/44a028ca Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/44a028ca Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/44a028ca Branch: refs/heads/ignite-843 Commit: 44a028ca01fdac78dc19c9e17aa5cc6bd8d76677 Parents: 181fd98 Author: AKuznetsov Authored: Fri Jul 10 18:50:47 2015 +0700 Committer: AKuznetsov Committed: Fri Jul 10 18:50:47 2015 +0700 ---------------------------------------------------------------------- .../nodejs/controllers/models/caches.json | 103 +++++++++++-------- .../nodejs/views/includes/controls.jade | 4 +- 2 files changed, 60 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44a028ca/modules/web-control-center/nodejs/controllers/models/caches.json ---------------------------------------------------------------------- diff --git a/modules/web-control-center/nodejs/controllers/models/caches.json b/modules/web-control-center/nodejs/controllers/models/caches.json index 60b8336..b51067b 100644 --- a/modules/web-control-center/nodejs/controllers/models/caches.json +++ b/modules/web-control-center/nodejs/controllers/models/caches.json @@ -53,17 +53,26 @@ "Flag indicating whether data can be read from backup.", "If not set then always get data from primary node (never from backup)." ] + }, + { + "label": "Invalidate near cache", + "type": "check", + "model": "invalidate", + "tip": [ + "Invalidation flag for near cache entries in transaction.", + "If set then values will be invalidated (nullified) upon commit in near cache." + ] } ], "advanced": [ { - "label": "Async back pressure control", + "label": "Concurrency control", "tip": [ - "Cache async back pressure settings." + "Cache concurrent usage settings." ], "fields": [ { - "label": "Max async concurrency", + "label": "Max async operations", "type": "number", "model": "maxConcurrentAsyncOperations", "placeholder": 500, @@ -71,6 +80,31 @@ "Maximum number of allowed concurrent asynchronous operations.", "If 0 then number of concurrent asynchronous operations is unlimited." ] + }, + { + "label": "Default lock timeout", + "type": "number", + "model": "defaultLockTimeout", + "placeholder": 0, + "tip": [ + "Default lock acquisition timeout.", + "If 0 then lock acquisition will never timeout." + ] + }, + { + "label": "Entry versioning", + "type": "dropdown", + "model": "atomicWriteOrderMode", + "placeholder": "Choose versioning", + "items": "atomicWriteOrderModes", + "hide": "backupItem.atomicityMode == 'TRANSACTIONAL'", + "tip": [ + "Write ordering mode determines which node assigns the write version, sender or the primary node.", + "
    ", + "
  • CLOCK - in this mode write versions are assigned on a sender node which generally leads to better performance.
    • ", + "
  • PRIMARY - in this mode version is assigned only on primary node. This means that sender will only send write request to primary node, which in turn will assign write version and forward it to backups.
    • ", + "
" + ] } ] }, @@ -138,7 +172,9 @@ "path": "evictionPolicy.LRU", "model": "batchSize", "placeholder": 1, - "tip": ["Number of entries to remove on shrink."] + "tip": [ + "Number of entries to remove on shrink." + ] }, { "label": "Max memory size", @@ -186,7 +222,9 @@ "path": "evictionPolicy.FIFO", "model": "batchSize", "placeholder": 1, - "tip": ["Number of entries to remove on shrink."] + "tip": [ + "Number of entries to remove on shrink." + ] }, { "label": "Max memory size", @@ -219,7 +257,9 @@ "path": "evictionPolicy.SORTED", "model": "batchSize", "placeholder": 1, - "tip": ["Number of entries to remove on shrink."] + "tip": [ + "Number of entries to remove on shrink." + ] }, { "label": "Max memory size", @@ -250,7 +290,9 @@ "type": "number", "model": "startSize", "placeholder": 1500000, - "tip": ["Initial cache size which will be used to pre-create internal hash table after start."] + "tip": [ + "Initial cache size which will be used to pre-create internal hash table after start." + ] }, { "label": "Swap enabled", @@ -451,7 +493,9 @@ "path": "nearConfiguration.nearEvictionPolicy.LRU", "model": "batchSize", "placeholder": 1, - "tip": ["Number of entries to remove on shrink."] + "tip": [ + "Number of entries to remove on shrink." + ] }, { "label": "Max memory size", @@ -499,7 +543,9 @@ "path": "nearConfiguration.nearEvictionPolicy.FIFO", "model": "batchSize", "placeholder": 1, - "tip": ["Number of entries to remove on shrink."] + "tip": [ + "Number of entries to remove on shrink." + ] }, { "label": "Max memory size", @@ -532,7 +578,9 @@ "path": "nearConfiguration.nearEvictionPolicy.SORTED", "model": "batchSize", "placeholder": 1, - "tip": ["Number of entries to remove on shrink."] + "tip": [ + "Number of entries to remove on shrink." + ] }, { "label": "Max memory size", @@ -783,41 +831,6 @@ ] }, { - "label": "Transaction", - "tip": [ - "Cache transactions settings." - ], - "fields": [ - { - "label": "Invalidate", - "type": "check", - "model": "invalidate", - "tip": [ - "Invalidation flag for near cache entries in transaction.", - "If set then values will be invalidated (nullified) upon commit in near cache." - ] - }, - { - "label": "Default lock timeout", - "type": "number", - "model": "defaultLockTimeout", - "placeholder": 0, - "tip": [ - "Default lock acquisition timeout.", - "If 0 then lock acquisition will never timeout." - ] - }, - { - "label": "Manager finder", - "type": "text", - "model": "transactionManagerLookupClassName", - "tip": [ - "Class name of transaction manager finder for integration for JEE app servers." - ] - } - ] - }, - { "label": "Write behind", "tip": [ "Cache write behind settings.", http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44a028ca/modules/web-control-center/nodejs/views/includes/controls.jade ---------------------------------------------------------------------- diff --git a/modules/web-control-center/nodejs/views/includes/controls.jade b/modules/web-control-center/nodejs/views/includes/controls.jade index ef1a022..de2b76f 100644 --- a/modules/web-control-center/nodejs/views/includes/controls.jade +++ b/modules/web-control-center/nodejs/views/includes/controls.jade @@ -124,13 +124,13 @@ mixin form-row +exclamation('{{field.model}}', 'min', 'Value is less than allowable minimum.') +exclamation('{{field.model}}', 'max', 'Value is more than allowable maximum.') +exclamation('{{field.model}}', 'number', 'Invalid value. Only numbers allowed.') - div(ng-switch-when='dropdown') + div(ng-switch-when='dropdown' ng-hide='{{field.hide}}') label(class=lblClasses ng-class='{required: field.required}') {{field.label}}: .col-sm-4 +tipField('field.tip') .input-tip button.form-control(bs-select data-placeholder='{{field.placeholder}}' bs-options='item.value as item.label for item in {{field.items}}')&attributes(fieldCommon) - div(ng-switch-when='dropdown-multiple') + div(ng-switch-when='dropdown-multiple' ng-hide='{{field.hide}}') label(class=lblClasses ng-class='{required: field.required}') {{field.label}}: .col-sm-4 +tipField('field.tip')