big-data/hadoop
big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

HDDS-1625 : ConcurrentModificationException when SCM has containers of different owners. (#883)

Browse Source
This commit is contained in:
avijayanhwx 2019-06-03 12:45:04 -07:00 committed by Nanda kumar
parent f3271126fc
commit 21de9af903
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/SCMContainerManager.java
View File

@ -43,6 +43,7 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.NavigableSet; import java.util.NavigableSet;
@ -469,15 +470,17 @@ public class SCMContainerManager implements ContainerManager {
*/ */
private NavigableSet<ContainerID> getContainersForOwner( private NavigableSet<ContainerID> getContainersForOwner(
NavigableSet<ContainerID> containerIDs, String owner) { NavigableSet<ContainerID> containerIDs, String owner) {
for (ContainerID cid : containerIDs) { Iterator<ContainerID> containerIDIterator = containerIDs.iterator();
while (containerIDIterator.hasNext()) {
ContainerID cid = containerIDIterator.next();
try { try {
if (!getContainer(cid).getOwner().equals(owner)) { if (!getContainer(cid).getOwner().equals(owner)) {
containerIDs.remove(cid); containerIDIterator.remove();
} }
} catch (ContainerNotFoundException e) { } catch (ContainerNotFoundException e) {
LOG.error("Could not find container info for container id={} {}", cid, LOG.error("Could not find container info for container id={} {}", cid,
e); e);
containerIDs.remove(cid); containerIDIterator.remove();
} }
} }
return containerIDs; return containerIDs;

24
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerStateManagerIntegration.java
View File

@ -122,6 +122,30 @@ public class TestContainerStateManagerIntegration {
Assert.assertEquals(3, numContainers); Assert.assertEquals(3, numContainers);
} }
@Test
public void testAllocateContainerWithDifferentOwner() throws IOException {
// Allocate a container and verify the container info
ContainerWithPipeline container1 = scm.getClientProtocolServer()
.allocateContainer(xceiverClientManager.getType(),
xceiverClientManager.getFactor(), containerOwner);
ContainerInfo info = containerManager
.getMatchingContainer(OzoneConsts.GB * 3, containerOwner,
container1.getPipeline());
Assert.assertNotNull(info);
String newContainerOwner = "OZONE_NEW";
ContainerWithPipeline container2 = scm.getClientProtocolServer()
.allocateContainer(xceiverClientManager.getType(),
xceiverClientManager.getFactor(), newContainerOwner);
ContainerInfo info2 = containerManager
.getMatchingContainer(OzoneConsts.GB * 3, newContainerOwner,
container1.getPipeline());
Assert.assertNotNull(info2);
Assert.assertNotEquals(info.containerID(), info2.containerID());
}
@Test @Test
public void testContainerStateManagerRestart() throws IOException, public void testContainerStateManagerRestart() throws IOException,
TimeoutException, InterruptedException, AuthenticationException { TimeoutException, InterruptedException, AuthenticationException {