You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2016/03/28 10:48:18 UTC
[38/50] [abbrv] ignite git commit: IGNITE-2676 Review
IGNITE-2676 Review
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8e3de18a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8e3de18a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8e3de18a
Branch: refs/heads/ignite-2875
Commit: 8e3de18a1c0a56609674914e141b1d2c24678940
Parents: 8c79a57
Author: vsisko <vs...@gridgain.com>
Authored: Fri Mar 25 12:45:14 2016 +0700
Committer: vsisko <vs...@gridgain.com>
Committed: Fri Mar 25 12:45:14 2016 +0700
----------------------------------------------------------------------
.../app/modules/states/configuration/igfs/dual.jade | 3 ++-
.../states/configuration/igfs/fragmentizer.jade | 10 +++++-----
.../js/app/modules/states/configuration/igfs/ipc.jade | 14 +++++++-------
.../src/main/js/controllers/igfs-controller.js | 4 ----
.../src/main/js/views/configuration/igfs.jade | 2 +-
5 files changed, 15 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8e3de18a/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/dual.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/dual.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/dual.jade
index df8a7f68..64cccc9 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/dual.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/dual.jade
@@ -23,7 +23,8 @@ form.panel.panel-default(name='dualMode' novalidate)
ignite-form-panel-chevron
label Dual mode
ignite-form-field-tooltip.tipLabel
- | Dual mode settings
+ | IGFS supports dual-mode that allows it to work as either a standalone file system in Hadoop cluster, or work in tandem with HDFS, providing a primary caching layer for the secondary HDFS#[br]
+ | As a caching layer it provides highly configurable read-through and write-through behaviour
ignite-form-revert
.panel-collapse(role='tabpanel' bs-collapse-target id='dualMode')
.panel-body(ng-if='__show__')
http://git-wip-us.apache.org/repos/asf/ignite/blob/8e3de18a/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/fragmentizer.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/fragmentizer.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/fragmentizer.jade
index 9490726..b4f4125 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/fragmentizer.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/fragmentizer.jade
@@ -28,15 +28,15 @@ form.panel.panel-default(name='fragmentizer' novalidate)
.panel-collapse(role='tabpanel' bs-collapse-target id='fragmentizer')
.panel-body(ng-if='__show__')
.col-sm-6
- -var fragmentizerEnabled = model + '.fragmentizerEnabled'
+ -var enabled = model + '.fragmentizerEnabled'
.settings-row
- +checkbox('Enabled', fragmentizerEnabled, 'fragmentizerEnabled', 'Fragmentizer enabled flag')
+ +checkbox('Enabled', enabled, 'fragmentizerEnabled', 'Fragmentizer enabled flag')
.settings-row
- +number('Concurrent files:', model + '.fragmentizerConcurrentFiles', 'fragmentizerConcurrentFiles', fragmentizerEnabled, '0', '0', 'Number of files to process concurrently by fragmentizer')
+ +number('Concurrent files:', model + '.fragmentizerConcurrentFiles', 'fragmentizerConcurrentFiles', enabled, '0', '0', 'Number of files to process concurrently by fragmentizer')
.settings-row
- +number('Throttling block length:', model + '.fragmentizerThrottlingBlockLength', 'fragmentizerThrottlingBlockLength', fragmentizerEnabled, '16777216', '1', 'Length of file chunk to transmit before throttling is delayed')
+ +number('Throttling block length:', model + '.fragmentizerThrottlingBlockLength', 'fragmentizerThrottlingBlockLength', enabled, '16777216', '1', 'Length of file chunk to transmit before throttling is delayed')
.settings-row
- +number('Throttling delay:', model + '.fragmentizerThrottlingDelay', 'fragmentizerThrottlingDelay', fragmentizerEnabled, '200', '0', 'Delay in milliseconds for which fragmentizer is paused')
+ +number('Throttling delay:', model + '.fragmentizerThrottlingDelay', 'fragmentizerThrottlingDelay', enabled, '200', '0', 'Delay in milliseconds for which fragmentizer is paused')
.col-sm-6
+preview-xml-java(model, 'igfsFragmentizer')
http://git-wip-us.apache.org/repos/asf/ignite/blob/8e3de18a/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/ipc.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/ipc.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/ipc.jade
index 3db3d8c..5463c46 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/ipc.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/igfs/ipc.jade
@@ -29,12 +29,12 @@ form.panel.panel-default(name='ipc' novalidate)
.panel-body(ng-if='__show__')
.col-sm-6
-var ipcEndpointConfiguration = model + '.ipcEndpointConfiguration'
- -var ipcEndpointEnabled = model + '.ipcEndpointEnabled'
+ -var enabled = model + '.ipcEndpointEnabled'
.settings-row
- +checkbox('Enabled', model + '.ipcEndpointEnabled', 'ipcEndpointEnabled', 'IPC endpoint enabled flag')
+ +checkbox('Enabled', enabled, 'ipcEndpointEnabled', 'IPC endpoint enabled flag')
.settings-row
- +dropdown('Type:', ipcEndpointConfiguration + '.type', 'ipcEndpointConfigurationType', ipcEndpointEnabled, 'TCP',
+ +dropdown('Type:', ipcEndpointConfiguration + '.type', 'ipcEndpointConfigurationType', enabled, 'TCP',
'[\
{value: "SHMEM", label: "SHMEM"},\
{value: "TCP", label: "TCP"}\
@@ -45,12 +45,12 @@ form.panel.panel-default(name='ipc' novalidate)
<li>TCP - TCP endpoint</li>\
</ul>')
.settings-row
- +text-ip-address('Host:', ipcEndpointConfiguration + '.host', 'ipcEndpointConfigurationHost', ipcEndpointEnabled, '127.0.0.1', 'Host name')
+ +text-ip-address('Host:', ipcEndpointConfiguration + '.host', 'ipcEndpointConfigurationHost', enabled, '127.0.0.1', 'Host name')
.settings-row
- +number-min-max('Port:', ipcEndpointConfiguration + '.port', 'ipcEndpointConfigurationPort', ipcEndpointEnabled, '10500', '1', '65535', 'Port number')
+ +number-min-max('Port:', ipcEndpointConfiguration + '.port', 'ipcEndpointConfigurationPort', enabled, '10500', '1', '65535', 'Port number')
.settings-row
- +number('Memory size:', ipcEndpointConfiguration + '.memorySize', 'ipcEndpointConfigurationMemorySize', ipcEndpointEnabled, '262144', '1', 'Shared memory size in bytes allocated for endpoint communication')
+ +number('Memory size:', ipcEndpointConfiguration + '.memorySize', 'ipcEndpointConfigurationMemorySize', enabled, '262144', '1', 'Shared memory size in bytes allocated for endpoint communication')
.settings-row
- +text-enabled('Token directory:', ipcEndpointConfiguration + '.tokenDirectoryPath', 'ipcEndpointConfigurationTokenDirectoryPath', ipcEndpointEnabled, 'false', 'ipc/shmem', 'Directory where shared memory tokens are stored')
+ +text-enabled('Token directory:', ipcEndpointConfiguration + '.tokenDirectoryPath', 'ipcEndpointConfigurationTokenDirectoryPath', enabled, 'false', 'ipc/shmem', 'Directory where shared memory tokens are stored')
.col-sm-6
+preview-xml-java(model, 'igfsIPC')
http://git-wip-us.apache.org/repos/asf/ignite/blob/8e3de18a/modules/control-center-web/src/main/js/controllers/igfs-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/igfs-controller.js b/modules/control-center-web/src/main/js/controllers/igfs-controller.js
index 553fd4c..6781546 100644
--- a/modules/control-center-web/src/main/js/controllers/igfs-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/igfs-controller.js
@@ -221,10 +221,6 @@ consoleModule.controller('igfsController', [
return showPopoverMessage($scope.ui, firstError.$name, errNameFull, msg);
}
- if (!$common.isEmptyString(item.dualModePutExecutorService) &&
- !$common.isValidJavaClass('Put executor service', item.dualModePutExecutorService, false, 'dualModePutExecutorService', false, $scope.ui, 'dualMode'))
- return false;
-
if (!item.secondaryFileSystemEnabled && (item.defaultMode === 'PROXY'))
return showPopoverMessage($scope.ui, 'secondaryFileSystem', 'secondaryFileSystem-title', 'Secondary file system should be configured for "PROXY" IGFS mode!');
http://git-wip-us.apache.org/repos/asf/ignite/blob/8e3de18a/modules/control-center-web/src/main/js/views/configuration/igfs.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/igfs.jade b/modules/control-center-web/src/main/js/views/configuration/igfs.jade
index 947cebe..602f863 100644
--- a/modules/control-center-web/src/main/js/views/configuration/igfs.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/igfs.jade
@@ -39,10 +39,10 @@ include ../includes/infos
ignite-advanced-options-toggle
div(ng-show='ui.expanded')
+ ignite-configuration-igfs-secondary
ignite-configuration-igfs-ipc
ignite-configuration-igfs-fragmentizer
ignite-configuration-igfs-dual
- ignite-configuration-igfs-secondary
ignite-configuration-igfs-misc
ignite-advanced-options-toggle