Revert "Fdp branch 3.2.1 (apache#13)"

This reverts commit 94de223.

Author: AmithshaS

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

@@ -1058,10 +1058,8 @@ public void transition(RMAppImpl app, RMAppEvent event) {
       // otherwise, add it to ranNodes for further process
       app.ranNodes.add(nodeAddedEvent.getNodeId());
 
-      if (!nodeAddedEvent.getFromAcquiredState()) {
-        app.logAggregation.addReportIfNecessary(
-                nodeAddedEvent.getNodeId(), app.getApplicationId());
-      }
+      app.logAggregation.addReportIfNecessary(
+          nodeAddedEvent.getNodeId(), app.getApplicationId());
     }
   }
 

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

@@ -23,24 +23,13 @@
 
 public class RMAppRunningOnNodeEvent extends RMAppEvent {
   private final NodeId node;
-  private final boolean fromAcquiredState;
 
   public RMAppRunningOnNodeEvent(ApplicationId appId, NodeId node) {
-    this(appId, node, false);
-  }
-
-  public RMAppRunningOnNodeEvent(ApplicationId appId, NodeId node,
-      boolean fromAcquiredState) {
     super(appId, RMAppEventType.APP_RUNNING_ON_NODE);
     this.node = node;
-    this.fromAcquiredState = fromAcquiredState;
   }
 
   public NodeId getNodeId() {
     return node;
   }
-
-  public boolean getFromAcquiredState() {
-    return fromAcquiredState;
-  }
 }

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

@@ -604,8 +604,7 @@ public void transition(RMContainerImpl container, RMContainerEvent event) {
 
       // Tell the app
       container.eventHandler.handle(new RMAppRunningOnNodeEvent(container
-          .getApplicationAttemptId().getApplicationId(), container.nodeId,
-          true));
+          .getApplicationAttemptId().getApplicationId(), container.nodeId));
 
       publishNonAMContainerEventstoATS(container);
     }