Skip to content

Commit 94de223

Browse files
AmithshaAmithshaS
andauthored
Fdp branch 3.2.1 (apache#13)
* Added the build scripts and dependencies packages * added flipkart repo url and made snappy lib as default * find command to find pom.xml with snappy false and it will change to true * Repository url spec * Repository url spec * Modified the Maven jar version * Upated the dependencies to install * Upated the pushtar repo * Upated the pushtar repo * Upated the pushtar repo * Upated the cmake * Upated the Version Info * added the dependencies * removed snappy dep * reposervice url updated * updated the flipkart artifactory * Restored * YARN-9877.001.patch Co-authored-by: AmithshaS <amithsha.s@flipkart.com>
1 parent c5d069d commit 94de223

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,8 +1058,10 @@ public void transition(RMAppImpl app, RMAppEvent event) {
10581058
// otherwise, add it to ranNodes for further process
10591059
app.ranNodes.add(nodeAddedEvent.getNodeId());
10601060

1061-
app.logAggregation.addReportIfNecessary(
1062-
nodeAddedEvent.getNodeId(), app.getApplicationId());
1061+
if (!nodeAddedEvent.getFromAcquiredState()) {
1062+
app.logAggregation.addReportIfNecessary(
1063+
nodeAddedEvent.getNodeId(), app.getApplicationId());
1064+
}
10631065
}
10641066
}
10651067

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppRunningOnNodeEvent.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,24 @@
2323

2424
public class RMAppRunningOnNodeEvent extends RMAppEvent {
2525
private final NodeId node;
26+
private final boolean fromAcquiredState;
2627

2728
public RMAppRunningOnNodeEvent(ApplicationId appId, NodeId node) {
29+
this(appId, node, false);
30+
}
31+
32+
public RMAppRunningOnNodeEvent(ApplicationId appId, NodeId node,
33+
boolean fromAcquiredState) {
2834
super(appId, RMAppEventType.APP_RUNNING_ON_NODE);
2935
this.node = node;
36+
this.fromAcquiredState = fromAcquiredState;
3037
}
3138

3239
public NodeId getNodeId() {
3340
return node;
3441
}
42+
43+
public boolean getFromAcquiredState() {
44+
return fromAcquiredState;
45+
}
3546
}

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/RMContainerImpl.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,8 @@ public void transition(RMContainerImpl container, RMContainerEvent event) {
604604

605605
// Tell the app
606606
container.eventHandler.handle(new RMAppRunningOnNodeEvent(container
607-
.getApplicationAttemptId().getApplicationId(), container.nodeId));
607+
.getApplicationAttemptId().getApplicationId(), container.nodeId,
608+
true));
608609

609610
publishNonAMContainerEventstoATS(container);
610611
}

0 commit comments

Comments
 (0)