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 2019/04/15 07:40:28 UTC
[ignite] branch master updated: IGNITE-11717 Web console: Fixed
project generation. Fixes #6443.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 17753e2 IGNITE-11717 Web console: Fixed project generation. Fixes #6443.
17753e2 is described below
commit 17753e25c95bbf3645b65b558e862eb057dcfa9a
Author: Vasiliy Sisko <vs...@gridgain.com>
AuthorDate: Mon Apr 15 14:40:05 2019 +0700
IGNITE-11717 Web console: Fixed project generation. Fixes #6443.
---
.../generator/generator/ConfigurationGenerator.js | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/modules/web-console/frontend/app/configuration/generator/generator/ConfigurationGenerator.js b/modules/web-console/frontend/app/configuration/generator/generator/ConfigurationGenerator.js
index 07d3e79..c2057e0 100644
--- a/modules/web-console/frontend/app/configuration/generator/generator/ConfigurationGenerator.js
+++ b/modules/web-console/frontend/app/configuration/generator/generator/ConfigurationGenerator.js
@@ -1426,6 +1426,7 @@ export default class IgniteConfigurationGenerator {
loadBalancingSpi.boolProperty('perTask');
break;
+
case 'Adaptive':
loadBalancingSpi = new Bean('org.apache.ignite.spi.loadbalancing.adaptive.AdaptiveLoadBalancingSpi', 'loadBalancingSpiAdaptive', spi.Adaptive);
@@ -1438,6 +1439,7 @@ export default class IgniteConfigurationGenerator {
probeBean.boolProperty('useAverage');
break;
+
case 'CPU':
probeBean = new Bean('org.apache.ignite.spi.loadbalancing.adaptive.AdaptiveCpuLoadProbe', 'cpuProbe', spi.Adaptive.loadProbe.CPU, clusterDflts.loadBalancingSpi.Adaptive.loadProbe.CPU);
@@ -1446,12 +1448,14 @@ export default class IgniteConfigurationGenerator {
.intProperty('processorCoefficient');
break;
+
case 'ProcessingTime':
probeBean = new Bean('org.apache.ignite.spi.loadbalancing.adaptive.AdaptiveProcessingTimeLoadProbe', 'timeProbe', spi.Adaptive.loadProbe.ProcessingTime, clusterDflts.loadBalancingSpi.Adaptive.loadProbe.ProcessingTime);
probeBean.boolProperty('useAverage');
break;
+
case 'Custom':
const className = _.get(spi, 'Adaptive.loadProbe.Custom.className');
@@ -1459,6 +1463,7 @@ export default class IgniteConfigurationGenerator {
probeBean = new Bean(className, 'probe', spi.Adaptive.loadProbe.Job.Custom);
break;
+
default:
// No-op.
}
@@ -1467,6 +1472,7 @@ export default class IgniteConfigurationGenerator {
loadBalancingSpi.beanProperty('loadProbe', probeBean);
break;
+
case 'WeightedRandom':
loadBalancingSpi = new Bean('org.apache.ignite.spi.loadbalancing.weightedrandom.WeightedRandomLoadBalancingSpi', 'loadBalancingSpiRandom', spi.WeightedRandom, clusterDflts.loadBalancingSpi.WeightedRandom);
@@ -1474,13 +1480,15 @@ export default class IgniteConfigurationGenerator {
.boolProperty('useWeights');
break;
+
case 'Custom':
- const className = _.get(spi, 'Custom.className');
+ const cusClassName = _.get(spi, 'Custom.className');
- if (className)
- loadBalancingSpi = new Bean(className, 'loadBalancingSpiCustom', spi.Custom);
+ if (cusClassName)
+ loadBalancingSpi = new Bean(cusClassName, 'loadBalancingSpiCustom', spi.Custom);
break;
+
default:
// No-op.
}
@@ -2816,7 +2824,7 @@ export default class IgniteConfigurationGenerator {
bean = new Bean('org.apache.ignite.hadoop.util.ChainedUserNameMapper', 'mameMapper', mapper.Chained);
bean.arrayProperty('mappers', 'mappers',
- _.map(_.get(mapper, 'Chained.mappers'), IgniteConfigurationGenerator._userNameMapperBean),
+ _.filter(_.map(_.get(mapper, 'Chained.mappers'), IgniteConfigurationGenerator._userNameMapperBean), (m) => m),
'org.apache.ignite.hadoop.util.UserNameMapper');
break;
@@ -2872,7 +2880,7 @@ export default class IgniteConfigurationGenerator {
break;
case 'Custom':
- if (_get(secondFs, 'Custom.className'))
+ if (_.get(secondFs, 'Custom.className'))
factoryBean = new Bean(secondFs.Custom.className, 'fac', null);
break;