Repository: hadoop Updated Branches: refs/heads/YARN-2928 f2e622078 -> e2e5a9aed
YARN-4644. TestRMRestart fails and findbugs issue in YARN-2928 branch (Varun Saxena via Naganarasimha G R) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e2e5a9ae Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e2e5a9ae Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e2e5a9ae Branch: refs/heads/YARN-2928 Commit: e2e5a9aed5e9ba4776aeae3d08552cda16d941d0 Parents: f2e6220 Author: Naganarasimha <[email protected]> Authored: Thu Jan 28 17:54:15 2016 +0530 Committer: Naganarasimha <[email protected]> Committed: Thu Jan 28 17:54:15 2016 +0530 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 5 ++++- .../yarn/server/resourcemanager/ResourceTrackerService.java | 2 -- .../hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java | 3 --- 3 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e2e5a9ae/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 9b7ed73..03dc60f 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -220,7 +220,10 @@ Branch YARN-2928: Timeline Server Next Generation: Phase 1 YARN-4622. TestDistributedShell fails for v2 test cases after modifications for 1.5. (Naganarasimha G R via varunsaxena) - YARN-4238. createdTime and modifiedTime is not reported while publishing entities to ATSv2. + YARN-4238. correctly set createdTime and remove modifiedTime when publishing entities. + (Varun Saxena via Naganarasimha G R) + + YARN-4644. TestRMRestart fails and findbugs issue in YARN-2928 branch. (Varun Saxena via Naganarasimha G R) Trunk - Unreleased http://git-wip-us.apache.org/repos/asf/hadoop/blob/e2e5a9ae/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java index 1d9433c..5e276eb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java @@ -483,8 +483,6 @@ public class ResourceTrackerService extends AbstractService implements } // 4. Send status to RMNode, saving the latest response. - List<ApplicationId> keepAliveApps = - remoteNodeStatus.getKeepAliveApplications(); RMNodeStatusEvent nodeStatusEvent = new RMNodeStatusEvent(nodeId, remoteNodeStatus, nodeHeartBeatResponse); if (request.getLogAggregationReportsForApps() != null http://git-wip-us.apache.org/repos/asf/hadoop/blob/e2e5a9ae/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java index 7ee41ac..1ee6247 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java @@ -890,9 +890,6 @@ public class RMAppImpl implements RMApp, Recoverable { this.firstAttemptIdInStateStore = appState.getFirstAttemptId(); this.nextAttemptId = firstAttemptIdInStateStore; } - - // send the ATS create Event - sendATSCreateEvent(this, this.startTime); //TODO recover collector address. //this.collectorAddr = appState.getCollectorAddr();
