浏览代码

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

Sunil G 7 年之前
父节点
当前提交
41351b05f3

+ 2 - 4
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.classification.InterfaceStability;
 import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesResponse;
 import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesResponse;
 import org.apache.hadoop.yarn.api.records.Resource;
 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.api.records.impl.pb.ResourcePBImpl;
 import org.apache.hadoop.yarn.proto.YarnProtos.ResourceProto;
 import org.apache.hadoop.yarn.proto.YarnProtos.ResourceProto;
 import org.apache.hadoop.yarn.proto.YarnProtos.ResourceProfilesProto;
 import org.apache.hadoop.yarn.proto.YarnProtos.ResourceProfilesProto;
@@ -129,9 +130,6 @@ public class GetAllResourceProfilesResponsePBImpl
   }
   }
 
 
   private ResourceProto convertToProtoFormat(Resource res) {
   private ResourceProto convertToProtoFormat(Resource res) {
-    ResourcePBImpl r = new ResourcePBImpl();
-    r.setMemorySize(res.getMemorySize());
-    r.setVirtualCores(res.getVirtualCores());
-    return r.getProto();
+    return ProtoUtils.convertToProtoFormat(res);
   }
   }
 }
 }

+ 3 - 6
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.classification.InterfaceStability;
 import org.apache.hadoop.yarn.api.protocolrecords.GetResourceProfileResponse;
 import org.apache.hadoop.yarn.api.protocolrecords.GetResourceProfileResponse;
 import org.apache.hadoop.yarn.api.records.Resource;
 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.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.GetResourceProfileResponseProto;
+import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetResourceProfileResponseProtoOrBuilder;
 import org.apache.hadoop.yarn.util.resource.Resources;
 import org.apache.hadoop.yarn.util.resource.Resources;
 
 
 /**
 /**
@@ -92,10 +92,7 @@ public class GetResourceProfileResponsePBImpl
   }
   }
 
 
   private ResourceProto convertToProtoFormat(Resource res) {
   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() {
   private void maybeInitBuilder() {

+ 2 - 5
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.ProfileCapability;
 import org.apache.hadoop.yarn.api.records.Resource;
 import org.apache.hadoop.yarn.api.records.Resource;
 import org.apache.hadoop.yarn.proto.YarnProtos;
 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.ProfileCapabilityProto;
+import org.apache.hadoop.yarn.proto.YarnProtos.ProfileCapabilityProtoOrBuilder;
 import org.apache.hadoop.yarn.util.resource.Resources;
 import org.apache.hadoop.yarn.util.resource.Resources;
 
 
 /**
 /**
@@ -121,9 +121,6 @@ public class ProfileCapabilityPBImpl extends ProfileCapability {
   }
   }
 
 
   private YarnProtos.ResourceProto convertToProtoFormat(Resource res) {
   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);
   }
   }
 }
 }