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 2016/01/27 08:13:55 UTC
[2/2] ignite git commit: IGNITE-2431 Added missing properties to
cluster.
IGNITE-2431 Added missing properties to cluster.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/46ba2c83
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/46ba2c83
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/46ba2c83
Branch: refs/heads/ignite-843-rc2
Commit: 46ba2c834a3ef38db55de8b608d6e6c197bb8f50
Parents: 62b6b6d
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Jan 27 14:13:51 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Jan 27 14:13:51 2016 +0700
----------------------------------------------------------------------
.../configuration/clusters/connector.jade | 40 +++++++++++++++++---
.../src/main/js/controllers/common-module.js | 2 +-
modules/control-center-web/src/main/js/db.js | 2 +
.../js/helpers/generator/generator-common.js | 2 +
4 files changed, 39 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/46ba2c83/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/connector.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/connector.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/connector.jade
index 89cb75c..8d0b16b 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/connector.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/connector.jade
@@ -37,7 +37,7 @@ form.panel.panel-default(name='connector')
ignite-form-field-tooltip
| Flag indicating whether to configure connector configuration
.settings-row
- ignite-form-field
+ ignite-form-field
ignite-form-field-label
| Jetty configuration path:
ignite-form-field-tooltip
@@ -51,7 +51,7 @@ form.panel.panel-default(name='connector')
data-ng-disabled='!#{model}.enabled'
)
.settings-row
- ignite-form-field
+ ignite-form-field
ignite-form-field-label
| TCP host:
ignite-form-field-tooltip
@@ -97,6 +97,34 @@ form.panel.panel-default(name='connector')
.settings-row
ignite-form-field
ignite-form-field-label
+ | Idle query cursor timeout:
+ ignite-form-field-tooltip
+ | Reject open query cursors that is not used timeout
+ | If no fetch query request come within idle timeout, it will be removed on next check for old query cursors
+ ignite-form-field-input-number(
+ data-id='connectorIdleQueryCursorTimeout'
+ data-name='connectorIdleQueryCursorTimeout'
+ data-ng-model='#{model}.idleQueryCursorTimeout'
+ data-placeholder='600000'
+ data-ng-disabled='!#{model}.enabled'
+ )
+ .settings-row
+ ignite-form-field
+ ignite-form-field-label
+ | Idle query cursor check frequency:
+ ignite-form-field-tooltip
+ | Idle query cursors check frequency.
+ | This setting is used to reject open query cursors that is not used
+ ignite-form-field-input-number(
+ data-id='connectorIdleQueryCursorCheckFrequency'
+ data-name='connectorIdleQueryCursorCheckFrequency'
+ data-ng-model='#{model}.idleQueryCursorCheckFrequency'
+ data-placeholder='60000'
+ data-ng-disabled='!#{model}.enabled'
+ )
+ .settings-row
+ ignite-form-field
+ ignite-form-field-label
| Idle timeout:
ignite-form-field-tooltip
| Idle timeout for REST server#[br]
@@ -203,7 +231,7 @@ form.panel.panel-default(name='connector')
data-ng-disabled='!#{model}.enabled'
)
.settings-row
- ignite-form-field
+ ignite-form-field
ignite-form-field-label
| Message interceptor:
ignite-form-field-tooltip
@@ -216,7 +244,7 @@ form.panel.panel-default(name='connector')
data-ng-disabled='!#{model}.enabled'
)
.settings-row
- ignite-form-field
+ ignite-form-field
ignite-form-field-label
| Secret key:
ignite-form-field-tooltip
@@ -251,7 +279,7 @@ form.panel.panel-default(name='connector')
ignite-form-field-tooltip
| Flag indicating whether or not SSL client authentication is required
.settings-row
- ignite-form-field
+ ignite-form-field
ignite-form-field-label
| SSL factory:
ignite-form-field-tooltip
@@ -278,4 +306,4 @@ form.panel.panel-default(name='connector')
ui-ace='{onLoad: previewInit, onChange: previewChanged, mode: "xml", rendererOptions: {minLines: group.previewMinLines || 3}}'
ng-model='preview["connector"].xml')
.preview-content-empty(ng-if='preview["connector"].allDefaults')
- label All Defaults
\ No newline at end of file
+ label All Defaults
http://git-wip-us.apache.org/repos/asf/ignite/blob/46ba2c83/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index c48d796..c691f00 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -735,7 +735,7 @@ consoleModule.service('$common', [
var lines = _.map(arr, function (line) {
var rtrimmed = line.replace(/\s+$/g, '');
- if (rtrimmed.indexOf('>', this.length - 1) === -1)
+ if (arr.length > 1 && rtrimmed.indexOf('>', rtrimmed.length - 1) === -1)
rtrimmed = rtrimmed + '<br/>';
return rtrimmed;
http://git-wip-us.apache.org/repos/asf/ignite/blob/46ba2c83/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 77e5850..1e5490e 100644
--- a/modules/control-center-web/src/main/js/db.js
+++ b/modules/control-center-web/src/main/js/db.js
@@ -403,6 +403,8 @@ var ClusterSchema = new Schema({
port: Number,
portRange: Number,
idleTimeout: Number,
+ idleQueryCursorTimeout: Number,
+ idleQueryCursorCheckFrequency: Number,
receiveBufferSize: Number,
sendBufferSize: Number,
directBuffer: Boolean,
http://git-wip-us.apache.org/repos/asf/ignite/blob/46ba2c83/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
index 973d7cb..b15e85a 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
@@ -386,6 +386,8 @@ $generatorCommon.CONNECTOR_CONFIGURATION = {
port: {dflt: 11211},
portRange: {dflt: 100},
idleTimeout: {dflt: 7000},
+ idleQueryCursorTimeout: {dflt: 600000},
+ idleQueryCursorCheckFrequency: {dflt: 60000},
receiveBufferSize: {dflt: 32768},
sendBufferSize: {dflt: 32768},
sendQueueLimit: {dflt: 0},