AMBARI-6540. RM HA: Create Step2. (akovalenko)

ambari-web/app/app.js

@@ -161,8 +161,8 @@ module.exports = Em.Application.create({
       return App.StackServiceComponent.find().filterProperty('isMasterAddableInstallerWizard', true).mapProperty('componentName')
     }.property('App.router.clusterController.isLoaded'),
 
-    addableMasterHaWizard: function () {
-      return App.StackServiceComponent.find().filterProperty('isMasterWithMultipleInstancesHaWizard', true).mapProperty('componentName')
+    multipleMasters: function () {
+      return App.StackServiceComponent.find().filterProperty('isMasterWithMultipleInstances', true).mapProperty('componentName')
     }.property('App.router.clusterController.isLoaded'),
 
     slaves: function () {

ambari-web/app/controllers/main/admin/highAvailability/nameNode/wizard_controller.js

@@ -62,49 +62,6 @@ App.HighAvailabilityWizardController = App.WizardController.extend({
     return jQuery.extend({}, this.get('clusterStatusTemplate'), {name: App.router.getClusterName()});
   },
 
-  /**
-   * Load services data from server.
-   */
-  loadServicesFromServer: function() {
-    var services = this.getDBProperty('services');
-    if (!services) {
-      services = {
-        selectedServices: [],
-        installedServices: []
-      };
-      App.StackService.find().forEach(function(item){
-        var isInstalled = App.Service.find().someProperty('id', item.get('serviceName'));
-        item.set('isSelected', isInstalled);
-        item.set('isInstalled', isInstalled);
-        if (isInstalled) {
-          services.selectedServices.push(item.get('serviceName'));
-          services.installedServices.push(item.get('serviceName'));
-        }
-      },this);
-      this.setDBProperty('services',services);
-    } else {
-      App.StackService.find().forEach(function(item) {
-        var isSelected =   services.selectedServices.contains(item.get('serviceName'));
-        var isInstalled = services.installedServices.contains(item.get('serviceName'));
-        item.set('isSelected', isSelected);
-        item.set('isInstalled', isInstalled);
-      },this);
-    }
-    this.set('content.services', App.StackService.find());
-  },
-
-  /**
-   * Load confirmed hosts.
-   * Will be used at <code>Assign Masters(step5)</code> step
-   */
-  loadConfirmedHosts: function () {
-    var hosts = App.db.getHosts();
-
-    if (hosts) {
-      this.set('content.hosts', hosts);
-      console.log('ReassignMasterController.loadConfirmedHosts: loaded hosts', hosts);
-    }
-  },
   /**
    * save status of the cluster.
    * @param clusterStatus object with status,requestId fields.

ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step2_controller.js

@@ -18,7 +18,33 @@
 
 var App = require('app');
 
-App.RMHighAvailabilityWizardStep2Controller = Em.Controller.extend({
-  name:"rMHighAvailabilityWizardStep2Controller"
+App.RMHighAvailabilityWizardStep2Controller = App.WizardStep5Controller.extend({
+  name: "rMHighAvailabilityWizardStep2Controller",
+
+  loadStep: function () {
+    this._super();
+    this.hideUnusedComponents();
+  },
+
+  renderComponents: function (masterComponents) {
+    var existedRM = masterComponents.findProperty('component_name', 'RESOURCEMANAGER');
+    existedRM.isAdditional = false;
+    var additionalRM = $.extend({}, existedRM, {
+      isInstalled: false,
+      isAdditional: true,
+      selectedHost: this.get('hosts').mapProperty('host_name').without(existedRM.selectedHost)[0]
+    });
+    masterComponents.push(additionalRM);
+    this._super(masterComponents);
+  },
+
+  /**
+   * Remove service masters, that should be hidden in this wizard
+   */
+  hideUnusedComponents: function () {
+    var servicesMasters = this.get('servicesMasters');
+    servicesMasters = servicesMasters.filterProperty('component_name', 'RESOURCEMANAGER');
+    this.set('servicesMasters', servicesMasters);
+  }
 });
 

ambari-web/app/controllers/main/admin/highAvailability/resourceManager/wizard_controller.js

@@ -39,6 +39,23 @@ App.RMHighAvailabilityWizardController = App.WizardController.extend({
     });
   },
 
+  /**
+   * Load data for all steps until <code>current step</code>
+   */
+  loadAllPriorSteps: function () {
+    var step = this.get('currentStep');
+    switch (step) {
+      case '4':
+      case '3':
+      case '2':
+        this.loadServicesFromServer();
+        this.loadMasterComponentHosts();
+        this.loadConfirmedHosts();
+      case '1':
+        this.load('cluster');
+    }
+  },
+
   /**
    * Remove all loaded data.
    * Created as copy for App.router.clearAllSteps

ambari-web/app/controllers/main/service/reassign_controller.js

@@ -131,49 +131,6 @@ App.ReassignMasterController = App.WizardController.extend({
     });
   },
 
-  /**
-   * Load services data from server.
-   */
-  loadServicesFromServer: function () {
-    var services = this.getDBProperty('services');
-    if (!services) {
-      services = {
-        selectedServices: [],
-        installedServices: []
-      };
-      App.StackService.find().forEach(function(item){
-        var isInstalled = App.Service.find().someProperty('id', item.get('serviceName'));
-        item.set('isSelected', isInstalled);
-        item.set('isInstalled', isInstalled);
-        if (isInstalled) {
-          services.selectedServices.push(item.get('serviceName'));
-          services.installedServices.push(item.get('serviceName'));
-        }
-      },this);
-      this.setDBProperty('services',services);
-    } else {
-      App.StackService.find().forEach(function(item) {
-        var isSelected =   services.selectedServices.contains(item.get('serviceName'));
-        var isInstalled = services.installedServices.contains(item.get('serviceName'));
-        item.set('isSelected', isSelected);
-        item.set('isInstalled', isInstalled);
-      },this);
-    }
-    this.set('content.services', App.StackService.find());
-  },
-
-  /**
-   * Load confirmed hosts.
-   * Will be used at <code>Assign Masters(step5)</code> step
-   */
-  loadConfirmedHosts: function () {
-    var hosts = App.db.getHosts();
-
-    if (hosts) {
-      this.set('content.hosts', hosts);
-    }
-    console.log('ReassignMasterController.loadConfirmedHosts: loaded hosts', hosts);
-  },
   /**
    * Load tasks statuses for step5 of Reassign Master Wizard to restore installation
    */

ambari-web/app/controllers/wizard.js

@@ -1021,5 +1021,48 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, {
    */
   getCluster: function () {
     return jQuery.extend({}, this.get('clusterStatusTemplate'), {name: App.router.getClusterName()});
+  },
+
+  /**
+   * Load services data from server.
+   */
+  loadServicesFromServer: function () {
+    var services = this.getDBProperty('services');
+    if (!services) {
+      services = {
+        selectedServices: [],
+        installedServices: []
+      };
+      App.StackService.find().forEach(function(item){
+        var isInstalled = App.Service.find().someProperty('id', item.get('serviceName'));
+        item.set('isSelected', isInstalled);
+        item.set('isInstalled', isInstalled);
+        if (isInstalled) {
+          services.selectedServices.push(item.get('serviceName'));
+          services.installedServices.push(item.get('serviceName'));
+        }
+      },this);
+      this.setDBProperty('services',services);
+    } else {
+      App.StackService.find().forEach(function(item) {
+        var isSelected =   services.selectedServices.contains(item.get('serviceName'));
+        var isInstalled = services.installedServices.contains(item.get('serviceName'));
+        item.set('isSelected', isSelected);
+        item.set('isInstalled', isInstalled);
+      },this);
+    }
+    this.set('content.services', App.StackService.find());
+  },
+
+  /**
+   * Load confirmed hosts.
+   * Will be used at <code>Assign Masters(step5)</code> step
+   */
+  loadConfirmedHosts: function () {
+    var hosts = App.db.getHosts();
+
+    if (hosts) {
+      this.set('content.hosts', hosts);
+    }
   }
-});
+});

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

