Repository: ambari Updated Branches: refs/heads/branch-2.4 5d2c1ff04 -> e1b36d466
AMBARI-17746. HDP 2.5 > Spark2 Service needs to clearly callout Tech Preview. (Jaimin) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e1b36d46 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e1b36d46 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e1b36d46 Branch: refs/heads/branch-2.4 Commit: e1b36d46634d92136a73451a16d0832f2e1e43f1 Parents: 5d2c1ff Author: Jaimin Jetly <[email protected]> Authored: Mon Jul 18 12:58:35 2016 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Mon Jul 18 12:59:18 2016 -0700 ---------------------------------------------------------------------- .../main/resources/common-services/SPARK2/2.0.0/metainfo.xml | 2 +- ambari-web/app/mappers/stack_service_mapper.js | 3 +++ ambari-web/app/models/stack_service.js | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e1b36d46/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/metainfo.xml b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/metainfo.xml index c83c83c..fb50f68 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/metainfo.xml @@ -22,7 +22,7 @@ <service> <name>SPARK2</name> <displayName>Spark2</displayName> - <comment>Apache Spark is a fast and general engine for large-scale data processing.</comment> + <comment>Apache Spark 2.0 is a fast and general engine for large-scale data processing. This service is <b>Technical Preview</b>.</comment> <version>2.0.0</version> <components> <component> http://git-wip-us.apache.org/repos/asf/ambari/blob/e1b36d46/ambari-web/app/mappers/stack_service_mapper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mappers/stack_service_mapper.js b/ambari-web/app/mappers/stack_service_mapper.js index 91a4370..c800e83 100644 --- a/ambari-web/app/mappers/stack_service_mapper.js +++ b/ambari-web/app/mappers/stack_service_mapper.js @@ -115,6 +115,9 @@ App.stackServiceMapper = App.QuickDataMapper.create({ stackService.is_installable = false; stackService.is_selected = false; } + if (App.StackService.unSelectByDefault.contains(stackService.service_name)) { + stackService.is_selected = false; + } result.push(this.parseIt(stackService, this.get('config'))); }, this); App.store.loadMany(this.get('component_model'), stackServiceComponents); http://git-wip-us.apache.org/repos/asf/ambari/blob/e1b36d46/ambari-web/app/models/stack_service.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/stack_service.js b/ambari-web/app/models/stack_service.js index 4114ec6..3e2d5b4 100644 --- a/ambari-web/app/models/stack_service.js +++ b/ambari-web/app/models/stack_service.js @@ -212,6 +212,11 @@ App.StackService.displayOrder = [ 'ZEPPELIN' ]; +App.StackService.unSelectByDefault = [ + 'SPARK2' +]; + + App.StackService.componentsOrderForService = { 'HAWQ': ['HAWQMASTER', 'HAWQSTANDBY'] };
