Skip to content

Commit e0d8423

Browse files
AmithshaAmithshaS
andauthored
Reverting the last commit (apache#15)
* 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 * Revert "YARN-9877.001.patch" This reverts commit 60f7da6. * Revert "Fdp branch 3.2.1 (apache#10)" This reverts commit c5d069d. * Revert "Revert "Fdp branch 3.2.1 (apache#10)"" This reverts commit cb47fd3. * Revert "Fdp branch 3.2.1 (apache#13)" This reverts commit 94de223. Co-authored-by: AmithshaS <amithsha.s@flipkart.com>
1 parent 94de223 commit e0d8423

File tree

3 files changed

+3
-17
lines changed

3 files changed

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

1061-
if (!nodeAddedEvent.getFromAcquiredState()) {
1062-
app.logAggregation.addReportIfNecessary(
1063-
nodeAddedEvent.getNodeId(), app.getApplicationId());
1064-
}
1061+
app.logAggregation.addReportIfNecessary(
1062+
nodeAddedEvent.getNodeId(), app.getApplicationId());
10651063
}
10661064
}
10671065

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: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,13 @@
2323

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

2827
public RMAppRunningOnNodeEvent(ApplicationId appId, NodeId node) {
29-
this(appId, node, false);
30-
}
31-
32-
public RMAppRunningOnNodeEvent(ApplicationId appId, NodeId node,
33-
boolean fromAcquiredState) {
3428
super(appId, RMAppEventType.APP_RUNNING_ON_NODE);
3529
this.node = node;
36-
this.fromAcquiredState = fromAcquiredState;
3730
}
3831

3932
public NodeId getNodeId() {
4033
return node;
4134
}
42-
43-
public boolean getFromAcquiredState() {
44-
return fromAcquiredState;
45-
}
4635
}

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: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -604,8 +604,7 @@ public void transition(RMContainerImpl container, RMContainerEvent event) {
604604

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

610609
publishNonAMContainerEventstoATS(container);
611610
}

0 commit comments

Comments
 (0)