YARN-7296. convertToProtoFormat(Resource r) is not setting for all resource types. Contributed by lovekesh bansal.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/41351b05 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/41351b05 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/41351b05 Branch: refs/heads/YARN-5881 Commit: 41351b05f32fe0c69dd7e1a4c4c18922fc857f4f Parents: 5cfbad6 Author: Sunil G <[email protected]> Authored: Tue Oct 10 12:02:18 2017 +0530 Committer: Sunil G <[email protected]> Committed: Tue Oct 10 12:02:18 2017 +0530 ---------------------------------------------------------------------- .../impl/pb/GetAllResourceProfilesResponsePBImpl.java | 6 ++---- .../impl/pb/GetResourceProfileResponsePBImpl.java | 9 +++------ .../yarn/api/records/impl/pb/ProfileCapabilityPBImpl.java | 7 ++----- 3 files changed, 7 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/41351b05/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetAllResourceProfilesResponsePBImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetAllResourceProfilesResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetAllResourceProfilesResponsePBImpl.java index eaa392f..6eb0dff 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetAllResourceProfilesResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetAllResourceProfilesResponsePBImpl.java @@ -22,6 +22,7 @@ import org.apache.hadoop.classification.InterfaceAudience; 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 @@ public class GetAllResourceProfilesResponsePBImpl } private ResourceProto convertToProtoFormat(Resource res) { - ResourcePBImpl r = new ResourcePBImpl(); - r.setMemorySize(res.getMemorySize()); - r.setVirtualCores(res.getVirtualCores()); - return r.getProto(); + return ProtoUtils.convertToProtoFormat(res); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/41351b05/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetResourceProfileResponsePBImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetResourceProfileResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetResourceProfileResponsePBImpl.java index e08d077..d30de3d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetResourceProfileResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetResourceProfileResponsePBImpl.java @@ -22,10 +22,10 @@ import org.apache.hadoop.classification.InterfaceAudience; 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 @@ public class GetResourceProfileResponsePBImpl } 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() { http://git-wip-us.apache.org/repos/asf/hadoop/blob/41351b05/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ProfileCapabilityPBImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ProfileCapabilityPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ProfileCapabilityPBImpl.java index 8c161f8..cfe1e8c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ProfileCapabilityPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ProfileCapabilityPBImpl.java @@ -23,8 +23,8 @@ import org.apache.hadoop.classification.InterfaceStability; 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 @@ public class ProfileCapabilityPBImpl extends ProfileCapability { } 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); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
