Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-7861. [UI2] Logs page shows duplicated containers with ATS. (Sunil G via wangda) 

Change-Id: Id07d1ff8d519e0d9291ab037236641ceb901582c
This commit is contained in:
Wangda Tan 2018-01-31 21:44:42 +08:00
parent 5ca4bf22dd
commit 1453a04e92
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/logs.js
View File

@ -47,10 +47,14 @@ export default Ember.Controller.extend({
this.fetchContainersForAttemptId(attemptId)
.then(hash => {
let containers = null;
let containerIdArr = [];
if (
hash.rmContainers.get("length") > 0 &&
hash.rmContainers.get("content")
) {
hash.rmContainers.get("content").forEach(function(o) {
containerIdArr.push(o.id);
}.bind(this));
containers = (containers || []).concat(
hash.rmContainers.get("content")
);
@ -59,9 +63,14 @@ export default Ember.Controller.extend({
hash.tsContainers.get("length") > 0 &&
hash.tsContainers.get("content")
) {
let tscontainer = [];
hash.tsContainers.get("content").forEach(function(o) {
if(!containerIdArr.contains(o.id)) {
tscontainer.push(o);
}
}.bind(this));
containers = (containers || []).concat(
hash.tsContainers.get("content")
);
tscontainer);
}
this.set("attemptContainerList", containers);
this.initializeSelect(".js-fetch-logs-containers");

1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/logs.js
View File

@ -36,6 +36,7 @@ export default AbstractRoute.extend(AppAttemptMixin, {
activate() {
const controller = this.controllerFor("yarn-app.logs");
controller.resetAfterRefresh();
controller.initializeSelect();
},