hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rohithsharm...@apache.org
Subject [3/3] hadoop git commit: YARN-8260. [UI2] Per-application tracking URL is no longer available in YARN UI2. Contributed by Sunil G.
Date Wed, 09 May 2018 07:04:29 GMT
YARN-8260. [UI2] Per-application tracking URL is no longer available in YARN UI2. Contributed
by Sunil G.

(cherry picked from commit cd68c7cc6942970285dce04775e80f75a5d55afa)


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

Branch: refs/heads/branch-3.1
Commit: ee19c47d08c897954cf7d151bc91f18f1b95a6c2
Parents: 438c5b1
Author: Rohith Sharma K S <rohithsharmaks@apache.org>
Authored: Wed May 9 12:17:04 2018 +0530
Committer: Rohith Sharma K S <rohithsharmaks@apache.org>
Committed: Wed May 9 12:34:11 2018 +0530

----------------------------------------------------------------------
 .../hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js        | 2 ++
 .../src/main/webapp/app/serializers/yarn-app-timeline.js         | 4 +++-
 .../hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js   | 4 +++-
 .../hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs    | 3 +++
 4 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/ee19c47d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
index fcc8490..8f4a899 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
@@ -53,6 +53,8 @@ export default DS.Model.extend({
   remainingTimeoutInSeconds: DS.attr("number"),
   applicationExpiryTime: DS.attr("string"),
   resourceRequests: DS.attr("array"),
+  trackingUI: DS.attr("string"),
+  trackingUrl: DS.attr("string"),
 
   isFailed: function() {
     return this.get("finalStatus") === "FAILED";

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ee19c47d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-timeline.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-timeline.js
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-timeline.js
index 0496d77..36a1c7b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-timeline.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-timeline.js
@@ -61,7 +61,9 @@ export default DS.JSONAPISerializer.extend({
         numAMContainerPreempted: 0,
         clusterUsagePercentage: 0,
         queueUsagePercentage: 0,
-        currentAppAttemptId: payload.info.YARN_APPLICATION_LATEST_APP_ATTEMPT
+        currentAppAttemptId: payload.info.YARN_APPLICATION_LATEST_APP_ATTEMPT,
+        trackingUI : '',
+        trackingUrl : ''
       }
     };
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ee19c47d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js
index b21c52a..36d1260 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js
@@ -69,7 +69,9 @@ export default DS.JSONAPISerializer.extend({
           queueUsagePercentage: payload.queueUsagePercentage,
           currentAppAttemptId: payload.currentAppAttemptId,
           remainingTimeoutInSeconds: timeoutInSecs,
-          applicationExpiryTime: appExpiryTime
+          applicationExpiryTime: appExpiryTime,
+          trackingUI : payload.trackingUI,
+          trackingUrl : payload.trackingUrl
         }
       };
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ee19c47d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs
index 156f83c..aac93c0 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs
@@ -116,6 +116,9 @@
             <span title="Queue" class="yarn-tooltip"><i class="glyphicon glyphicon-tasks
glyphicon-gray" />{{model.app.queue}}</span>
           </div>
           <div>Priority {{model.app.priority}}</div>
+          {{#if model.app.trackingUrl}}
+            <div><a href="{{model.app.trackingUrl}}" target="_blank">{{model.app.trackingUI}}</a></div>
+          {{/if}}
         </div>
       </div>
     </div>


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message