@@ -64,6 +64,14 @@ App.WizardStep5Controller = Em.Controller.extend({
    * @type {string[]}
    */
   multipleComponents: function () {
+    return App.get('components.multipleMasters');
+  }.property('App.components.multipleMasters'),
+
+  /**
+   * Master components which could be assigned to multiple hosts
+   * @type {string[]}
+   */
+  addableComponents: function () {
     return App.get('components.addableMasterInstallerWizard');
   }.property('App.components.addableMasterInstallerWizard'),
 
@@ -208,7 +216,7 @@ App.WizardStep5Controller = Em.Controller.extend({
     this.clearStep();
     this.renderHostInfo();
     this.renderComponents(this.loadComponents());
-    this.get('multipleComponents').forEach(function (componentName) {
+    this.get('addableComponents').forEach(function (componentName) {
       this.updateComponent(componentName);
     }, this);
     if (!this.get("selectedServicesMasters").filterProperty('isInstalled', false).length) {

ambari-web/app/messages.js

@@ -980,6 +980,7 @@ Em.I18n.translations = {
       'This allows for an Active-Standby ResourceManager configuration that automatically performs failover.<br/><br/>' +
       '<b>You should plan a cluster maintenance window and prepare for cluster downtime when enabling ResourceManager HA.</b>',
   'admin.rm_highAvailability.wizard.step2.header': 'Select Host',
+  'admin.rm_highAvailability.wizard.step2.body': 'Select a host that will be running the additional ResourceManager',
   'admin.rm_highAvailability.wizard.step3.header': 'Review',
   'admin.rm_highAvailability.wizard.step4.header': 'Configure Components',
 

ambari-web/app/models/stack_service_component.js

@@ -94,7 +94,7 @@ App.StackServiceComponent = DS.Model.extend({
   }.property('isShownOnInstallerAssignMasterPage','App.isHaEnabled'),
 
   isMasterWithMultipleInstances: function() {
-    var masters = ['ZOOKEEPER_SERVER', 'HBASE_MASTER', 'NAMENODE', 'JOURNALNODE'];
+    var masters = ['ZOOKEEPER_SERVER', 'HBASE_MASTER', 'NAMENODE', 'JOURNALNODE', 'RESOURCEMANAGER'];
     return masters.contains(this.get('componentName'));
   }.property('componentName'),
 
@@ -136,7 +136,7 @@ App.StackServiceComponent = DS.Model.extend({
   // default number of master hosts on Assign Master page:
   defaultNoOfMasterHosts: function() {
     var componentName = this.get('componentName');
-     if (this.get('isMasterWithMultipleInstances')) {
+     if (this.get('isMasterAddableInstallerWizard')) {
        return App.StackServiceComponent.cardinality(componentName).min;
      }
   }.property('componentName'),
@@ -145,11 +145,6 @@ App.StackServiceComponent = DS.Model.extend({
     return App.StackServiceComponent.selectionScheme(this.get('componentName'));
   }.property('componentName'),
 
-  isMasterWithMultipleInstancesHaWizard: function() {
-    var masters = ['NAMENODE', 'JOURNALNODE'];
-    return masters.contains(this.get('componentName'));
-  }.property('componentName'),
-
   // components that are co-hosted with this component
   coHostedComponents: function() {
     var componentName = this.get('componentName');

ambari-web/app/routes/rm_high_availability_routes.js

@@ -93,6 +93,7 @@ module.exports = App.WizardRoute.extend({
       var controller = router.get('rMHighAvailabilityWizardController');
       controller.setCurrentStep('2');
       controller.dataLoading().done(function () {
+        controller.loadAllPriorSteps();
         controller.connectOutlet('rMHighAvailabilityWizardStep2', controller.get('content'));
       })
     },

ambari-web/app/styles/application.less

@@ -6581,3 +6581,9 @@ i.icon-asterisks {
     overflow-y: scroll;
   }
 }
+
+#rm-ha-wizard {
+  .rm-host-select {
+    width: 95%;
+  }
+}

ambari-web/app/templates/main/admin/highAvailability/resourceManager/step2.hbs

@@ -15,10 +15,78 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 }}
-<div>
-  <h2>{{t admin.rm_highAvailability.wizard.step2.header}}</h2>
+<h2>{{t admin.rm_highAvailability.wizard.step2.header}}</h2>
+<div class="alert alert-info">
+  {{t admin.rm_highAvailability.wizard.step2.body}}
+</div>
+{{#if controller.isLoaded}}
+  <div class="assign-masters row-fluid">
+    <div class="select-hosts span7">
+      <div class="row-fluid">
+        <div class="clearfix"></div>
+        <div class="row-fluid">
+          <div class="span12 control-group">
+            <form class="form-horizontal" autocomplete="off">
+              <!-- View for array controller -->
+              {{#each servicesMasters}}
+                <div class="row-fluid">
+                  <div class="span5">
+                    <div class="control-group">
+                      <label class="pts pull-right">
+                        {{#if isAdditional}}
+                          {{t common.additional}}
+                        {{else}}
+                          {{t common.current}}
+                        {{/if}}
+                        {{display_name}}:
+                      </label>
+                    </div>
+                  </div>
+                  <div class="span7">
+                    <div class="control-group">
+                      {{#if view.shouldUseInputs}}
+                        {{view App.InputHostView
+                        componentBinding="this"
+                        disabledBinding="isInstalled" }}
+                      {{else}}
+                        {{view App.SelectHostView
+                        componentBinding="this"
+                        class="rm-host-select"
+                        disabledBinding="isInstalled"
+                        optionValuePath="content.host_name"
+                        optionLabelPath="content.host_info" }}
+                      {{/if}}
+                    </div>
+                  </div>
+                </div>
+              {{/each}}
+            </form>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="host-assignments span5">
+      {{#each masterHostMapping}}
+        <div class="mapping-box round-corners well">
+          <div class="hostString"><span>{{hostInfo}}</span></div>
+          {{#each masterServicesToDisplay}}
+            <span {{bindAttr class="isInstalled:assignedService:newService :round-corners"}}>{{display_name}}</span>
+          {{/each}}
+        </div>
+      {{/each}}
 
-  <div class="btn-area">
-    <a class="btn btn-success pull-right" {{action next}}>{{t common.next}} &rarr;</a>
+      {{#if remainingHosts}}
+        <div class="remaining-hosts round-corners well">
+          <span><strong>{{remainingHosts}}</strong> {{t installer.step5.attention}}</span></div>
+      {{/if}}
+    </div>
+    <div class="clearfix"></div>
   </div>
+{{else}}
+  <div class="spinner"></div>
+{{/if}}
+<div class="btn-area">
+  <a class="btn btn-success pull-right" {{bindAttr disabled="submitDisabled"}} {{action submit target="controller"}}>{{t common.next}} &rarr;</a>
 </div>
+

ambari-web/app/templates/main/admin/highAvailability/resourceManager/wizard.hbs

@@ -16,7 +16,7 @@
 * limitations under the License.
 }}
 
-<div class="wizard">
+<div id="rm-ha-wizard" class="wizard">
   <div class="container">
     <div class="container-fluid">
       <div class="row-fluid">

ambari-web/app/views/main/admin/highAvailability/resourceManager/step2_view.js

@@ -19,7 +19,7 @@
 
 var App = require('app');
 
-App.RMHighAvailabilityWizardStep2View = Em.View.extend({
+App.RMHighAvailabilityWizardStep2View = App.WizardStep5View.extend({
 
   templateName: require('templates/main/admin/highAvailability/resourceManager/step2')