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

YARN-9327. Improve synchronisation in ProtoUtils#convertToProtoFormat block. Contributed by Bibin A Chundatt.

Browse Source 
(cherry picked from commit 0c8813f135f8c17f88660bb92529c15bb3a157ca)
This commit is contained in:
Sunil G 2019-07-02 11:44:11 +05:30
parent 46b81a982b
commit d2a5749482
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -400,7 +400,7 @@ public static ContainerUpdateType convertFromProtoFormat(
/* /*
* Resource * Resource
*/ */
public static synchronized ResourceProto convertToProtoFormat(Resource r) { public static ResourceProto convertToProtoFormat(Resource r) {
return ResourcePBImpl.getProto(r); return ResourcePBImpl.getProto(r);
} }

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

@ -71,14 +71,14 @@ public ResourcePBImpl(ResourceProto proto) {
initResources(); initResources();
} }
public ResourceProto getProto() { synchronized public ResourceProto getProto() {
mergeLocalToProto(); mergeLocalToProto();
proto = viaProto ? proto : builder.build(); proto = viaProto ? proto : builder.build();
viaProto = true; viaProto = true;
return proto; return proto;
} }
private void maybeInitBuilder() { synchronized private void maybeInitBuilder() {
if (viaProto || builder == null) { if (viaProto || builder == null) {
builder = ResourceProto.newBuilder(proto); builder = ResourceProto.newBuilder(proto);
} }
@ -127,7 +127,7 @@ public void setVirtualCores(int vCores) {
resources[VCORES_INDEX].setValue(vCores); resources[VCORES_INDEX].setValue(vCores);
} }
private void initResources() { synchronized private void initResources() {
if (this.resources != null) { if (this.resources != null) {
return; return;
} }