hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From su...@apache.org
Subject [45/45] git commit: Fixing previous rebase with trunk
Date Thu, 25 Sep 2014 20:52:55 GMT
Fixing previous rebase with trunk


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a6e38a53
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a6e38a53
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a6e38a53

Branch: refs/heads/YARN-1051
Commit: a6e38a538ca54799dad34772568ee773d3b4f4e5
Parents: 1c7d1df e067eec
Author: subru <subru@outlook.com>
Authored: Thu Sep 25 13:52:02 2014 -0700
Committer: subru <subru@outlook.com>
Committed: Thu Sep 25 13:52:02 2014 -0700

----------------------------------------------------------------------
 YARN-1051-CHANGES.txt                           |  4 +--
 .../records/ApplicationSubmissionContext.java   | 19 +++++++++--
 .../src/main/proto/yarn_protos.proto            | 34 ++++++++++----------
 .../pb/ApplicationSubmissionContextPBImpl.java  |  5 +--
 4 files changed, 39 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/a6e38a53/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationSubmissionContext.java
----------------------------------------------------------------------
diff --cc hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationSubmissionContext.java
index e022dda,e022dda..fe21973
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationSubmissionContext.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationSubmissionContext.java
@@@ -129,6 -129,6 +129,21 @@@ public abstract class ApplicationSubmis
      return context;
    }
  
++  @Public
++  @Stable
++  public static ApplicationSubmissionContext newInstance(
++      ApplicationId applicationId, String applicationName, String queue,
++      Priority priority, ContainerLaunchContext amContainer,
++      boolean isUnmanagedAM, boolean cancelTokensWhenComplete,
++      int maxAppAttempts, Resource resource, String applicationType,
++      boolean keepContainers, LogAggregationContext logAggregationContext) {
++    ApplicationSubmissionContext context =
++        newInstance(applicationId, applicationName, queue, priority,
++          amContainer, isUnmanagedAM, cancelTokensWhenComplete, maxAppAttempts,
++          resource, applicationType, keepContainers);
++    context.setLogAggregationContext(logAggregationContext);
++    return context;
++  }
    /**
     * Get the <code>ApplicationId</code> of the submitted application.
     * @return <code>ApplicationId</code> of the submitted application
@@@ -406,7 -406,7 +421,7 @@@
    /**
     * Get the reservation id, that corresponds to a valid resource allocation in
     * the scheduler (between start and end time of the corresponding reservation)
--   * 
++   *
     * @return the reservation id representing the unique id of the corresponding
     *         reserved resource allocation in the scheduler
     */
@@@ -417,7 -417,7 +432,7 @@@
    /**
     * Set the reservation id, that correspond to a valid resource allocation in
     * the scheduler (between start and end time of the corresponding reservation)
--   * 
++   *
     * @param reservationID representing the unique id of the
     *          corresponding reserved resource allocation in the scheduler
     */

http://git-wip-us.apache.org/repos/asf/hadoop/blob/a6e38a53/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto
----------------------------------------------------------------------
diff --cc hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto
index d07ce13,4e415d6..2a5029a
--- 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
@@@ -346,35 -346,31 +346,35 @@@ message QueueUserACLInfoProto 
  ////////////////////////////////////////////////////////////////////////
  
  message ReservationIdProto {
-   optional int64 id = 1;
-   optional int64 cluster_timestamp = 2;
+ optional int64 id = 1;
+ optional int64 cluster_timestamp = 2;
  }
 +
  message ReservationRequestProto {
-   optional ResourceProto capability = 1;
-   optional int32 num_containers = 2 [default = 1];
-   optional int32 concurrency = 3 [default = 1];
-   optional int64 duration = 4 [default = -1];
+ optional ResourceProto capability = 1;
+ optional int32 num_containers = 2 [default = 1];
+ optional int32 concurrency = 3 [default = 1];
+ optional int64 duration = 4 [default = -1];
  }
 +
  message ReservationRequestsProto {
-   repeated ReservationRequestProto reservation_resources = 1;
-   optional ReservationRequestInterpreterProto interpreter = 2 [default = R_ALL];
+ repeated ReservationRequestProto reservation_resources = 1;
+ optional ReservationRequestInterpreterProto interpreter = 2 [default = R_ALL];
  }
 +
  message ReservationDefinitionProto {
-   optional ReservationRequestsProto reservation_requests = 1;
-   optional int64 arrival = 2;
-   optional int64 deadline = 3;
-   optional string reservation_name = 4;
+ optional ReservationRequestsProto reservation_requests = 1;
+ optional int64 arrival = 2;
+ optional int64 deadline = 3;
+ optional string reservation_name = 4;
  }
 +
  enum ReservationRequestInterpreterProto {
-   R_ANY = 0;
-   R_ALL = 1;
-   R_ORDER = 2;
-   R_ORDER_NO_GAP = 3;
-  }
+ R_ANY = 0;
+ R_ALL = 1;
+ R_ORDER = 2;
+ R_ORDER_NO_GAP = 3;
+ }
  
  ////////////////////////////////////////////////////////////////////////
  ////// From container_manager //////////////////////////////////////////


Mime
View raw message