ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject git commit: AMBARI-5064. Model ATS host name into App.YARNService class (alexantonenko)
Date Thu, 13 Mar 2014 12:01:41 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 00f951fd5 -> 244aa3ff0


AMBARI-5064. Model ATS host name into App.YARNService class (alexantonenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/244aa3ff
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/244aa3ff
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/244aa3ff

Branch: refs/heads/trunk
Commit: 244aa3ff0a83e5767d84996be8e20400b0be6f0d
Parents: 00f951f
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Thu Mar 13 13:29:38 2014 +0200
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Thu Mar 13 13:29:38 2014 +0200

----------------------------------------------------------------------
 ambari-web/app/controllers/main/jobs_controller.js | 2 +-
 ambari-web/app/models/service/yarn.js              | 3 +++
 ambari-web/app/utils/jobs.js                       | 6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/244aa3ff/ambari-web/app/controllers/main/jobs_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/jobs_controller.js b/ambari-web/app/controllers/main/jobs_controller.js
index afe4666..05f9cef 100644
--- a/ambari-web/app/controllers/main/jobs_controller.js
+++ b/ambari-web/app/controllers/main/jobs_controller.js
@@ -249,7 +249,7 @@ App.MainJobsController = Em.ArrayController.extend({
     var yarnService = App.YARNService.find().objectAt(0);
     if (yarnService != null) {
       this.set('loading', true);
-      var historyServerHostName = yarnService.get('resourceManagerNode.hostName');
+      var historyServerHostName = yarnService.get('appTimelineServerNode.hostName');
       var filtersLink = this.get('filterObject').createJobsFiltersLink();
       var hiveQueriesUrl = App.testMode ? "/data/jobs/hive-queries.json" : "/proxy?url=http://"
+ historyServerHostName
           + ":" + yarnService.get('ahsWebPort') + "/ws/v1/timeline/HIVE_QUERY_ID" + filtersLink;

http://git-wip-us.apache.org/repos/asf/ambari/blob/244aa3ff/ambari-web/app/models/service/yarn.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service/yarn.js b/ambari-web/app/models/service/yarn.js
index 5b66834..68850c6 100644
--- a/ambari-web/app/models/service/yarn.js
+++ b/ambari-web/app/models/service/yarn.js
@@ -21,6 +21,9 @@ var objectUtils = require('utils/object_utils');
 App.YARNService = App.Service.extend({
   version: DS.attr('string'),
   resourceManagerNode: DS.belongsTo('App.Host'),
+  appTimelineServerNode: function() {
+    return this.get('hostComponents').filterProperty('componentName', 'APP_TIMELINE_SERVER').mapProperty('host').objectAt(0);
+  }.property(),
   nodeManagerNodes: function () {
     return this.get('hostComponents').filterProperty('componentName', 'NODEMANAGER');
   }.property('hostComponents.@each'),

http://git-wip-us.apache.org/repos/asf/ambari/blob/244aa3ff/ambari-web/app/utils/jobs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/jobs.js b/ambari-web/app/utils/jobs.js
index 356aba6..4dbcdbc 100644
--- a/ambari-web/app/utils/jobs.js
+++ b/ambari-web/app/utils/jobs.js
@@ -54,7 +54,7 @@ module.exports = {
     var self = this;
     // TODO - to be changed to history server when implemented in stack.
     var yarnService = App.YARNService.find().objectAt(0);
-    var historyServerHostName = yarnService.get('resourceManagerNode.hostName');
+    var historyServerHostName = yarnService.get('appTimelineServerNode.hostName');
     var ahsWebPort = yarnService.get('ahsWebPort');
     var hiveJobId = hiveJob.get('id');
     // First refresh query
@@ -117,7 +117,7 @@ module.exports = {
     var self = this;
     var yarnService = App.YARNService.find().objectAt(0);
     var ahsWebPort = yarnService.get('ahsWebPort');
-    var historyServerHostName = yarnService.get('resourceManagerNode.hostName');
+    var historyServerHostName = yarnService.get('appTimelineServerNode.hostName');
     var tezDag = App.TezDag.find(tezDagId);
     if (tezDag) {
       var tezDagInstanceId = tezDag.get('instanceId');
@@ -171,7 +171,7 @@ module.exports = {
   refreshTezDagVertex : function(tezDagId, tezVertexInstanceId, successCallback) {
     var yarnService = App.YARNService.find().objectAt(0);
     var ahsWebPort = yarnService.get('ahsWebPort');
-    var historyServerHostName = yarnService.get('resourceManagerNode.hostName');
+    var historyServerHostName = yarnService.get('appTimelineServerNode.hostName');
     var sender = {
       loadTezDagVertexSuccess : function(data) {
         if (data && data.otherinfo) {


Mime
View raw message