You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by as...@apache.org on 2018/01/31 15:56:07 UTC
[37/37] hadoop git commit: YARN-7861. [UI2] Logs page shows
duplicated containers with ATS. (Sunil G via wangda)
YARN-7861. [UI2] Logs page shows duplicated containers with ATS. (Sunil G via wangda)
Change-Id: Id07d1ff8d519e0d9291ab037236641ceb901582c
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1453a04e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1453a04e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1453a04e
Branch: refs/heads/YARN-6592
Commit: 1453a04e92ce88b65995248c5d6a2bc934cbe65f
Parents: 5ca4bf2
Author: Wangda Tan <wa...@apache.org>
Authored: Wed Jan 31 21:44:42 2018 +0800
Committer: Wangda Tan <wa...@apache.org>
Committed: Wed Jan 31 21:44:42 2018 +0800
----------------------------------------------------------------------
.../src/main/webapp/app/controllers/yarn-app/logs.js | 13 +++++++++++--
.../src/main/webapp/app/routes/yarn-app/logs.js | 1 +
2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1453a04e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/logs.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/logs.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/logs.js
index 90ecc12..3b75f76 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/logs.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/logs.js
@@ -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");
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1453a04e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/logs.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/logs.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/logs.js
index d92fc3c..8837503 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/logs.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/logs.js
@@ -36,6 +36,7 @@ export default AbstractRoute.extend(AppAttemptMixin, {
activate() {
const controller = this.controllerFor("yarn-app.logs");
+ controller.resetAfterRefresh();
controller.initializeSelect();
},
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org