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

YARN-7296. convertToProtoFormat(Resource r) is not setting for all resource types. Contributed by lovekesh bansal.

Browse Source
This commit is contained in:
Sunil G 2017-10-10 12:02:18 +05:30
parent 5cfbad68c0
commit 41351b05f3
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetAllResourceProfilesResponsePBImpl.java
View File

@ -22,6 +22,7 @@
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesResponse;
import org.apache.hadoop.yarn.api.records.Resource;
import org.apache.hadoop.yarn.api.records.impl.pb.ProtoUtils;
import org.apache.hadoop.yarn.api.records.impl.pb.ResourcePBImpl;
import org.apache.hadoop.yarn.proto.YarnProtos.ResourceProto;
import org.apache.hadoop.yarn.proto.YarnProtos.ResourceProfilesProto;
@ -129,9 +130,6 @@ private void initResourceProfiles() {
}
private ResourceProto convertToProtoFormat(Resource res) {
ResourcePBImpl r = new ResourcePBImpl();
r.setMemorySize(res.getMemorySize());
r.setVirtualCores(res.getVirtualCores());
return r.getProto();
return ProtoUtils.convertToProtoFormat(res);
}
}

9
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetResourceProfileResponsePBImpl.java
View File

@ -22,10 +22,10 @@
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.yarn.api.protocolrecords.GetResourceProfileResponse;
import org.apache.hadoop.yarn.api.records.Resource;
import org.apache.hadoop.yarn.api.records.impl.pb.ResourcePBImpl;
import org.apache.hadoop.yarn.api.records.impl.pb.ProtoUtils;
import org.apache.hadoop.yarn.proto.YarnProtos.ResourceProto;
import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetResourceProfileResponseProtoOrBuilder;
import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetResourceProfileResponseProto;
import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetResourceProfileResponseProtoOrBuilder;
import org.apache.hadoop.yarn.util.resource.Resources;
/**
@ -92,10 +92,7 @@ private void mergeLocalToBuilder() {
}
private ResourceProto convertToProtoFormat(Resource res) {
ResourcePBImpl r = new ResourcePBImpl();
r.setMemorySize(res.getMemorySize());
r.setVirtualCores(res.getVirtualCores());
return r.getProto();
return ProtoUtils.convertToProtoFormat(res);
}
private void maybeInitBuilder() {

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

@ -23,8 +23,8 @@
import org.apache.hadoop.yarn.api.records.ProfileCapability;
import org.apache.hadoop.yarn.api.records.Resource;
import org.apache.hadoop.yarn.proto.YarnProtos;
import org.apache.hadoop.yarn.proto.YarnProtos.ProfileCapabilityProtoOrBuilder;
import org.apache.hadoop.yarn.proto.YarnProtos.ProfileCapabilityProto;
import org.apache.hadoop.yarn.proto.YarnProtos.ProfileCapabilityProtoOrBuilder;
import org.apache.hadoop.yarn.util.resource.Resources;
/**
@ -121,9 +121,6 @@ private void maybeInitBuilder() {
}
private YarnProtos.ResourceProto convertToProtoFormat(Resource res) {
ResourcePBImpl r = new ResourcePBImpl();
r.setMemorySize(res.getMemorySize());
r.setVirtualCores(res.getVirtualCores());
return r.getProto();
return ProtoUtils.convertToProtoFormat(res);
}
}