AMBARI-1059. Refactor cluster management. (yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/AMBARI-666@1418999 13f79535-47bb-0310-9956-ffa450edef68

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

@@ -36,11 +36,6 @@ App.WizardStep2Controller = Em.Controller.extend({
     return this.get('content.localRepo');
   }.property('content.localRepo'),
 
-
-  localRepoPath: function () {
-    return this.get('content.localRepoPath');
-  }.property('content.localRepoPath'),
-
   sshKey: function () {
     return this.get('content.sshKey');
   }.property('content.sshKey'),
@@ -92,18 +87,6 @@ App.WizardStep2Controller = Em.Controller.extend({
     return null;
   }.property('sshKey', 'manualInstall', 'hasSubmitted'),
 
-  localRepoError: function () {
-    if (
-       // (typeof this.get('localRepoPath') === 'undefined') ||
-        !(/^([-a-z0-9._\/]|%[0-9a-f]{2})*$/i.test(this.get('localRepoPath')) ) ||
-        (this.get('hasSubmitted') && this.get('localRepo') && this.get('localRepoPath').trim() === '' )
-       )
-    {
-      return Em.I18n.t('installer.step2.localRepo.error.required');
-    }
-    return null;
-  }.property('localRepo', 'localRepoPath', 'hasSubmitted'),
-
   /**
    * Get host info, which will be saved in parent controller
    */
@@ -183,7 +166,7 @@ App.WizardStep2Controller = Em.Controller.extend({
   },
 
   isSubmitDisabled: function () {
-    return (this.get('hostsError') || this.get('sshKeyError') || this.get('localRepoError'));
-  }.property('hostsError', 'sshKeyError', 'localRepoError')
+    return (this.get('hostsError') || this.get('sshKeyError'));
+  }.property('hostsError', 'sshKeyError')
 
 });

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

@@ -50,7 +50,14 @@ App.WizardStep3Controller = Em.Controller.extend({
       }
     } else {
       this.set('bootHosts', this.get('hosts'));
-      this.isHostsRegistered();
+      if (App.testMode && App.skipBootstrap) {
+        this.get('bootHosts').setEach('bootStatus', 'REGISTERED');
+        this.get('bootHosts').setEach('cpu', '2');
+        this.get('bootHosts').setEach('memory', '2000000');
+        this.getHostInfo();
+      } else {
+        this.isHostsRegistered();
+      }
     }
   },
 
