AMBARI-1061. Data loading refactoring for cluster management. (yusaku)

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

AMBARI-666-CHANGES.txt

@@ -398,6 +398,8 @@ AMBARI-666 branch (unreleased changes)
 
   IMPROVEMENTS
 
+  AMBARI-1061. Data loading refactoring for cluster management. (yusaku)
+
   AMBARI-1060. Data loading for App Browser. (yusaku)
 
   AMBARI-993. Hook up login with server authentication. (yusaku)

ambari-web/app/controllers/cluster_controller.js

@@ -37,6 +37,7 @@ App.ClusterController = Em.Controller.extend({
     'jobs': false,
     'runs': false,
     'services': false,
+    'components': false,
     'cluster' : false
   }),
   /**
@@ -105,6 +106,11 @@ App.ClusterController = Em.Controller.extend({
         self.set('dataLoadList.services', true);
       }
     });
+    /*App.HttpClient.get(servicesUrl, App.componentsMapper,{
+      complete:function(jqXHR, textStatus){
+        self.set('dataLoadList.components', true);
+      }
+    });*/
   }.observes('clusterName'),
   clusterName: function(){
     return (this.get('cluster')) ? this.get('cluster').Clusters.cluster_name : 'mycluster';

ambari-web/app/controllers/main/dashboard.js

@@ -22,7 +22,7 @@ App.MainDashboardController = Em.Controller.extend({
   name:'mainDashboardController',
   alerts: App.Alert.find(),
   data: {
-    hdfs:{
+    HDFS:{
       "namenode_addr":"namenode:50070",
       "secondary_namenode_addr":"snamenode:50090",
       "namenode_starttime":1348935028,
@@ -45,7 +45,7 @@ App.MainDashboardController = Em.Controller.extend({
       "namenode_heap_used":63365113856,
       "namenode_heap_total": 163365113856
     },
-    mapreduce: {
+    MAPREDUCE: {
       "jobtracker_addr": "jobtracker:50030",
       "jobtracker_starttime": 1348935243,
       "running_jobs": 1,
@@ -86,6 +86,10 @@ App.MainDashboardController = Em.Controller.extend({
   },
 
   services:function(){
+
+    /* TODO: create Lasy loading
+    setTimeout(function(){console.log(App.Service.find().objectAt(0).get("id"))}, 20);
+    */
     return App.router.get('mainServiceController.content');
   }.property('App.router.mainServiceController.content'),
   alertsFilteredBy: 'All',

ambari-web/app/initialize.js

@@ -33,6 +33,7 @@ require('router');
 
 require('mappers/server_data_mapper');
 require('mappers/services_mapper');
+require('mappers/components_mapper');
 require('mappers/hosts_mapper');
 require('mappers/cluster_mapper');
 require('mappers/jobs_mapper');

ambari-web/app/mappers/components_mapper.js

@@ -0,0 +1,29 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+App.componentsMapper = App.QuickDataMapper.create({
+  model : App.Component,
+  config : {
+    id : 'ServiceComponentInfo.component_name',
+    component_name : 'ServiceComponentInfo.component_name',
+    label : 'ServiceComponentInfo.component_name',
+    service_id: 'ServiceComponentInfo.service_name',
+    host_id: 'host_components[0].HostRoles.host_name',
+    $work_status: 'true'
+  }
+});

ambari-web/app/mappers/server_data_mapper.js

@@ -44,9 +44,19 @@ App.QuickDataMapper = App.ServerDataMapper.extend({
     if(!this.get('model')) {return;}
     if(json.items){
       var result = [];
-      json.items.forEach(function(item){
-        result.push(this.parseIt(item, this.config));
-    }, this)
+      if(this.get('model') != "App.Component" ){
+        json.items.forEach(function(item){
+          result.push(this.parseIt(item, this.config));
+        }, this)
+      }else{
+        json.items.forEach(function(item){
+          item.components.forEach(function(component){
+           // debugger;
+            result.push(this.parseIt(component, this.config));
+          }, this)
+        }, this)
+      }
+      //console.log(this.get('model') ,result);
     App.store.loadMany(this.get('model'), result);
     }
   },

ambari-web/app/mappers/services_mapper.js

@@ -15,54 +15,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
-App.servicesMapper = App.ServerDataMapper.create({
-  map: function (json) {
-    if (json.items) {
-      json.items.forEach(function (data) {
-        if (data.ServiceInfo) {
-          var service = App.store.createRecord(App.Service, {
-            id: data.ServiceInfo.service_name.toLowerCase(),
-            serviceName: data.ServiceInfo.service_name.toLowerCase()
-          });
 
-          if (data.components) {
-            var components = service.get('components');
-            $.each(data.components, function (i, _component) {
-              if (_component.ServiceComponentInfo) {
-                var component = App.store.createRecord(App.ServiceComponent, {
-                  id: _component.ServiceComponentInfo.component_name,
-                  componentName: _component.ServiceComponentInfo.component_name
-                });
-                components.pushObject(component);
-
-                if (_component.host_components) {
-                  var hostComponents = component.get('hostComponents');
-                  $.each(_component.host_components, function (j, _hostComponent) {
-                    var _hostRoles = _hostComponent.HostRoles;
-                    var hostComponent = App.store.createRecord(App.HostComponent, {
-                      hostComponentId: _hostRoles.component_name + ":" + _hostRoles.host_name,
-                      host: App.Host.find(_hostRoles.host_name),
-                      hostName: _hostRoles.host_name,
-                      state: _hostRoles.state
-                    });
-                    hostComponents.pushObject(hostComponent);
-                  });
-                }
-              }
-            });
-          }
-        }
-      });
-    }
-  }
-});
-*/
 App.servicesMapper = App.QuickDataMapper.create({
-  model : App.Service1,
+  model : App.Service,
   config : {
     id : 'ServiceInfo.service_name',
     service_name : 'ServiceInfo.service_name',
+    label : 'ServiceInfo.service_name',
+    $health_status: 'LIVE',
+    $work_status: 'true',
+    $serviceAudit: [1, 2, 3],
     components_key : 'components',
     components : {
         id : 'ServiceComponentInfo.component_name',

ambari-web/app/models.js

@@ -24,6 +24,7 @@ require('models/authentication');
 require('models/cluster');
 require('models/hosts');
 require('models/service');
+require('models/component');
 require('models/service_config');
 require('models/service_audit');
 require('models/service_metrics');

ambari-web/app/models/component.js

@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+var App = require('app');
+
+App.Component = DS.Model.extend({
+  componentName:DS.attr('string'),
+  label:DS.attr('string'),
+  type:DS.attr('boolean'),
+  service:DS.belongsTo('App.Service'),
+  host:DS.belongsTo('App.Host'),
+  workStatus:DS.attr('string'),
+  isMaster:function () {
+    return this.get('type');
+  }.property('type'),
+  isSlave:function () {
+    return !this.get('type');
+  }.property('type'),
+  // checkedForHostFilter: true // this is for host page to set checkboxes checked
+  decommissioned: DS.attr('boolean')
+});
+
+App.Component.Status = {
+  started:"STARTED",
+  starting:"STARTING",
+  stopped:"STOPPED",
+  stopping:"STOPPING"
+}
+
+App.Component.FIXTURES = [];*/

ambari-web/app/models/protoRelations.js

@@ -18,14 +18,18 @@
 
 var App = require('app');
 
-App.Service1 = DS.Model.extend({
-  //primaryKey : 'serviceName',
+App.Service = DS.Model.extend({
   serviceName: DS.attr('string'),
-  description: DS.attr('string'),
-  components: DS.hasMany('App.Service1Component', { embedded: true }),
-
+  serviceAudit:DS.hasMany('App.ServiceAudit'),
+  label:DS.attr('string'),//
+  healthStatus:DS.attr('string'),
+  workStatus:DS.attr('boolean'),//
+  alerts:DS.hasMany('App.Alert'),
+  quickLinks:DS.hasMany('App.QuickLinks'),
+  components: DS.hasMany('App.ServiceComponent', { embedded: true }),
+  //components:DS.hasMany('App.Component'),
   displayName: function() {
-    switch (this.get('serviceName').toLowerCase()) {
+    switch (this.get('serviceName')) {
       case 'hdfs':
         return 'HDFS';
       case 'mapreduce':
@@ -53,14 +57,14 @@ App.Service1 = DS.Model.extend({
   }.property('serviceName')
 });
 
-App.Service1.Health = {
+App.Service.Health = {
   live:"LIVE",
   dead:"DEAD",
   start:"STARTING",
   stop:"STOPPING"
 };
 
-App.Service1Component = DS.Model.extend({
+App.ServiceComponent = DS.Model.extend({
   componentName: DS.attr('string'),
   hostComponents: DS.hasMany('App.HostComponent1'),
   service: DS.belongsTo('App.Service1'),
@@ -91,7 +95,7 @@ App.Service1Component = DS.Model.extend({
   }.property('componentName')
 });
 
-App.HostComponent1 = DS.Model.extend({
+App.HostComponent = DS.Model.extend({
   primaryKey: 'hostComponentId',
   hostComponentId: DS.attr('string'), // component_name + host_name
   state: DS.attr('string'),
@@ -99,9 +103,108 @@ App.HostComponent1 = DS.Model.extend({
   hostName: DS.attr('string')
 });
 
+App.QuickLinks = DS.Model.extend({
+  label:DS.attr('string'),
+  url:DS.attr('string')
+});
+
+App.QuickLinks.FIXTURES = [
+  {
+    id:1,
+    label:'NameNode UI',
+    url:'http://%@:50070/dfshealth.jsp'
+  },
+  {
+    id:2,
+    label:'NameNode logs',
+    url:'http://%@:50070/logs'
+  },
+  {
+    id:3,
+    label:'NameNode JMX',
+    url:'http://%@:50070/jmx'
+  },
+  {
+    id:4,
+    label:'Thread Stacks',
+    url:'http://%@:50070/stacks'
+  },
+  {
+    id:5,
+    label:'JobTracker UI',
+    url:'http://%@:50030/jobtracker.jsp'
+  },
+  {
+    id:6,
+    label:'Scheduling Info',
+    url:'http://%@:50030/scheduler'
+  },
+  {
+    id:7,
+    label:'Running Jobs',
+    url:'http://%@:50030/jobtracker.jsp#running_jobs'
+  },
+  {
+    id:8,
+    label:'Retired Jobs',
+    url:'http://%@:50030/jobtracker.jsp#retired_jobs'
+  },
+  {
+    id:9,
+    label:'JobHistory Server',
+    url:'http://%@:51111/jobhistoryhome.jsp'
+  },
+  {
+    id:10,
+    label:'JobTracker Logs',
+    url:'http://%@:50030/logs'
+  },
+  {
+    id:11,
+    label:'HBase Master UI',
+    url:'http://%@:60010/master-status'
+  },
+  {
+    id:12,
+    label:'HBase Logs',
+    url:'http://%@:60010/logs'
+  },
+  {
+    id:13,
+    label:'Zookeeper Info',
+    url:'http://%@:60010/zk.jsp'
+  },
+  {
+    id:14,
+    label:'HBase Master JMX',
+    url:'http://%@:60010/jmx'
+  },
+  {
+    id:15,
+    label:'Debug Dump',
+    url:'http://%@:60010/dump'
+  },
+  {
+    id:16,
+    label:'Thread Stacks',
+    url:'http://%@:60010/stacks'
+  },
+  {
+    id:17,
+    label:'JobTracker JMX',
+    url:'http://%@:50030/jmx'
+  },
+  {
+    id:18,
+    label:'Thread Stacks',
+    url:'http://%@:50030/stacks'
+  }
+];
+
+
 // A hack to allow App.<model>.find() with the DS.FixtureAdapter
-App.Service1.FIXTURES = [];
-App.Service1Component.FIXTURES = [];
-App.HostComponent1.FIXTURES = [];
+App.Service.FIXTURES = [];
+App.ServiceComponent.FIXTURES = [];
+App.HostComponent.FIXTURES = [];
 
 

ambari-web/app/models/service.js

@@ -19,41 +19,7 @@
 
 var App = require('app');
 
-App.ServiceInfo = Ember.Object.extend({
-  elementId:'service',
-  serviceName:'',
-  displayName:'',
-  isMaster:'',
-  isClient:'',
-  isDisabled:'',
-  isHidden:'',
-  isSelected:'true',
-  description:''
-});
-
-/*App.User = Em.Object.extend({
- username: null
- });*/
-
-App.ServiceModel = Em.Object.extend({
-  name:null,
-  components:[]
-});
-
-// uncomment if column names are camelized in JSON (or fixture), rather than _ separated
-/*
- DS.Model.reopen({
- namingConvention: {
- keyToJSONKey: function(key) {
- return key;
- },
 
- foreignKey: function(key) {
- return key;
- }
- }
- });
- */
 
 
 App.Component = DS.Model.extend({
@@ -155,7 +121,7 @@ App.Component.FIXTURES = [
     work_status:App.Component.Status.started
   }
 ];
-
+/*
 App.Service = DS.Model.extend({
   serviceName:DS.attr('string'),
   label:DS.attr('string'),
@@ -174,162 +140,4 @@ App.Service.Health = {
   stop:"STOPPING"
 }
 
-App.Service.FIXTURES = [
-  {
-    id:1,
-    service_name:'hdfs',
-    label:'HDFS',
-    components:[1, 2, 3],
-    service_audit:[1, 2, 3],
-    health_status:App.Service.Health.live,
-    work_status:true,
-    alerts:[1, 2],
-    quick_links:[1, 2, 3, 4]
-  },
-  {
-    id:2,
-    service_name:'mapreduce',
-    label:'MapReduce',
-    components:[4, 5],
-    service_audit:[4, 5, 6],
-    health_status:App.Service.Health.start,
-    work_status:true,
-    alerts:[3, 4],
-    quick_links:[5, 6, 7, 8, 9, 10, 17, 18]
-  },
-  {
-    id:3,
-    service_name:'hbase',
-    label:'HBase',
-    components:[6, 7],
-    health_status:App.Service.Health.dead,
-    work_status:false,
-    alerts:[5, 6],
-    quick_links:[11, 12, 13, 14, 15, 16]
-  },
-  {
-    id:4,
-    service_name:'zookeeper',
-    label:'ZooKeeper',
-    health_status:App.Service.Health.stop,
-    work_status:false,
-    components:[1, 2, 3],
-    alerts:[7, 8]
-  },
-  {
-    id:5,
-    service_name:'oozie',
-    label:'Oozie',
-    health_status:App.Service.Health.dead,
-    work_status:false,
-    components:[8],
-    alerts:[9, 10]
-  },
-  {
-    id:6,
-    service_name:'hive',
-    label:'Hive + HCatalog',
-    health_status:App.Service.Health.dead,
-    work_status:false,
-    components:[5],
-    alerts:[11, 12]
-  }
-];
-
-App.QuickLinks = DS.Model.extend({
-  label:DS.attr('string'),
-  url:DS.attr('string')
-});
-
-App.QuickLinks.FIXTURES = [
-  {
-    id:1,
-    label:'NameNode UI',
-    url:'http://%@:50070/dfshealth.jsp'
-  },
-  {
-    id:2,
-    label:'NameNode logs',
-    url:'http://%@:50070/logs'
-  },
-  {
-    id:3,
-    label:'NameNode JMX',
-    url:'http://%@:50070/jmx'
-  },
-  {
-    id:4,
-    label:'Thread Stacks',
-    url:'http://%@:50070/stacks'
-  },
-  {
-    id:5,
-    label:'JobTracker UI',
-    url:'http://%@:50030/jobtracker.jsp'
-  },
-  {
-    id:6,
-    label:'Scheduling Info',
-    url:'http://%@:50030/scheduler'
-  },
-  {
-    id:7,
-    label:'Running Jobs',
-    url:'http://%@:50030/jobtracker.jsp#running_jobs'
-  },
-  {
-    id:8,
-    label:'Retired Jobs',
-    url:'http://%@:50030/jobtracker.jsp#retired_jobs'
-  },
-  {
-    id:9,
-    label:'JobHistory Server',
-    url:'http://%@:51111/jobhistoryhome.jsp'
-  },
-  {
-    id:10,
-    label:'JobTracker Logs',
-    url:'http://%@:50030/logs'
-  },
-  {
-    id:11,
-    label:'HBase Master UI',
-    url:'http://%@:60010/master-status'
-  },
-  {
-    id:12,
-    label:'HBase Logs',
-    url:'http://%@:60010/logs'
-  },
-  {
-    id:13,
-    label:'Zookeeper Info',
-    url:'http://%@:60010/zk.jsp'
-  },
-  {
-    id:14,
-    label:'HBase Master JMX',
-    url:'http://%@:60010/jmx'
-  },
-  {
-    id:15,
-    label:'Debug Dump',
-    url:'http://%@:60010/dump'
-  },
-  {
-    id:16,
-    label:'Thread Stacks',
-    url:'http://%@:60010/stacks'
-  },
-  {
-    id:17,
-    label:'JobTracker JMX',
-    url:'http://%@:50030/jmx'
-  },
-  {
-    id:18,
-    label:'Thread Stacks',
-    url:'http://%@:50030/stacks'
-  }
-];
+*/

ambari-web/app/views/main/dashboard/service/hdfs.js

@@ -20,7 +20,7 @@ var App = require('app');
 
 App.MainDashboardServiceHdfsView = App.MainDashboardServiceView.extend({
   templateName:require('templates/main/dashboard/service/hdfs'),
-  serviceName:'hdfs',
+  serviceName:'HDFS',
 
   Chart:App.ChartPieView.extend({
     data:function () {

ambari-web/app/views/main/dashboard/service/mapreduce.js

@@ -20,7 +20,7 @@ var App = require('app');
 
 App.MainDashboardServiceMapreduceView = App.MainDashboardServiceView.extend({
   templateName:require('templates/main/dashboard/service/mapreduce'),
-  serviceName:'mapreduce',
+  serviceName:'MAPREDUCE',
 
   Chart:App.ChartLinearView.extend({
     data:function () {

ambari-web/app/views/main/service/menu.js

@@ -40,9 +40,10 @@ App.MainServiceMenuView = Em.CollectionView.extend({
     if (last_url.substr(1, 4) !== 'main' || !this._childViews) {
       return;
     }
-    var reg = /^\/main\/services\/(\d+)/g;
+    var reg = /^\/main\/services\/(\S+)\//g;
     var sub_url = reg.exec(last_url);
     var service_id = (null != sub_url) ? sub_url[1] : 1;
+    //TODO: fix this._childViews =[]
     $.each(this._childViews, function () {
       this.set('active', this.get('content.id') == service_id ? "active" : "");
     });

ambari-web/app/views/main/test.js

@@ -20,5 +20,5 @@ var App = require('app');
 
 App.MainTestView = Em.View.extend({
   templateName: require('templates/main/test'),
-  services: App.Service1.find()
+  services: App.Service.find()
 });