bshashikant commented on a change in pull request #826: HDDS-1517.
AllocateBlock call fails with ContainerNotFoundException.
URL: https://github.com/apache/hadoop/pull/826#discussion_r286116853
##########
File path:
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/SCMContainerManager.java
##########
@@ -386,18 +386,17 @@ public ContainerInfo getMatchingContainer(final long
sizeRequired,
public ContainerInfo getMatchingContainer(final long sizeRequired,
String owner, Pipeline pipeline, List<ContainerID> excludedContainers) {
+ NavigableSet<ContainerID> containerIDs;
try {
- //TODO: #CLUTIL See if lock is required here
- NavigableSet<ContainerID> containerIDs =
- pipelineManager.getContainersInPipeline(pipeline.getId());
+ synchronized (pipeline) {
+ //TODO: #CLUTIL See if lock is required here
+ containerIDs =
+ pipelineManager.getContainersInPipeline(pipeline.getId());
- containerIDs = getContainersForOwner(containerIDs, owner);
- if (containerIDs.size() < numContainerPerOwnerInPipeline) {
- synchronized (pipeline) {
+ containerIDs = getContainersForOwner(containerIDs, owner);
+ if (containerIDs.size() < numContainerPerOwnerInPipeline) {
// TODO: #CLUTIL Maybe we can add selection logic inside synchronized
// as well
- containerIDs = getContainersForOwner(
- pipelineManager.getContainersInPipeline(pipeline.getId()),
owner);
if (containerIDs.size() < numContainerPerOwnerInPipeline) {
ContainerInfo containerInfo =
containerStateManager.allocateContainer(pipelineManager, owner,
Review comment:
Ensured the pipeline lock is held on all places where allocateContainer is
called.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
