YARN-1708. Public YARN APIs for creating/updating/deleting reservations.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c96eac58 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c96eac58 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c96eac58 Branch: refs/heads/YARN-1051 Commit: c96eac5815696beda4eef1b8e955938adfe7beb2 Parents: 9fd5b0c Author: subru <[email protected]> Authored: Fri Sep 12 17:16:07 2014 -0700 Committer: subru <[email protected]> Committed: Thu Sep 25 13:15:54 2014 -0700 ---------------------------------------------------------------------- YARN-1051-CHANGES.txt | 20 +------------------- .../src/main/proto/yarn_protos.proto | 1 - .../pb/ApplicationSubmissionContextPBImpl.java | 3 +++ 3 files changed, 4 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c96eac58/YARN-1051-CHANGES.txt ---------------------------------------------------------------------- diff --git a/YARN-1051-CHANGES.txt b/YARN-1051-CHANGES.txt index c4106b2..a7c08a0 100644 --- a/YARN-1051-CHANGES.txt +++ b/YARN-1051-CHANGES.txt @@ -4,22 +4,4 @@ CapacityScheduler. (Carlo Curino and Subru Krishnan via curino) YARN-2475. Logic for responding to capacity drops for the ReservationSystem. (Carlo Curino and Subru Krishnan via curino) -YARN-1708. Public YARN APIs for creating/updating/deleting -reservations. (Subru Krishnan and Carlo Curino via subru) - -YARN-1709. In-memory data structures used to track resources over -time to enable reservations. (Subru Krishnan and Carlo Curino via -subru) - -YARN-1710. Logic to find allocations within a Plan that satisfy -user ReservationRequest(s). (Carlo Curino and Subru Krishnan via -curino) - -YARN-1711. Policy to enforce instantaneous and over-time quotas -on user reservations. (Carlo Curino and Subru Krishnan via curino) - -YARN-1712. Plan follower that synchronizes the current state of reservation -subsystem with the scheduler. (Subru Krishnan and Carlo Curino via subru) - -YARN-2080. Integrating reservation system with ResourceManager and -client-RM protocol. (Subru Krishnan and Carlo Curino via subru) +YARN-1708. Public YARN APIs for creating/updating/deleting reservations. (subru) http://git-wip-us.apache.org/repos/asf/hadoop/blob/c96eac58/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto index d07ce13..c645719 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto @@ -202,7 +202,6 @@ message ApplicationAttemptReportProto { optional string diagnostics = 5 [default = "N/A"]; optional YarnApplicationAttemptStateProto yarn_application_attempt_state = 6; optional ContainerIdProto am_container_id = 7; - optional string original_tracking_url = 8; } enum NodeStateProto { http://git-wip-us.apache.org/repos/asf/hadoop/blob/c96eac58/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ApplicationSubmissionContextPBImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ApplicationSubmissionContextPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ApplicationSubmissionContextPBImpl.java index cc65a09..d3f940a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ApplicationSubmissionContextPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ApplicationSubmissionContextPBImpl.java @@ -120,6 +120,9 @@ extends ApplicationSubmissionContext { if (this.reservationId != null) { builder.setReservationId(convertToProtoFormat(this.reservationId)); } + if (this.reservationId != null) { + builder.setReservationId(convertToProtoFormat(this.reservationId)); + } } private void mergeLocalToProto() {
