diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/AllocateRequestPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/AllocateRequestPBImpl.java index bff252f..3b47994 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/AllocateRequestPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/AllocateRequestPBImpl.java @@ -88,7 +88,7 @@ public String toString() { return TextFormat.shortDebugString(getProto()); } - private void mergeLocalToBuilder() { + private synchronized void mergeLocalToBuilder() { if (this.ask != null) { addAsksToProto(); } @@ -140,13 +140,14 @@ public void setProgress(float progress) { } @Override - public List getAskList() { + public synchronized List getAskList() { initAsks(); return this.ask; } @Override - public void setAskList(final List resourceRequests) { + public synchronized void setAskList( + final List resourceRequests) { if(resourceRequests == null) { return; } @@ -190,7 +191,7 @@ private void initAsks() { } } - private void addAsksToProto() { + private synchronized void addAsksToProto() { maybeInitBuilder(); builder.clearAsk(); if (ask == null) @@ -224,12 +225,12 @@ public void remove() { builder.addAllAsk(iterable); } @Override - public List getReleaseList() { + public synchronized List getReleaseList() { initReleases(); return this.release; } @Override - public void setReleaseList(List releaseContainers) { + public synchronized void setReleaseList(List releaseContainers) { if(releaseContainers == null) { return; } @@ -251,7 +252,7 @@ private void initReleases() { } } - private void addReleasesToProto() { + private synchronized void addReleasesToProto() { maybeInitBuilder(); builder.clearRelease(); if (release == null) diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetApplicationsRequestPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetApplicationsRequestPBImpl.java index 33f74f0..c769d95 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetApplicationsRequestPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetApplicationsRequestPBImpl.java @@ -69,7 +69,7 @@ private void mergeLocalToProto() { viaProto = true; } - private void mergeLocalToBuilder() { + private synchronized void mergeLocalToBuilder() { if (this.applicationTypes != null) { addLocalApplicationTypesToProto(); } @@ -109,7 +109,7 @@ public void remove() { } } - private void addLocalApplicationTypesToProto() { + private synchronized void addLocalApplicationTypesToProto() { maybeInitBuilder(); builder.clearApplicationTypes(); if (this.applicationTypes == null) @@ -149,13 +149,13 @@ private void initApplicationStates() { } @Override - public Set getApplicationTypes() { + public synchronized Set getApplicationTypes() { initApplicationTypes(); return this.applicationTypes; } @Override - public void setApplicationTypes(Set applicationTypes) { + public synchronized void setApplicationTypes(Set applicationTypes) { maybeInitBuilder(); if (applicationTypes == null) builder.clearApplicationTypes(); @@ -163,13 +163,14 @@ public void setApplicationTypes(Set applicationTypes) { } @Override - public EnumSet getApplicationStates() { + public synchronized EnumSet getApplicationStates() { initApplicationStates(); return this.applicationStates; } @Override - public void setApplicationStates(EnumSet applicationStates) { + public synchronized void setApplicationStates( + EnumSet applicationStates) { maybeInitBuilder(); if (applicationStates == null) { builder.clearApplicationStates(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetApplicationsResponsePBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetApplicationsResponsePBImpl.java index 453fc89..6a10b63 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetApplicationsResponsePBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetApplicationsResponsePBImpl.java @@ -55,13 +55,14 @@ public GetApplicationsResponsePBImpl(GetApplicationsResponseProto proto) { } @Override - public List getApplicationList() { + public synchronized List getApplicationList() { initLocalApplicationsList(); return this.applicationList; } @Override - public void setApplicationList(List applications) { + public synchronized void setApplicationList( + List applications) { maybeInitBuilder(); if (applications == null) builder.clearApplications(); @@ -95,7 +96,7 @@ public String toString() { return TextFormat.shortDebugString(getProto()); } - private void mergeLocalToBuilder() { + private synchronized void mergeLocalToBuilder() { if (this.applicationList != null) { addLocalApplicationsToProto(); } @@ -131,7 +132,7 @@ private void initLocalApplicationsList() { } } - private void addLocalApplicationsToProto() { + private synchronized void addLocalApplicationsToProto() { maybeInitBuilder(); builder.clearApplications(); if (applicationList == null) diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterNodesRequestPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterNodesRequestPBImpl.java index 09c0fc7..18c3577 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterNodesRequestPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterNodesRequestPBImpl.java @@ -60,13 +60,13 @@ public GetClusterNodesRequestProto getProto() { } @Override - public EnumSet getNodeStates() { + public synchronized EnumSet getNodeStates() { initNodeStates(); return this.states; } @Override - public void setNodeStates(final EnumSet states) { + public synchronized void setNodeStates(final EnumSet states) { initNodeStates(); this.states.clear(); if (states == null) { @@ -91,7 +91,7 @@ private void maybeInitBuilder() { viaProto = false; } - private void mergeLocalToBuilder() { + private synchronized void mergeLocalToBuilder() { if (this.states != null) { maybeInitBuilder(); builder.clearNodeStates(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterNodesResponsePBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterNodesResponsePBImpl.java index 04530e5..9ed13e1 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterNodesResponsePBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterNodesResponsePBImpl.java @@ -54,13 +54,13 @@ public GetClusterNodesResponsePBImpl(GetClusterNodesResponseProto proto) { } @Override - public List getNodeReports() { + public synchronized List getNodeReports() { initLocalNodeManagerInfosList(); return this.nodeManagerInfoList; } @Override - public void setNodeReports(List nodeManagers) { + public synchronized void setNodeReports(List nodeManagers) { if (nodeManagers == null) { builder.clearNodeReports(); } @@ -94,7 +94,7 @@ public String toString() { return TextFormat.shortDebugString(getProto()); } - private void mergeLocalToBuilder() { + private synchronized void mergeLocalToBuilder() { if (this.nodeManagerInfoList != null) { addLocalNodeManagerInfosToProto(); } @@ -130,7 +130,7 @@ private void initLocalNodeManagerInfosList() { } } - private void addLocalNodeManagerInfosToProto() { + private synchronized void addLocalNodeManagerInfosToProto() { maybeInitBuilder(); builder.clearNodeReports(); if (nodeManagerInfoList == null) diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetContainerStatusesRequestPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetContainerStatusesRequestPBImpl.java index bbc1492..659ccc8 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetContainerStatusesRequestPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetContainerStatusesRequestPBImpl.java @@ -80,7 +80,7 @@ public String toString() { return TextFormat.shortDebugString(getProto()); } - private void mergeLocalToBuilder() { + private synchronized void mergeLocalToBuilder() { if (this.containerIds != null) { addLocalContainerIdsToProto(); } @@ -101,7 +101,7 @@ private void maybeInitBuilder() { viaProto = false; } - private void addLocalContainerIdsToProto() { + private synchronized void addLocalContainerIdsToProto() { maybeInitBuilder(); builder.clearContainerId(); if (this.containerIds == null) @@ -126,13 +126,13 @@ private void initLocalContainerIds() { } @Override - public List getContainerIds() { + public synchronized List getContainerIds() { initLocalContainerIds(); return this.containerIds; } @Override - public void setContainerIds(List containerIds) { + public synchronized void setContainerIds(List containerIds) { maybeInitBuilder(); if (containerIds == null) builder.clearContainerId(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetContainerStatusesResponsePBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetContainerStatusesResponsePBImpl.java index fb8885b..d424a54 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetContainerStatusesResponsePBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetContainerStatusesResponsePBImpl.java @@ -90,7 +90,7 @@ public String toString() { return TextFormat.shortDebugString(getProto()); } - private void mergeLocalToBuilder() { + private synchronized void mergeLocalToBuilder() { if (this.containerStatuses != null) { addLocalContainerStatusesToProto(); } @@ -114,7 +114,7 @@ private void maybeInitBuilder() { viaProto = false; } - private void addLocalContainerStatusesToProto() { + private synchronized void addLocalContainerStatusesToProto() { maybeInitBuilder(); builder.clearStatus(); if (this.containerStatuses == null) @@ -127,7 +127,7 @@ private void addLocalContainerStatusesToProto() { builder.addAllStatus(protoList); } - private void addFailedRequestsToProto() { + private synchronized void addFailedRequestsToProto() { maybeInitBuilder(); builder.clearFailedRequests(); if (this.failedRequests == null) @@ -169,13 +169,13 @@ private void initFailedRequests() { } @Override - public List getContainerStatuses() { + public synchronized List getContainerStatuses() { initLocalContainerStatuses(); return this.containerStatuses; } @Override - public void setContainerStatuses(List statuses) { + public synchronized void setContainerStatuses(List statuses) { maybeInitBuilder(); if (statuses == null) builder.clearStatus(); @@ -183,13 +183,13 @@ public void setContainerStatuses(List statuses) { } @Override - public Map getFailedRequests() { + public synchronized Map getFailedRequests() { initFailedRequests(); return this.failedRequests; } @Override - public void setFailedRequests( + public synchronized void setFailedRequests( Map failedRequests) { maybeInitBuilder(); if (failedRequests == null) diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetQueueUserAclsInfoResponsePBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetQueueUserAclsInfoResponsePBImpl.java index 8d405d9..0648847 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetQueueUserAclsInfoResponsePBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetQueueUserAclsInfoResponsePBImpl.java @@ -55,13 +55,14 @@ public GetQueueUserAclsInfoResponsePBImpl( } @Override - public List getUserAclsInfoList() { + public synchronized List getUserAclsInfoList() { initLocalQueueUserAclsList(); return queueUserAclsInfoList; } @Override - public void setUserAclsInfoList(List queueUserAclsList) { + public synchronized void setUserAclsInfoList( + List queueUserAclsList) { if (queueUserAclsList == null) { builder.clearQueueUserAcls(); } @@ -95,7 +96,7 @@ public String toString() { return TextFormat.shortDebugString(getProto()); } - private void mergeLocalToBuilder() { + private synchronized void mergeLocalToBuilder() { if (this.queueUserAclsInfoList != null) { addLocalQueueUserACLInfosToProto(); } @@ -131,7 +132,7 @@ private void initLocalQueueUserAclsList() { } } - private void addLocalQueueUserACLInfosToProto() { + private synchronized void addLocalQueueUserACLInfosToProto() { maybeInitBuilder(); builder.clearQueueUserAcls(); if (queueUserAclsInfoList == null) diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RegisterApplicationMasterResponsePBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RegisterApplicationMasterResponsePBImpl.java index 486304c..848d7f0 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RegisterApplicationMasterResponsePBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RegisterApplicationMasterResponsePBImpl.java @@ -97,7 +97,7 @@ private void mergeLocalToProto() { viaProto = true; } - private void mergeLocalToBuilder() { + private synchronized void mergeLocalToBuilder() { if (this.maximumResourceCapability != null) { builder.setMaximumCapability( convertToProtoFormat(this.maximumResourceCapability)); @@ -140,7 +140,7 @@ public void setMaximumResourceCapability(Resource capability) { } @Override - public Map getApplicationACLs() { + public synchronized Map getApplicationACLs() { initApplicationACLs(); return this.applicationACLS; } @@ -161,7 +161,7 @@ private void initApplicationACLs() { } } - private void addApplicationACLs() { + private synchronized void addApplicationACLs() { maybeInitBuilder(); builder.clearApplicationACLs(); if (applicationACLS == null) { @@ -200,7 +200,7 @@ public void remove() { } @Override - public void setApplicationACLs( + public synchronized void setApplicationACLs( final Map appACLs) { if (appACLs == null) return; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StartContainersRequestPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StartContainersRequestPBImpl.java index 2233705..7ecedb2 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StartContainersRequestPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StartContainersRequestPBImpl.java @@ -74,7 +74,7 @@ private void mergeLocalToProto() { viaProto = true; } - private void mergeLocalToBuilder() { + private synchronized void mergeLocalToBuilder() { if (requests != null) { addLocalRequestsToProto(); } @@ -88,7 +88,7 @@ private void maybeInitBuilder() { viaProto = false; } - private void addLocalRequestsToProto() { + private synchronized void addLocalRequestsToProto() { maybeInitBuilder(); builder.clearStartContainerRequest(); List protoList = @@ -110,7 +110,8 @@ private void initLocalRequests() { } @Override - public void setStartContainerRequests(List requests) { + public synchronized void setStartContainerRequests( + List requests) { maybeInitBuilder(); if (requests == null) { builder.clearStartContainerRequest(); @@ -119,7 +120,7 @@ public void setStartContainerRequests(List requests) { } @Override - public List getStartContainerRequests() { + public synchronized List getStartContainerRequests() { if (this.requests != null) { return this.requests; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StartContainersResponsePBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StartContainersResponsePBImpl.java index 8f5c740..a2d8f15 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StartContainersResponsePBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StartContainersResponsePBImpl.java @@ -91,7 +91,7 @@ public String toString() { return TextFormat.shortDebugString(getProto()); } - private void mergeLocalToBuilder() { + private synchronized void mergeLocalToBuilder() { if (this.servicesMetaData != null) { addServicesMetaDataToProto(); } @@ -145,13 +145,14 @@ private void maybeInitBuilder() { } @Override - public Map getAllServicesMetaData() { + public synchronized Map getAllServicesMetaData() { initServicesMetaData(); return this.servicesMetaData; } @Override - public void setAllServicesMetaData(Map servicesMetaData) { + public synchronized void setAllServicesMetaData( + Map servicesMetaData) { if (servicesMetaData == null) { return; } @@ -174,7 +175,7 @@ private void initServicesMetaData() { } } - private void addServicesMetaDataToProto() { + private synchronized void addServicesMetaDataToProto() { maybeInitBuilder(); builder.clearServicesMetaData(); if (servicesMetaData == null) @@ -211,7 +212,7 @@ public boolean hasNext() { builder.addAllServicesMetaData(iterable); } - private void addFailedContainersToProto() { + private synchronized void addFailedContainersToProto() { maybeInitBuilder(); builder.clearFailedRequests(); if (this.failedContainers == null) @@ -228,7 +229,7 @@ private void addFailedContainersToProto() { builder.addAllFailedRequests(protoList); } - private void addSucceededContainersToProto() { + private synchronized void addSucceededContainersToProto() { maybeInitBuilder(); builder.clearSucceededRequests(); if (this.succeededContainers == null) { @@ -274,13 +275,13 @@ private void initSucceededContainers() { } @Override - public List getSuccessfullyStartedContainers() { + public synchronized List getSuccessfullyStartedContainers() { initSucceededContainers(); return this.succeededContainers; } @Override - public void setSuccessfullyStartedContainers( + public synchronized void setSuccessfullyStartedContainers( List succeededContainers) { maybeInitBuilder(); if (succeededContainers == null) { @@ -303,13 +304,13 @@ private void initFailedContainers() { } @Override - public Map getFailedRequests() { + public synchronized Map getFailedRequests() { initFailedContainers(); return this.failedContainers; } @Override - public void setFailedRequests( + public synchronized void setFailedRequests( Map failedContainers) { maybeInitBuilder(); if (failedContainers == null) diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StopContainersRequestPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StopContainersRequestPBImpl.java index 27e092b..cff6083 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StopContainersRequestPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StopContainersRequestPBImpl.java @@ -78,7 +78,7 @@ public String toString() { return TextFormat.shortDebugString(getProto()); } - private void mergeLocalToBuilder() { + private synchronized void mergeLocalToBuilder() { if (this.containerIds != null) { addLocalContainerIdsToProto(); } @@ -99,7 +99,7 @@ private void maybeInitBuilder() { viaProto = false; } - private void addLocalContainerIdsToProto() { + private synchronized void addLocalContainerIdsToProto() { maybeInitBuilder(); builder.clearContainerId(); if (this.containerIds == null) @@ -124,13 +124,13 @@ private void initLocalContainerIds() { } @Override - public List getContainerIds() { + public synchronized List getContainerIds() { initLocalContainerIds(); return this.containerIds; } @Override - public void setContainerIds(List containerIds) { + public synchronized void setContainerIds(List containerIds) { maybeInitBuilder(); if (containerIds == null) builder.clearContainerId(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StopContainersResponsePBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StopContainersResponsePBImpl.java index dd28b06..d7afbdb 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StopContainersResponsePBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StopContainersResponsePBImpl.java @@ -101,7 +101,7 @@ private void maybeInitBuilder() { viaProto = false; } - private void mergeLocalToBuilder() { + private synchronized void mergeLocalToBuilder() { if (this.succeededRequests != null) { addSucceededRequestsToProto(); @@ -111,7 +111,7 @@ private void mergeLocalToBuilder() { } } - private void addSucceededRequestsToProto() { + private synchronized void addSucceededRequestsToProto() { maybeInitBuilder(); builder.clearSucceededRequests(); if (this.succeededRequests == null) { @@ -145,7 +145,7 @@ public void remove() { builder.addAllSucceededRequests(iterable); } - private void addFailedRequestsToProto() { + private synchronized void addFailedRequestsToProto() { maybeInitBuilder(); builder.clearFailedRequests(); if (this.failedRequests == null) @@ -187,13 +187,14 @@ private void initFailedRequests() { } @Override - public List getSuccessfullyStoppedContainers() { + public synchronized List getSuccessfullyStoppedContainers() { initSucceededRequests(); return this.succeededRequests; } @Override - public void setSuccessfullyStoppedContainers(List succeededRequests) { + public synchronized void setSuccessfullyStoppedContainers( + List succeededRequests) { maybeInitBuilder(); if (succeededRequests == null) { builder.clearSucceededRequests(); @@ -202,13 +203,13 @@ public void setSuccessfullyStoppedContainers(List succeededRequests } @Override - public Map getFailedRequests() { + public synchronized Map getFailedRequests() { initFailedRequests(); return this.failedRequests; } @Override - public void setFailedRequests( + public synchronized void setFailedRequests( Map failedRequests) { maybeInitBuilder(); if (failedRequests == null) diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ContainerLaunchContextPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ContainerLaunchContextPBImpl.java index 12dcfcd..3c5bead 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ContainerLaunchContextPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ContainerLaunchContextPBImpl.java @@ -101,7 +101,7 @@ protected final ByteString convertToProtoFormat(ByteBuffer byteBuffer) { return ProtoUtils.convertToProtoFormat(byteBuffer); } - private void mergeLocalToBuilder() { + private synchronized void mergeLocalToBuilder() { if (this.localResources != null) { addLocalResourcesToProto(); } @@ -138,7 +138,7 @@ private void maybeInitBuilder() { } @Override - public List getCommands() { + public synchronized List getCommands() { initCommands(); return this.commands; } @@ -157,7 +157,7 @@ private void initCommands() { } @Override - public void setCommands(final List commands) { + public synchronized void setCommands(final List commands) { if (commands == null) return; initCommands(); @@ -165,7 +165,7 @@ public void setCommands(final List commands) { this.commands.addAll(commands); } - private void addCommandsToProto() { + private synchronized void addCommandsToProto() { maybeInitBuilder(); builder.clearCommand(); if (this.commands == null) @@ -174,7 +174,7 @@ private void addCommandsToProto() { } @Override - public Map getLocalResources() { + public synchronized Map getLocalResources() { initLocalResources(); return this.localResources; } @@ -193,7 +193,7 @@ private void initLocalResources() { } @Override - public void setLocalResources( + public synchronized void setLocalResources( final Map localResources) { if (localResources == null) return; @@ -202,7 +202,7 @@ public void setLocalResources( this.localResources.putAll(localResources); } - private void addLocalResourcesToProto() { + private synchronized void addLocalResourcesToProto() { maybeInitBuilder(); builder.clearLocalResources(); if (localResources == null) @@ -261,7 +261,7 @@ public void setTokens(ByteBuffer tokens) { } @Override - public Map getServiceData() { + public synchronized Map getServiceData() { initServiceData(); return this.serviceData; } @@ -280,14 +280,15 @@ private void initServiceData() { } @Override - public void setServiceData(final Map serviceData) { + public synchronized void setServiceData( + final Map serviceData) { if (serviceData == null) return; initServiceData(); this.serviceData.putAll(serviceData); } - private void addServiceDataToProto() { + private synchronized void addServiceDataToProto() { maybeInitBuilder(); builder.clearServiceData(); if (serviceData == null) @@ -324,7 +325,7 @@ public boolean hasNext() { } @Override - public Map getEnvironment() { + public synchronized Map getEnvironment() { initEnv(); return this.environment; } @@ -343,7 +344,7 @@ private void initEnv() { } @Override - public void setEnvironment(final Map env) { + public synchronized void setEnvironment(final Map env) { if (env == null) return; initEnv(); @@ -351,7 +352,7 @@ public void setEnvironment(final Map env) { this.environment.putAll(env); } - private void addEnvToProto() { + private synchronized void addEnvToProto() { maybeInitBuilder(); builder.clearEnvironment(); if (environment == null) @@ -388,7 +389,7 @@ public boolean hasNext() { } @Override - public Map getApplicationACLs() { + public synchronized Map getApplicationACLs() { initApplicationACLs(); return this.applicationACLS; } @@ -408,7 +409,7 @@ private void initApplicationACLs() { } } - private void addApplicationACLs() { + private synchronized void addApplicationACLs() { maybeInitBuilder(); builder.clearApplicationACLs(); if (applicationACLS == null) { @@ -447,7 +448,7 @@ public void remove() { } @Override - public void setApplicationACLs( + public synchronized void setApplicationACLs( final Map appACLs) { if (appACLs == null) return; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java index 56a5b58..0a09b9e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java @@ -55,7 +55,7 @@ public QueueInfoPBImpl(QueueInfoProto proto) { } @Override - public List getApplications() { + public synchronized List getApplications() { initLocalApplicationsList(); return this.applicationsList; } @@ -67,7 +67,7 @@ public float getCapacity() { } @Override - public List getChildQueues() { + public synchronized List getChildQueues() { initLocalChildQueuesList(); return this.childQueuesList; } @@ -100,7 +100,8 @@ public QueueState getQueueState() { } @Override - public void setApplications(List applications) { + public synchronized void + setApplications(List applications) { if (applications == null) { builder.clearApplications(); } @@ -114,7 +115,7 @@ public void setCapacity(float capacity) { } @Override - public void setChildQueues(List childQueues) { + public synchronized void setChildQueues(List childQueues) { if (childQueues == null) { builder.clearChildQueues(); } @@ -193,7 +194,7 @@ private void initLocalApplicationsList() { } } - private void addApplicationsToProto() { + private synchronized void addApplicationsToProto() { maybeInitBuilder(); builder.clearApplications(); if (applicationsList == null) @@ -240,7 +241,7 @@ private void initLocalChildQueuesList() { } } - private void addChildQueuesInfoToProto() { + private synchronized void addChildQueuesInfoToProto() { maybeInitBuilder(); builder.clearChildQueues(); if (childQueuesList == null) @@ -274,7 +275,7 @@ public void remove() { builder.addAllChildQueues(iterable); } - private void mergeLocalToBuilder() { + private synchronized void mergeLocalToBuilder() { if (this.childQueuesList != null) { addChildQueuesInfoToProto(); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueUserACLInfoPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueUserACLInfoPBImpl.java index 4aa9b09..dcc3fcd 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueUserACLInfoPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueUserACLInfoPBImpl.java @@ -58,7 +58,7 @@ public String getQueueName() { } @Override - public List getUserAcls() { + public synchronized List getUserAcls() { initLocalQueueUserAclsList(); return this.userAclsList; } @@ -74,7 +74,7 @@ public void setQueueName(String queueName) { } @Override - public void setUserAcls(List userAclsList) { + public synchronized void setUserAcls(List userAclsList) { if (userAclsList == null) { builder.clearUserAcls(); } @@ -121,7 +121,7 @@ private void initLocalQueueUserAclsList() { } } - private void addQueueACLsToProto() { + private synchronized void addQueueACLsToProto() { maybeInitBuilder(); builder.clearUserAcls(); if (userAclsList == null) @@ -162,7 +162,7 @@ private void maybeInitBuilder() { viaProto = false; } - private void mergeLocalToBuilder() { + private synchronized void mergeLocalToBuilder() { if (this.userAclsList != null) { addQueueACLsToProto(); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceBlacklistRequestPBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceBlacklistRequestPBImpl.java index 743e5d1..46c3bbe 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceBlacklistRequestPBImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceBlacklistRequestPBImpl.java @@ -70,7 +70,7 @@ private void mergeLocalToProto() { viaProto = true; } - private void mergeLocalToBuilder() { + private synchronized void mergeLocalToBuilder() { if (this.blacklistAdditions != null) { addBlacklistAdditionsToProto(); } @@ -79,7 +79,7 @@ private void mergeLocalToBuilder() { } } - private void addBlacklistAdditionsToProto() { + private synchronized void addBlacklistAdditionsToProto() { maybeInitBuilder(); builder.clearBlacklistAdditions(); if (this.blacklistAdditions == null) { @@ -88,7 +88,7 @@ private void addBlacklistAdditionsToProto() { builder.addAllBlacklistAdditions(this.blacklistAdditions); } - private void addBlacklistRemovalsToProto() { + private synchronized void addBlacklistRemovalsToProto() { maybeInitBuilder(); builder.clearBlacklistAdditions(); if (this.blacklistRemovals == null) { @@ -118,13 +118,13 @@ private void initBlacklistRemovals() { } @Override - public List getBlacklistAdditions() { + public synchronized List getBlacklistAdditions() { initBlacklistAdditions(); return this.blacklistAdditions; } @Override - public void setBlacklistAdditions(List resourceNames) { + public synchronized void setBlacklistAdditions(List resourceNames) { if (resourceNames == null || resourceNames.isEmpty()) { if (this.blacklistAdditions != null) { this.blacklistAdditions.clear(); @@ -137,13 +137,13 @@ public void setBlacklistAdditions(List resourceNames) { } @Override - public List getBlacklistRemovals() { + public synchronized List getBlacklistRemovals() { initBlacklistRemovals(); return this.blacklistRemovals; } @Override - public void setBlacklistRemovals(List resourceNames) { + public synchronized void setBlacklistRemovals(List resourceNames) { if (resourceNames == null || resourceNames.isEmpty()) { if (this.blacklistRemovals != null) { this.blacklistRemovals.clear();