incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject svn commit: r1460090 - in /incubator/ambari/trunk/ambari-web/app: mappers/ models/ templates/main/service/info/ templates/main/service/info/summary/ views/main/service/info/
Date Sat, 23 Mar 2013 04:28:02 GMT
Author: yusaku
Date: Sat Mar 23 04:28:01 2013
New Revision: 1460090

URL: http://svn.apache.org/r1460090
Log:
AMBARI-1644. Service summary page flickers. (yusaku)

Modified:
    incubator/ambari/trunk/ambari-web/app/mappers/service_mapper.js
    incubator/ambari/trunk/ambari-web/app/models/service.js
    incubator/ambari/trunk/ambari-web/app/templates/main/service/info/summary.hbs
    incubator/ambari/trunk/ambari-web/app/templates/main/service/info/summary/ganglia.hbs
    incubator/ambari/trunk/ambari-web/app/templates/main/service/info/summary/hive.hbs
    incubator/ambari/trunk/ambari-web/app/templates/main/service/info/summary/oozie.hbs
    incubator/ambari/trunk/ambari-web/app/views/main/service/info/summary.js

Modified: incubator/ambari/trunk/ambari-web/app/mappers/service_mapper.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/mappers/service_mapper.js?rev=1460090&r1=1460089&r2=1460090&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/mappers/service_mapper.js (original)
+++ incubator/ambari/trunk/ambari-web/app/mappers/service_mapper.js Sat Mar 23 04:28:01 2013
@@ -48,6 +48,7 @@ App.servicesMapper = App.QuickDataMapper
     id: 'ServiceInfo.service_name',
     service_name: 'ServiceInfo.service_name',
     work_status: 'ServiceInfo.state',
+    $rand: Math.random(),
     $alerts: [ 1, 2, 3 ],
     host_components: 'host_components'
   },
@@ -143,21 +144,30 @@ App.servicesMapper = App.QuickDataMapper
         item.host_components.sort();
 
         if (item && item.ServiceInfo && item.ServiceInfo.service_name ==
"HDFS") {
-          // Change the JSON so that it is easy to map
           finalJson = this.hdfsMapper(item);
+          finalJson.rand = Math.random();
           result.push(finalJson);
           App.store.load(App.HDFSService, finalJson);
-        } else if (item && item.ServiceInfo && item.ServiceInfo.service_name
== "MAPREDUCE") {
-          finalJson = this.mapreduceMapper(item);
-          result.push(finalJson);
-          App.store.load(App.MapReduceService, finalJson);
-        } else if (item && item.ServiceInfo && item.ServiceInfo.service_name
== "HBASE") {
-          finalJson = this.hbaseMapper(item);
-          result.push(finalJson);
-          App.store.load(App.HBaseService, finalJson);
-        } else {
-          result.push(this.parseIt(item, this.config));
         }
+        else
+          if (item && item.ServiceInfo && item.ServiceInfo.service_name ==
"MAPREDUCE") {
+            finalJson = this.mapreduceMapper(item);
+            finalJson.rand = Math.random();
+            result.push(finalJson);
+            App.store.load(App.MapReduceService, finalJson);
+          }
+          else
+            if (item && item.ServiceInfo && item.ServiceInfo.service_name
== "HBASE") {
+              finalJson = this.hbaseMapper(item);
+              finalJson.rand = Math.random();
+              result.push(finalJson);
+              App.store.load(App.HBaseService, finalJson);
+            }
+            else {
+              finalJson = this.parseIt(item, this.config);
+              finalJson.rand = Math.random();
+              result.push(finalJson);
+            }
       }, this);
 
 

