AMBARI-2782. Hadoop2 stack install should merge YARN,MR2 options. (onechiporenko)

ambari-web/app/controllers/wizard/step4_controller.js

@@ -51,15 +51,19 @@ App.WizardStep4Controller = Em.ArrayController.extend({
     var hive = this.findProperty('serviceName', 'HIVE');
     var hcatalog = this.findProperty('serviceName', 'HCATALOG');
     var webhcat = this.findProperty('serviceName', 'WEBHCAT');
+    var yarn = this.findProperty('serviceName', 'YARN');
+    var mapreduce2 = this.findProperty('serviceName', 'MAPREDUCE2');
 
     // prevent against getting error when not all elements have been loaded yet
-    if (hbase && zookeeper && hive && hcatalog && webhcat) {
+    if (hbase && zookeeper && hive && hcatalog && webhcat && yarn && mapreduce2) {
       if (stringUtils.compareVersions(App.get('currentStackVersionNumber'), "2.0") === -1) {
         zookeeper.set('isSelected', hbase.get('isSelected') || hive.get('isSelected'));
-      }else{
+      }
+      else {
         if (!zookeeper.get('isSelected')) {
           zookeeper.set('isSelected', hbase.get('isSelected'));
         }
+        mapreduce2.set('isSelected', yarn.get('isSelected'));
       }
       hcatalog.set('isSelected', hive.get('isSelected'));
       webhcat.set('isSelected', hive.get('isSelected'));

ambari-web/app/controllers/wizard/step8_controller.js

@@ -552,6 +552,9 @@ App.WizardStep8Controller = Em.Controller.extend({
         case 'Resource Manager':
           _component.set('component_value', this.get('content.masterComponentHosts').findProperty('component', 'RESOURCEMANAGER').hostName);
           break;
+        case 'History Server':
+          _component.set('component_value', this.get('content.masterComponentHosts').findProperty('component', 'HISTORYSERVER').hostName);
+          break;
       }
     }, this);
     this.get('services').pushObject(mrObj);
@@ -570,14 +573,6 @@ App.WizardStep8Controller = Em.Controller.extend({
   loadTtValue: function (ttComponent) {
     var ttHosts = this.get('content.slaveComponentHosts').findProperty('displayName', 'TaskTracker');
     var totalTtHosts = ttHosts.hosts.length;
-    /* var totalGroups = this.get('slaveComponentConfig.components').findProperty('componentName', 'TASKTRACKER').groups.length;
-     var groupLabel;
-     if (totalGroups == 1) {
-     groupLabel = 'group';
-     } else {
-     groupLabel = 'groups';
-     }
-     */
     ttComponent.set('component_value', totalTtHosts + Em.I18n.t('installer.step8.hosts'));
   },
 

ambari-web/app/data/review_configs.js

@@ -84,19 +84,9 @@ module.exports = [
           })
         ]
       }),
-      Ember.Object.create({
-        service_name: 'MAPREDUCE2',
-        display_name: 'MapReduce 2',
-        service_components: [
-          Ember.Object.create({
-            display_name: 'History Server',
-            component_value: ''
-          })
-        ]
-      }),
       Ember.Object.create({
         service_name: 'YARN',
-        display_name: 'YARN',
+        display_name: 'YARN + MapReduce2',
         service_components: [
           Ember.Object.create({
             display_name: 'Node Manager',
@@ -105,6 +95,10 @@ module.exports = [
           Ember.Object.create({
             display_name: 'Resource Manager',
             component_value: ''
+          }),
+          Ember.Object.create({
+            display_name: 'History Server',
+            component_value: ''
           })
         ]
       }),

ambari-web/app/data/services.js

@@ -49,11 +49,12 @@ module.exports = [
     isDisabled: false,
     isSelected: true,
     canBeSelected: true,
+    isHidden: true,
     description: Em.I18n.t('services.mapreduce2.description')
   },
   {
     serviceName: 'YARN',
-    displayName: 'YARN',
+    displayName: 'YARN + MapReduce2',
     isDisabled: false,
     isSelected: true,
     canBeSelected: true,

ambari-web/test/installer/step4_test.js

@@ -23,7 +23,7 @@ require('controllers/wizard/step4_controller');
 describe('App.WizardStep4Controller', function () {
 
   var services = [
-    'HDFS', 'MAPREDUCE', 'NAGIOS', 'GANGLIA', 'OOZIE', 'HIVE', 'HBASE', 'PIG', 'SCOOP', 'ZOOKEEPER', 'HCATALOG', 'WEBHCAT'
+    'HDFS', 'MAPREDUCE', 'NAGIOS', 'GANGLIA', 'OOZIE', 'HIVE', 'HBASE', 'PIG', 'SCOOP', 'ZOOKEEPER', 'HCATALOG', 'WEBHCAT', 'YARN', 'MAPREDUCE2'
   ]
 
   var controller = App.WizardStep4Controller.create();
@@ -82,6 +82,16 @@ describe('App.WizardStep4Controller', function () {
       expect(controller.findProperty('serviceName', 'HCATALOG').get('isSelected')).to.equal(true);
       expect(controller.findProperty('serviceName', 'WEBHCAT').get('isSelected')).to.equal(true);
     })
+    it('should set MapReduce2 isSelected property like in Yarn', function () {
+      App.set('currentStackVersion', 'HDP-2.0.1');
+      App.set('defaultStackVersion', 'HDP-2.0.1');
+      controller.setEach('isSelected', false);
+      controller.findProperty('serviceName', 'YARN').set('isSelected', true);
+      controller.checkDependencies();
+      expect(controller.findProperty('serviceName', 'MAPREDUCE2').get('isSelected')).to.equal(true);
+      App.set('currentStackVersion', 'HDP-1.2.2');
+      App.set('defaultStackVersion', 'HDP-1.2.2');
+    })
   })
 
   describe('#selectAll()', function () {