@@ -258,12 +265,7 @@ App.WizardStep3Controller = Em.Controller.extend({
       timeout: App.timeout,
       success: function (data) {
         console.log('registration attempt #' + self.get('registrationAttempts'));
-        var jsonData;
-        if (App.testMode === true) {
-          jsonData = data;
-        } else {
-          jsonData = jQuery.parseJSON(data);
-        }
+        var jsonData = App.testMode ? data : jQuery.parseJSON(data);
         if (!jsonData) {
           console.log("Error: jsonData is null");
           return;
@@ -348,12 +350,7 @@ App.WizardStep3Controller = Em.Controller.extend({
       contentType: 'application/json',
       timeout: App.timeout,
       success: function (data) {
-        var jsonData;
-        if (App.testMode) {
-          jsonData = data;
-        } else {
-          jsonData = jQuery.parseJSON(data);
-        }
+        var jsonData = App.testMode ? data : jQuery.parseJSON(data);
         hosts.forEach(function (_host) {
           var host = jsonData.items.findProperty('Hosts.host_name', _host.name);
           if (host) {

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

@@ -99,6 +99,19 @@ App.WizardStep8Controller = Em.Controller.extend({
     }, this);
     return uiConfig;
   },
+
+  getRegisteredHosts: function() {
+    var allHosts = this.get('content.hostsInfo');
+    var hosts = [];
+    for (var hostName in allHosts) {
+      if (allHosts[hostName].bootStatus == 'REGISTERED') {
+        allHosts[hostName].hostName = allHosts[hostName].name;
+        hosts.pushObject(allHosts[hostName]);
+      }
+    }
+    return hosts;
+  },
+
   /**
    * Set all site property that are derived from other puppet-variable
    */
@@ -604,26 +617,26 @@ App.WizardStep8Controller = Em.Controller.extend({
 
     this.set('isSubmitDisabled', true);
 
-    if (App.testMode) {
-      App.router.send('next');
-      return;
-    }
-
-    if (!this.get('content.cluster.requestId')) {
+    if (App.testMode || !this.get('content.cluster.requestId')) {
       this.createCluster();
       this.createSelectedServices();
       this.createConfigurations();
       this.applyCreatedConfToServices();
       this.createComponents();
       this.registerHostsToCluster();
-      this.createHostComponents();
+      this.createAllHostComponents();
     }
 
     App.router.send('next');
   },
 
+  clusterName: function() {
+    return this.get('content.cluster.name');
+  }.property('content.cluster.name'),
 
-  /* Following create* functions are called on submitting step8 */
+  /**
+   *  The following create* functions are called upon submitting Step 8.
+   */
 
   createCluster: function () {
 
@@ -631,21 +644,22 @@ App.WizardStep8Controller = Em.Controller.extend({
       return false;
     }
 
-    var clusterName = this.get('clusterInfo').findProperty('config_name', 'cluster').config_value;
-    var url = App.apiPrefix + '/clusters/' + clusterName;
+    var url = App.apiPrefix + '/clusters/' + this.get('clusterName');
+
+    var stackVersion = (App.db.getSoftRepo().repoType == 'local') ? App.defaultStackVersion + '-local' : App.defaultStackVersion;
+
     $.ajax({
       type: 'POST',
       url: url,
       async: false,
       //accepts: 'text',
       dataType: 'text',
-      data: '{"Clusters": {"version" : "HDP-1.2.0"}}',
+      data: JSON.stringify({ "Clusters": {"version" : stackVersion }}),
       timeout: App.timeout,
       success: function (data) {
         var jsonData = jQuery.parseJSON(data);
         console.log("TRACE: STep8 -> In success function for createCluster call");
         console.log("TRACE: STep8 -> value of the received data is: " + jsonData);
-
       },
 
       error: function (request, ajaxOptions, error) {
@@ -660,8 +674,8 @@ App.WizardStep8Controller = Em.Controller.extend({
   },
 
   createSelectedServices: function (service, httpMethod) {
-    var clusterName = this.get('clusterInfo').findProperty('config_name', 'cluster').config_value;
-    var url = App.apiPrefix + '/clusters/' + clusterName + '/services';
+
+    var url = App.apiPrefix + '/clusters/' + this.get('clusterName') + '/services';
     var data = this.createServiceData();
     var httpMethod = 'POST';
     $.ajax({
@@ -706,10 +720,10 @@ App.WizardStep8Controller = Em.Controller.extend({
       var componentsData = components.map(function (_component) {
         return { "ServiceComponentInfo": { "component_name": _component.component_name } };
       });
-      var clusterName = this.get('clusterInfo').findProperty('config_name', 'cluster').config_value;
+
       // Service must be specified in terms of a query for creating multiple components at the same time.
       // See AMBARI-1018.
-      var url = App.apiPrefix + '/clusters/' + clusterName + '/services?ServiceInfo/service_name=' + _service;
+      var url = App.apiPrefix + '/clusters/' + this.get('clusterName') + '/services?ServiceInfo/service_name=' + _service;
       var data = {
         "components": componentsData
       }
@@ -738,11 +752,12 @@ App.WizardStep8Controller = Em.Controller.extend({
 
   },
 
-  registerHostsToCluster: function (hostName) {
-    var clusterName = this.get('clusterInfo').findProperty('config_name', 'cluster').config_value;
-    var url = App.apiPrefix + '/clusters/' + clusterName + '/hosts';
+  registerHostsToCluster: function () {
+
+    var url = App.apiPrefix + '/clusters/' + this.get('clusterName') + '/hosts';
     var data = this.createRegisterHostData();
-    if(data.length == 0){
+
+    if (data.length == 0) {
       return;
     }
 
@@ -771,115 +786,90 @@ App.WizardStep8Controller = Em.Controller.extend({
   },
 
   createRegisterHostData: function () {
-    var allHosts = this.get('content.hostsInfo');
-    var data = [];
-    for (var hostName in allHosts) {
-      if (!allHosts[hostName].isInstalled && allHosts[hostName].bootStatus == 'REGISTERED') {
-        data.pushObject({"Hosts": { "host_name": hostName}});
+    return this.getRegisteredHosts().map(function(host) {
+      if (!host.isInstalled) {
+        return {"Hosts": { "host_name": host.hostName}};
       }
-    }
-    return data;
+    });
   },
 
-  createHostComponents: function () {
-    //TODO: Uncomment following after hooking up with all services.
+  // TODO: review the code for add hosts / add services scenarios...
+  createAllHostComponents: function () {
 
     var masterHosts = this.get('content.masterComponentHosts');
     var slaveHosts = this.get('content.slaveComponentHosts');
     var clients = this.get('content.clients');
-    var allHosts = this.get('content.hostsInfo');
-    var slaveClient = slaveHosts.filterProperty('componentName', "CLIENT").objectAt(0);
+    var clientHosts = slaveHosts.filterProperty('componentName', "CLIENT").objectAt(0).hosts;
 
-    masterHosts.forEach(function (_masterHost) {
-      this.createHostComponent(_masterHost);
-    }, this);
+    // note: masterHosts has 'component' vs slaveHosts has 'componentName'
+    var masterComponents = masterHosts.mapProperty('component').uniq();
 
-    masterHosts.filterProperty('component', 'HBASE_MASTER').filterProperty('isInstalled', false).forEach(function (_masterHost) {
-      var hosts = slaveClient.hosts.filterProperty("hostName", _masterHost.hostName);
-      if (!hosts.length) {
-        var slaveObj = {};
-        slaveObj.component = "HDFS_CLIENT";
-        slaveObj.hostName = _masterHost.hostName;
-        slaveObj.isInstalled = false;
-        this.createHostComponent(slaveObj);
-      }
-    }, this);
-
-    masterHosts.filterProperty('component', 'HIVE_SERVER').filterProperty('isInstalled', false).forEach(function (_masterHost) {
-      var hosts = slaveClient.hosts.filterProperty("hostName", _masterHost.hostName);
-      if (!hosts.length) {
-        var slaveObj = {};
-        slaveObj.component = "MAPREDUCE_CLIENT";
-        slaveObj.hostName = _masterHost.hostName;
-        slaveObj.isInstalled = false;
-        this.createHostComponent(slaveObj);
-      }
-    }, this);
-
-    masterHosts.filterProperty('component', 'OOZIE_SERVER').filterProperty('isInstalled', false).forEach(function (_masterHost) {
-      var hosts = slaveClient.hosts.filterProperty("hostName", _masterHost.hostName);
-      if (!hosts.length) {
-        var slaveObj = {};
-        slaveObj.component = "MAPREDUCE_CLIENT";
-        slaveObj.hostName = _masterHost.hostName;
-        slaveObj.isInstalled = false;
-        this.createHostComponent(slaveObj);
-      }
-    }, this);
-
-
-    slaveHosts.filterProperty('componentName', "HBASE_REGIONSERVER").forEach(function (slave) {
-      slave.hosts.forEach(function (_slaveHost) {
-        var hosts = slaveClient.hosts.filterProperty('hostName', _slaveHost.hostName);
-        if (!hosts.length) {
-          var slaveObj = {};
-          slaveObj.component = "HDFS_CLIENT";
-          slaveObj.hostName = _slaveHost.hostName;
-          slaveObj.isInstalled = false;
-          this.createHostComponent(slaveObj);
-        }
-      }, this)
+    masterComponents.forEach(function(component) {
+      var hostNames = masterHosts.filterProperty('component', component).filterProperty('isInstalled', false).mapProperty('hostName');
+      this.registerHostsToComponent(hostNames, component);
     }, this);
 
-    slaveHosts.forEach(function (_slaveHosts) {
-      var slaveObj = {};
-      if (_slaveHosts.componentName !== 'CLIENT') {
-        slaveObj.component = _slaveHosts.componentName;
-        _slaveHosts.hosts.forEach(function (_slaveHost) {
-          slaveObj.hostName = _slaveHost.hostName;
-          slaveObj.isInstalled = _slaveHost.isInstalled;
-          this.createHostComponent(slaveObj);
-        }, this);
+    slaveHosts.forEach(function (_slave) {
+      if (_slave.componentName !== 'CLIENT') {
+        var hostNames = _slave.hosts.filterProperty('isInstalled', false).mapProperty('hostName');
+        this.registerHostsToComponent(hostNames, _slave.componentName);
       } else {
-        //: todo
         this.get('content.clients').forEach(function (_client) {
-          slaveObj.component = _client.component_name;
-          _slaveHosts.hosts.forEach(function (_slaveHost) {
-            slaveObj.hostName = _slaveHost.hostName;
-            slaveObj.isInstalled = _slaveHost.isInstalled && _client.isInstalled;
-            this.createHostComponent(slaveObj);
-          }, this);
+          if (!_client.isInstalled) {
+            var hostNames = clientHosts.mapProperty('hostName').splice(0);
+            switch (_client.component_name) {
+              case 'HDFS_CLIENT':
+                // install HDFS_CLIENT on HBASE_MASTER and HBASE_REGIONSERVER hosts
+                masterHosts.filterProperty('component', 'HBASE_MASTER').filterProperty('isInstalled', false).forEach(function (_masterHost) {
+                  hostNames.pushObject(_masterHost.hostName);
+                }, this);
+                masterHosts.filterProperty('component', 'HBASE_REGIONSERVER').filterProperty('isInstalled', false).forEach(function (_masterHost) {
+                  hostNames.pushObject(_masterHost.hostName);
+                }, this);
+                break;
+              case 'MAPREDUCE_CLIENT':
+                // install MAPREDUCE_CLIENT on HIVE_SERVER and OOZIE_SERVER hosts
+                masterHosts.filterProperty('component', 'HIVE_SERVER').filterProperty('isInstalled', false).forEach(function (_masterHost) {
+                  hostNames.pushObject(_masterHost.hostName);
+                }, this);
+                masterHosts.filterProperty('component', 'OOZIE_SERVER').filterProperty('isInstalled', false).forEach(function (_masterHost) {
+                  hostNames.pushObject(_masterHost.hostName);
+                }, this);
+               break;
+            }
+            hostNames = hostNames.uniq();
+            this.registerHostsToComponent(hostNames, _client.component_name);
+          }
         }, this);
       }
     }, this);
 
-    // add Ganglia Monitor (Slave) to all hosts if Ganglia is selected
+    // add Ganglia Monitor (Slave) to all hosts if Ganglia service is selected
     if (this.get('selectedServices').someProperty('serviceName', 'GANGLIA')) {
-      for (var hostName in allHosts) {
-        // TODO: filter for only confirmed hosts?
-        this.createHostComponent({ hostName: hostName, component: 'GANGLIA_MONITOR'});
-      }
+      var hosts = this.getRegisteredHosts().filterProperty('isInstalled', false);
+      this.registerHostsToComponent(hosts.mapProperty('hostName'), 'GANGLIA_MONITOR');
     }
   },
 
-  createHostComponent: function (hostComponent) {
-    console.log('try to install', hostComponent.component, 'on host', hostComponent.hostName, 'isInstalled', hostComponent.isInstalled);
-    if (hostComponent.isInstalled) {
-      return false;
+  registerHostsToComponent: function (hostNames, componentName) {
+
+    if (hostNames.length == 0) {
+      return;
     }
+    console.log('registering ' + componentName + ' to ' + JSON.stringify(hostNames));
 
-    var clusterName = this.get('clusterInfo').findProperty('config_name', 'cluster').config_value;
-    var url = App.apiPrefix + '/clusters/' + clusterName + '/hosts/' + hostComponent.hostName + '/host_components/' + hostComponent.component;
+    var hostsPredicate = hostNames.map(function(hostName) {
+      return 'Hosts/host_name=' + hostName;
+    }).join('|');
+
+    var url = App.apiPrefix + '/clusters/' + this.get('clusterName') + '/hosts?' + hostsPredicate;
+    var data = {
+      "host_components": [{
+        "HostRoles": {
+          "component_name": componentName
+        }
+      }]
+    };
 
     $.ajax({
       type: 'POST',
@@ -887,6 +877,7 @@ App.WizardStep8Controller = Em.Controller.extend({
       async: false,
       dataType: 'text',
       timeout: App.timeout,
+      data: JSON.stringify(data),
       success: function (data) {
         var jsonData = jQuery.parseJSON(data);
         console.log("TRACE: STep8 -> In success function for the createComponent with new host call");
@@ -927,8 +918,8 @@ App.WizardStep8Controller = Em.Controller.extend({
 
   createConfigSite: function (data) {
     console.log("Inside createConfigSite");
-    var clusterName = this.get('clusterInfo').findProperty('config_name', 'cluster').config_value;
-    var url = App.apiPrefix + '/clusters/' + clusterName + '/configurations';
+
+    var url = App.apiPrefix + '/clusters/' + this.get('clusterName') + '/configurations';
     $.ajax({
       type: 'POST',
       url: url,
@@ -1054,8 +1045,8 @@ App.WizardStep8Controller = Em.Controller.extend({
 
   applyCreatedConfToService: function (service, httpMethod, data) {
     console.log("Inside applyCreatedConfToService");
-    var clusterName = this.get('clusterInfo').findProperty('config_name', 'cluster').config_value;
-    var url = App.apiPrefix + '/clusters/' + clusterName + '/services/' + service;
+
+    var url = App.apiPrefix + '/clusters/' + this.get('clusterName') + '/services/' + service;
 
     $.ajax({
       type: httpMethod,

ambari-web/app/data/config_properties.js

@@ -1394,7 +1394,7 @@ module.exports =
       "name": "rca_enabled",
       "displayName": "Enable RCA",
       "description": "Enable RCA",
-      "defaultValue": true,
+      "defaultValue": false,
       "isReconfigurable": true,
       "displayType": "checkbox",
       "isVisible": true,

ambari-web/app/initialize.js

@@ -23,6 +23,7 @@ App.testMode = false;
 App.skipBootstrap = false;
 App.alwaysGoToInstaller = false;
 App.apiPrefix = '/api/v1';
+App.defaultStackVersion = 'HDP-1.2.0';
 // default AJAX timeout
 App.timeout = 20000;
 App.bgOperationsUpdateInterval = 6000;

ambari-web/app/templates/wizard/step2.hbs

@@ -120,12 +120,6 @@
       <div class="alert alert-info">
         {{t installer.step2.localRepo.info}}
       </div>
-      <div class="controls">
-        {{view Ember.TextField type="text" class="span6" placeholder="Local repo file path (e.g., /etc/yum/repos.d/hdp)" valueBinding="content.localRepoPath"}}
-        {{#if localRepoError}}
-        <p class="help-inline">{{localRepoError}}</p>
-        {{/if}}
-      </div>
     </div>
     {{/if}}
   </div>

ambari-web/app/views/wizard/step3_view.js

@@ -48,7 +48,8 @@ App.WizardHostView = Em.View.extend({
   }.property(),
 
   isRetryable: function() {
-    return ['FAILED'].contains(this.get('hostInfo.bootStatus'));
+    // return ['FAILED'].contains(this.get('hostInfo.bootStatus'));
+    return false;
   }.property('hostInfo.bootStatus')
 
 });