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 su...@apache.org on 2018/03/23 05:24:09 UTC
hadoop git commit: YARN-8063. DistributedShellTimelinePlugin wrongly
check for entityId instead of entityType. Contributed by Rohith Sharma K S.
Repository: hadoop
Updated Branches:
refs/heads/trunk 8620d2bdf -> 22c5ddb7c
YARN-8063. DistributedShellTimelinePlugin wrongly check for entityId instead of entityType. Contributed by Rohith Sharma K S.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/22c5ddb7
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/22c5ddb7
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/22c5ddb7
Branch: refs/heads/trunk
Commit: 22c5ddb7c4fb48d5bf5a7456d0b1b27d48c2a485
Parents: 8620d2b
Author: Sunil G <su...@apache.org>
Authored: Fri Mar 23 10:54:00 2018 +0530
Committer: Sunil G <su...@apache.org>
Committed: Fri Mar 23 10:54:00 2018 +0530
----------------------------------------------------------------------
.../distributedshell/DistributedShellTimelinePlugin.java | 2 +-
.../applications/distributedshell/TestDistributedShell.java | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/22c5ddb7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/DistributedShellTimelinePlugin.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/DistributedShellTimelinePlugin.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/DistributedShellTimelinePlugin.java
index 119fa6f..cf5bc83 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/DistributedShellTimelinePlugin.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/DistributedShellTimelinePlugin.java
@@ -52,7 +52,7 @@ public class DistributedShellTimelinePlugin extends TimelineEntityGroupPlugin {
@Override
public Set<TimelineEntityGroupId> getTimelineEntityGroupId(String entityId,
String entityType) {
- if (ApplicationMaster.DSEntity.DS_CONTAINER.toString().equals(entityId)) {
+ if (ApplicationMaster.DSEntity.DS_CONTAINER.toString().equals(entityType)) {
ContainerId containerId = ContainerId.fromString(entityId);
ApplicationId appId = containerId.getApplicationAttemptId()
.getApplicationId();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/22c5ddb7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java
index 667b60d..0e94ad5 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java
@@ -494,6 +494,15 @@ public class TestDistributedShell {
Assert.assertEquals(2, entities.getEntities().size());
Assert.assertEquals(entities.getEntities().get(0).getEntityType()
.toString(), ApplicationMaster.DSEntity.DS_CONTAINER.toString());
+
+ String entityId = entities.getEntities().get(0).getEntityId();
+ org.apache.hadoop.yarn.api.records.timeline.TimelineEntity entity =
+ yarnCluster.getApplicationHistoryServer().getTimelineStore()
+ .getEntity(entityId,
+ ApplicationMaster.DSEntity.DS_CONTAINER.toString(), null);
+ Assert.assertNotNull(entity);
+ Assert.assertEquals(entityId, entity.getEntityId());
+
if (haveDomain) {
Assert.assertEquals(domain.getId(),
entities.getEntities().get(0).getDomainId());
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org