diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetNewApplicationResponse.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetNewApplicationResponse.java
index e79c5b6..1a1dd7e 100644
--- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetNewApplicationResponse.java
+++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetNewApplicationResponse.java
@@ -43,7 +43,6 @@ public static GetNewApplicationResponse newInstance(
GetNewApplicationResponse response =
Records.newRecord(GetNewApplicationResponse.class);
response.setApplicationId(applicationId);
- response.setMinimumResourceCapability(minCapability);
response.setMaximumResourceCapability(maxCapability);
return response;
}
@@ -61,20 +60,7 @@ public static GetNewApplicationResponse newInstance(
@Private
@Unstable
public abstract void setApplicationId(ApplicationId applicationId);
-
- /**
- * Get the minimum capability for any {@link Resource} allocated by the
- * ResourceManager in the cluster.
- * @return minimum capability of allocated resources in the cluster
- */
- @Public
- @Stable
- public abstract Resource getMinimumResourceCapability();
-
- @Private
- @Unstable
- public abstract void setMinimumResourceCapability(Resource capability);
-
+
/**
* Get the maximum capability for any {@link Resource} allocated by the
* ResourceManager in the cluster.
diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetNewApplicationResponsePBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetNewApplicationResponsePBImpl.java
index 18b8a07..8259698 100644
--- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetNewApplicationResponsePBImpl.java
+++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetNewApplicationResponsePBImpl.java
@@ -78,9 +78,6 @@ private void mergeLocalToBuilder() {
if (applicationId != null) {
builder.setApplicationId(convertToProtoFormat(this.applicationId));
}
- if (minimumResourceCapability != null) {
- builder.setMinimumCapability(convertToProtoFormat(this.minimumResourceCapability));
- }
if (maximumResourceCapability != null) {
builder.setMaximumCapability(convertToProtoFormat(this.maximumResourceCapability));
}
@@ -141,21 +138,6 @@ public Resource getMaximumResourceCapability() {
}
@Override
- public Resource getMinimumResourceCapability() {
- if (this.minimumResourceCapability != null) {
- return this.minimumResourceCapability;
- }
-
- GetNewApplicationResponseProtoOrBuilder p = viaProto ? proto : builder;
- if (!p.hasMinimumCapability()) {
- return null;
- }
-
- this.minimumResourceCapability = convertFromProtoFormat(p.getMinimumCapability());
- return this.minimumResourceCapability;
- }
-
- @Override
public void setMaximumResourceCapability(Resource capability) {
maybeInitBuilder();
if(maximumResourceCapability == null) {
@@ -163,16 +145,7 @@ public void setMaximumResourceCapability(Resource capability) {
}
this.maximumResourceCapability = capability;
}
-
- @Override
- public void setMinimumResourceCapability(Resource capability) {
- maybeInitBuilder();
- if(minimumResourceCapability == null) {
- builder.clearMinimumCapability();
- }
- this.minimumResourceCapability = capability;
- }
-
+
private ApplicationIdPBImpl convertFromProtoFormat(ApplicationIdProto p) {
return new ApplicationIdPBImpl(p);
}
diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_service_protos.proto hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_service_protos.proto
index 84d5afb..81a7d95 100644
--- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_service_protos.proto
+++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_service_protos.proto
@@ -84,8 +84,7 @@ message GetNewApplicationRequestProto {
message GetNewApplicationResponseProto {
optional ApplicationIdProto application_id = 1;
- optional ResourceProto minimumCapability = 2;
- optional ResourceProto maximumCapability = 3;
+ optional ResourceProto maximumCapability = 2;
}
message GetApplicationReportRequestProto {
diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java
index cec24c2..39dce11 100644
--- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java
+++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java
@@ -359,21 +359,11 @@ public boolean run() throws IOException, YarnException {
// the required resources from the RM for the app master
// Memory ask has to be a multiple of min and less than max.
// Dump out information about cluster capability as seen by the resource manager
- int minMem = newApp.getMinimumResourceCapability().getMemory();
int maxMem = newApp.getMaximumResourceCapability().getMemory();
- LOG.info("Min mem capabililty of resources in this cluster " + minMem);
LOG.info("Max mem capabililty of resources in this cluster " + maxMem);
- // A resource ask has to be atleast the minimum of the capability of the cluster, the value has to be
- // a multiple of the min value and cannot exceed the max.
- // If it is not an exact multiple of min, the RM will allocate to the nearest multiple of min
- if (amMemory < minMem) {
- LOG.info("AM memory specified below min threshold of cluster. Using min value."
- + ", specified=" + amMemory
- + ", min=" + minMem);
- amMemory = minMem;
- }
- else if (amMemory > maxMem) {
+ // A resource ask cannot exceed the max.
+ if (amMemory > maxMem) {
LOG.info("AM memory specified above max threshold of cluster. Using max value."
+ ", specified=" + amMemory
+ ", max=" + maxMem);
diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java
index 88bc68b..1a78dc3 100644
--- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java
+++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java
@@ -208,8 +208,6 @@ public GetNewApplicationResponse getNewApplication(
.newRecordInstance(GetNewApplicationResponse.class);
response.setApplicationId(getNewApplicationId());
// Pick up min/max resource from scheduler...
- response.setMinimumResourceCapability(scheduler
- .getMinimumResourceCapability());
response.setMaximumResourceCapability(scheduler
.getMaximumResourceCapability());
diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRM.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRM.java
index 295382e..0908b2f 100644
--- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRM.java
+++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRM.java
@@ -58,7 +58,6 @@ public void testGetNewAppId() throws Exception {
GetNewApplicationResponse resp = rm.getNewAppId();
assert (resp.getApplicationId().getId() != 0);
- assert (resp.getMinimumResourceCapability().getMemory() > 0);
assert (resp.getMaximumResourceCapability().getMemory() > 0);
rm.stop();
}