Modified: incubator/ambari/trunk/ambari-web/app/models/service.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/models/service.js?rev=1460090&r1=1460089&r2=1460090&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/models/service.js (original)
+++ incubator/ambari/trunk/ambari-web/app/models/service.js Sat Mar 23 04:28:01 2013
@@ -24,6 +24,7 @@ App.Service = DS.Model.extend({
   serviceName: DS.attr('string'),
 
   workStatus: DS.attr('string'),
+  rand: DS.attr('string'),
   alerts: DS.hasMany('App.Alert'),
   quickLinks: DS.hasMany('App.QuickLinks'),
   hostComponents: DS.hasMany('App.HostComponent'),

Modified: incubator/ambari/trunk/ambari-web/app/templates/main/service/info/summary.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/service/info/summary.hbs?rev=1460090&r1=1460089&r2=1460090&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/service/info/summary.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/service/info/summary.hbs Sat Mar
23 04:28:01 2013
@@ -41,35 +41,35 @@
     <table id="summary-info" class="table no-borders table-condensed">
       <tbody>
       {{#unless view.serviceStatus.oozie}}
-      {{#unless view.serviceStatus.hive}}
-      {{#unless view.serviceStatus.zookeeper}}
-      {{#unless view.serviceStatus.hdfs}}
-      {{#unless view.serviceStatus.mapreduce}}
-      {{#unless view.serviceStatus.hbase}}
-      {{#unless view.serviceStatus.ganglia}}
-      {{#each component in controller.content.hostComponents}}
-        <tr>
-          {{#if component.isMaster}}
-            <td class="summary-label">{{component.displayName}}</td>
-            <td><a {{action selectHost component.host}} href="javascript:void(null)">{{component.host.publicHostName}}</a></td>
-          {{else}}
-            <td class="summary-label">{{component.displayName}}s</td>
-            <td><a {{action filterHosts component}} href="javascript:void(null)">{{component.displayName}}s</a></td>
-          {{/if}}
-        </tr>
-      {{/each}}
-      {{#if view.serviceStatus.nagios}}
-        <tr>
-          <td class="summary-label">{{t services.service.info.summary.nagiosWebUI}}</td>
-          <td><a target=_blank href="http://{{unbound view.nagiosServer}}/nagios">{{view.nagiosServer}}/nagios</a></td>
-        </tr>
-      {{/if}}
-      {{/unless}}
-      {{/unless}}
-      {{/unless}}
-      {{/unless}}
-      {{/unless}}
-      {{/unless}}
+        {{#unless view.serviceStatus.hive}}
+          {{#unless view.serviceStatus.zookeeper}}
+            {{#unless view.serviceStatus.hdfs}}
+              {{#unless view.serviceStatus.mapreduce}}
+                {{#unless view.serviceStatus.hbase}}
+                  {{#unless view.serviceStatus.ganglia}}
+                    {{#each component in view.components}}
+                      <tr>
+                        {{#if component.isMaster}}
+                          <td class="summary-label">{{component.displayName}}</td>
+                          <td><a {{action selectHost component.host}} href="javascript:void(null)">{{component.host.publicHostName}}</a></td>
+                        {{else}}
+                          <td class="summary-label">{{component.displayName}}s</td>
+                          <td><a {{action filterHosts component}} href="javascript:void(null)">{{component.displayName}}s</a></td>
+                        {{/if}}
+                      </tr>
+                    {{/each}}
+                    {{#if view.serviceStatus.nagios}}
+                      <tr>
+                        <td class="summary-label">{{t services.service.info.summary.nagiosWebUI}}</td>
+                        <td><a target=_blank href="http://{{unbound view.nagiosServer}}/nagios">{{view.nagiosServer}}/nagios</a></td>
+                      </tr>
+                    {{/if}}
+                  {{/unless}}
+                {{/unless}}
+              {{/unless}}
+            {{/unless}}
+          {{/unless}}
+        {{/unless}}
       {{/unless}}
       {{#if view.serviceStatus.hdfs}}
         {{view App.MainDashboardServiceHdfsView showOnlyRows=true serviceBinding="view.service"}}

Modified: incubator/ambari/trunk/ambari-web/app/templates/main/service/info/summary/ganglia.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/service/info/summary/ganglia.hbs?rev=1460090&r1=1460089&r2=1460090&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/service/info/summary/ganglia.hbs
(original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/service/info/summary/ganglia.hbs
Sat Mar 23 04:28:01 2013
@@ -15,11 +15,12 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 }}
-{{#each component in controller.content.hostComponents}}
+
+{{#each component in view.components}}
   {{#if component.isMaster}}
     <tr>
-        <td class="summary-label">{{component.displayName}}</td>
-        <td><a {{action selectHost component.host}} href="javascript:void(null)">{{component.host.publicHostName}}</a></td>
+      <td class="summary-label">{{component.displayName}}</td>
+      <td><a {{action selectHost component.host}} href="javascript:void(null)">{{component.host.publicHostName}}</a></td>
     </tr>
   {{/if}}
 {{/each}}

Modified: incubator/ambari/trunk/ambari-web/app/templates/main/service/info/summary/hive.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/service/info/summary/hive.hbs?rev=1460090&r1=1460089&r2=1460090&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/service/info/summary/hive.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/service/info/summary/hive.hbs Sat
Mar 23 04:28:01 2013
@@ -16,22 +16,22 @@
 * limitations under the License.
 }}
 
-{{#each component in controller.content.hostComponents}}
+{{#each component in view.components}}
   {{#if component.isMaster}}
-      <tr>
-          <td>
-            {{view view.componentNameView compBinding="component"}}
-          </td>
-          <td>
-              <a href="#" {{action selectHost component.host}}>{{component.host.publicHostName}}</a>
-          </td>
-      </tr>
+    <tr>
+      <td>
+        {{view view.componentNameView compBinding="component"}}
+      </td>
+      <td>
+        <a href="#" {{action selectHost component.hostRaw}}>{{component.host.publicHostName}}</a>
+      </td>
+    </tr>
   {{/if}}
 {{/each}}
 
 <tr>
-    <td class="summary-label">{{t services.hive.clients}}</td>
-    <td>
-        <a {{action filterHosts view.clientObj}} href="javascript:void(null)">{{view.clients.length}}
{{t services.hive.client}}{{#if view.hasManyClients}}s{{/if}}</a>
-    </td>
+  <td class="summary-label">{{t services.hive.clients}}</td>
+  <td>
+    <a {{action filterHosts view.clientObj}} href="javascript:void(null)">{{view.clients.length}}
{{t services.hive.client}}{{#if view.hasManyClients}}s{{/if}}</a>
+  </td>
 </tr>
\ No newline at end of file

Modified: incubator/ambari/trunk/ambari-web/app/templates/main/service/info/summary/oozie.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/service/info/summary/oozie.hbs?rev=1460090&r1=1460089&r2=1460090&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/service/info/summary/oozie.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/service/info/summary/oozie.hbs Sat
Mar 23 04:28:01 2013
@@ -16,11 +16,11 @@
 * limitations under the License.
 }}
 
-{{#each component in controller.content.hostComponents}}
+{{#each component in view.components}}
   {{#if component.isMaster}}
     <tr>
-        <td class="summary-label">{{t common.servers}}</td>
-        <td><a {{action selectHost component.host}} href="javascript:void(null)">{{component.host.publicHostName}}</a></td>
+      <td class="summary-label">{{t common.servers}}</td>
+      <td><a {{action selectHost component.hostRaw}} href="javascript:void(null)">{{component.host.publicHostName}}</a></td>
     </tr>
   {{/if}}
 {{/each}}

Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/summary.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/summary.js?rev=1460090&r1=1460089&r2=1460090&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/summary.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/summary.js Sat Mar 23 04:28:01
2013
@@ -164,32 +164,58 @@ App.MainServiceInfoSummaryView = Em.View
       "user":"hive"
     }
   },
-  gangliaServer:function(){
+  /**
+   * Get public host name (should be Master) for service
+   * @param {String} serviceName - GANGLIA, NAGIOS etc
+   * @return {*}
+   */
+  getServer: function(serviceName) {
     var service=this.get('controller.content');
-    if(service.get("id") == "GANGLIA"){
+    if(service.get("id") == serviceName) {
       return service.get("hostComponents").findProperty('isMaster', true).get("host").get("publicHostName");
-    }else{
-      return "";
     }
+    else {
+      return '';
+    }
+  },
+  gangliaServer:function() {
+    return this.getServer("GANGLIA");
   }.property('controller.content'),
   nagiosServer:function(){
-    var service=this.get('controller.content');
-    if(service.get("id") == "NAGIOS"){
-      return service.get("hostComponents").findProperty('isMaster', true).get("host").get("publicHostName");
-    }else{
-      return "";
-    }
+    return this.getServer("NAGIOS");
   }.property('controller.content'),
   oozieServer:function(){
-    var service=this.get('controller.content');
-    if(service.get("id") == "OOZIE"){
-      return service.get("hostComponents").findProperty('isMaster', true).get("host").get("publicHostName");
-    }else{
-      return "";
-    }
+    return this.getServer("OOZIE");
   }.property('controller.content'),
 
   /**
+   * Array of the hostComponents for service
+   */
+  components: [],
+
+  /**
+   * Copy hostComponents from controller to view to avoid flickering Summary block while
data is updating in the controller
+   * rand - just marker in the Service model for determining that Service was updated (value
changes in the service_mapper)
+   */
+  hostComponentsUpd: function() {
+      var components = [];
+      this.get('controller.content.hostComponents').forEach(function(component) {
+        var obj = {};
+        for(var prop in component){
+          if( component.hasOwnProperty(prop)
+            && prop.indexOf('__ember') < 0
+            && prop.indexOf('_super') < 0
+            && Ember.typeOf(component.get(prop)) !== 'function'
+            ) {
+            obj[prop] = component.get(prop);
+          }
+        }
+        obj.displayName = component.get('displayName'); // this is computed property and
wasn't copied in the top block of code
+        components.push(obj);
+      });
+      this.set('components', components);
+  }.observes('controller.content.rand', 'controller.content.hostComponents.@each.isMaster',
'controller.content.hostComponents.@each.host'),
+  /**
    * Wrapper for displayName. used to render correct display name for mysql_server
    */
   componentNameView: Ember.View.extend({



Mime
View raw message