You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by he...@apache.org on 2022/05/16 16:40:22 UTC
[hadoop] branch trunk updated: YARN-11133. YarnClient gets the wrong EffectiveMinCapacity value (#4280)
This is an automated email from the ASF dual-hosted git repository.
hemanthboyina pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 79cc0caf9fd YARN-11133. YarnClient gets the wrong EffectiveMinCapacity value (#4280)
79cc0caf9fd is described below
commit 79cc0caf9fde8ad6a9170ed7572a73e01b37d9e0
Author: Zilong Zhu <zh...@gmail.com>
AuthorDate: Tue May 17 00:40:09 2022 +0800
YARN-11133. YarnClient gets the wrong EffectiveMinCapacity value (#4280)
* Update QueueConfigurationsPBImpl.java
* Update TestPBImplRecords.java
* Update TestPBImplRecords.java
* Update TestPBImplRecords.java
* Update TestPBImplRecords.java
---
.../yarn/api/records/impl/pb/QueueConfigurationsPBImpl.java | 4 ++--
.../test/java/org/apache/hadoop/yarn/api/TestPBImplRecords.java | 8 ++++++++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueConfigurationsPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueConfigurationsPBImpl.java
index 1b14f9d700c..1d213b30592 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueConfigurationsPBImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueConfigurationsPBImpl.java
@@ -72,11 +72,11 @@ public class QueueConfigurationsPBImpl extends QueueConfigurations {
.setEffectiveMaxCapacity(convertToProtoFormat(this.effMaxResource));
}
if (this.configuredMinResource != null) {
- builder.setEffectiveMinCapacity(
+ builder.setConfiguredMinCapacity(
convertToProtoFormat(this.configuredMinResource));
}
if (this.configuredMaxResource != null) {
- builder.setEffectiveMaxCapacity(
+ builder.setConfiguredMaxCapacity(
convertToProtoFormat(this.configuredMaxResource));
}
}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestPBImplRecords.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestPBImplRecords.java
index ceebbdbc433..2edd7b74792 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestPBImplRecords.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestPBImplRecords.java
@@ -202,6 +202,7 @@ import org.apache.hadoop.yarn.api.records.impl.pb.PreemptionMessagePBImpl;
import org.apache.hadoop.yarn.api.records.impl.pb.PreemptionResourceRequestPBImpl;
import org.apache.hadoop.yarn.api.records.impl.pb.PriorityPBImpl;
import org.apache.hadoop.yarn.api.records.impl.pb.QueueInfoPBImpl;
+import org.apache.hadoop.yarn.api.records.impl.pb.QueueConfigurationsPBImpl;
import org.apache.hadoop.yarn.api.records.impl.pb.QueueUserACLInfoPBImpl;
import org.apache.hadoop.yarn.api.records.impl.pb.ResourceBlacklistRequestPBImpl;
import org.apache.hadoop.yarn.api.records.impl.pb.ResourceOptionPBImpl;
@@ -245,6 +246,7 @@ import org.apache.hadoop.yarn.proto.YarnProtos.PreemptionMessageProto;
import org.apache.hadoop.yarn.proto.YarnProtos.PreemptionResourceRequestProto;
import org.apache.hadoop.yarn.proto.YarnProtos.PriorityProto;
import org.apache.hadoop.yarn.proto.YarnProtos.QueueInfoProto;
+import org.apache.hadoop.yarn.proto.YarnProtos.QueueConfigurationsProto;
import org.apache.hadoop.yarn.proto.YarnProtos.QueueUserACLInfoProto;
import org.apache.hadoop.yarn.proto.YarnProtos.ResourceBlacklistRequestProto;
import org.apache.hadoop.yarn.proto.YarnProtos.ResourceOptionProto;
@@ -918,6 +920,12 @@ public class TestPBImplRecords extends BasePBImplRecordsTest {
validatePBImplRecord(QueueInfoPBImpl.class, QueueInfoProto.class);
}
+ @Test
+ public void testQueueConfigurationsPBImpl() throws Exception{
+ validatePBImplRecord(QueueConfigurationsPBImpl.class,
+ QueueConfigurationsProto.class);
+ }
+
@Test
public void testQueueUserACLInfoPBImpl() throws Exception {
validatePBImplRecord(QueueUserACLInfoPBImpl.class,
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org