Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-11133. YarnClient gets the wrong EffectiveMinCapacity value (#4280) 

(cherry picked from commit 79cc0caf9f)
This commit is contained in:
Zilong Zhu 2022-05-17 00:40:09 +08:00 committed by Akira Ajisaka
parent fe306ce57e
commit 2dd5852ad0
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueConfigurationsPBImpl.java
View File

@ -72,11 +72,11 @@ public class QueueConfigurationsPBImpl extends QueueConfigurations {
.setEffectiveMaxCapacity(convertToProtoFormat(this.effMaxResource)); .setEffectiveMaxCapacity(convertToProtoFormat(this.effMaxResource));
} }
if (this.configuredMinResource != null) { if (this.configuredMinResource != null) {
builder.setEffectiveMinCapacity( builder.setConfiguredMinCapacity(
convertToProtoFormat(this.configuredMinResource)); convertToProtoFormat(this.configuredMinResource));
} }
if (this.configuredMaxResource != null) { if (this.configuredMaxResource != null) {
builder.setEffectiveMaxCapacity( builder.setConfiguredMaxCapacity(
convertToProtoFormat(this.configuredMaxResource)); convertToProtoFormat(this.configuredMaxResource));
} }
} }

8
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestPBImplRecords.java
View File

@ -200,6 +200,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.PreemptionResourceRequestPBImpl;
import org.apache.hadoop.yarn.api.records.impl.pb.PriorityPBImpl; 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.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.QueueUserACLInfoPBImpl;
import org.apache.hadoop.yarn.api.records.impl.pb.ResourceBlacklistRequestPBImpl; import org.apache.hadoop.yarn.api.records.impl.pb.ResourceBlacklistRequestPBImpl;
import org.apache.hadoop.yarn.api.records.impl.pb.ResourceOptionPBImpl; import org.apache.hadoop.yarn.api.records.impl.pb.ResourceOptionPBImpl;
@ -243,6 +244,7 @@ import org.apache.hadoop.yarn.proto.YarnProtos.PreemptionMessageProto;
import org.apache.hadoop.yarn.proto.YarnProtos.PreemptionResourceRequestProto; import org.apache.hadoop.yarn.proto.YarnProtos.PreemptionResourceRequestProto;
import org.apache.hadoop.yarn.proto.YarnProtos.PriorityProto; import org.apache.hadoop.yarn.proto.YarnProtos.PriorityProto;
import org.apache.hadoop.yarn.proto.YarnProtos.QueueInfoProto; 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.QueueUserACLInfoProto;
import org.apache.hadoop.yarn.proto.YarnProtos.ResourceBlacklistRequestProto; import org.apache.hadoop.yarn.proto.YarnProtos.ResourceBlacklistRequestProto;
import org.apache.hadoop.yarn.proto.YarnProtos.ResourceOptionProto; import org.apache.hadoop.yarn.proto.YarnProtos.ResourceOptionProto;
@ -914,6 +916,12 @@ public class TestPBImplRecords extends BasePBImplRecordsTest {
validatePBImplRecord(QueueInfoPBImpl.class, QueueInfoProto.class); validatePBImplRecord(QueueInfoPBImpl.class, QueueInfoProto.class);
} }
@Test
public void testQueueConfigurationsPBImpl() throws Exception{
validatePBImplRecord(QueueConfigurationsPBImpl.class,
QueueConfigurationsProto.class);
}
@Test @Test
public void testQueueUserACLInfoPBImpl() throws Exception { public void testQueueUserACLInfoPBImpl() throws Exception {
validatePBImplRecord(QueueUserACLInfoPBImpl.class, validatePBImplRecord(QueueUserACLInfoPBImpl.class,