Skip to content

HADOOP-18639 DockerContainerDeletionTask is not removed from the Nodemanager's statestore when the task is completed #5425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

HADOOP-18639 DockerContainerDeletionTask is not removed from the Nodemanager's statestore when the task is completed #5425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...p/yarn/server/nodemanager/containermanager/deletion/task/DockerContainerDeletionTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ public void run() {
LinuxContainerExecutor exec = ((LinuxContainerExecutor)
getDeletionService().getContainerExecutor());
exec.removeDockerContainer(containerId);
deletionTaskFinished();
}

/**
Expand Down
61 changes: 61 additions & 0 deletions ...emanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDeletionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,13 @@
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.UnsupportedFileSystemException;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.proto.YarnServerNodemanagerRecoveryProtos.DeletionServiceDeleteTaskProto;
import org.apache.hadoop.yarn.server.nodemanager.containermanager.deletion.task.DockerContainerDeletionTask;
import org.apache.hadoop.yarn.server.nodemanager.containermanager.deletion.task.FileDeletionTask;
import org.apache.hadoop.yarn.server.nodemanager.executor.DeletionAsUserContext;
import org.apache.hadoop.yarn.server.nodemanager.recovery.NMMemoryStateStoreService;
import org.apache.hadoop.yarn.server.nodemanager.recovery.NMStateStoreService;
import org.apache.hadoop.yarn.server.nodemanager.recovery.RecoveryIterator;
import org.junit.AfterClass;
import org.junit.Test;
import org.mockito.Mockito;
Expand Down Expand Up @@ -370,4 +374,61 @@ public void testRecovery() throws Exception {
stateStore.close();
}
}

@Test
public void testDockerContainerDeletionTaskLeak() throws Exception {

String user = "foo";
String containerId = "container_e123_123456_000001";

Configuration conf = new YarnConfiguration();
conf.setBoolean(YarnConfiguration.NM_RECOVERY_ENABLED, true);
conf.setInt(YarnConfiguration.DEBUG_NM_DELETE_DELAY_SEC, 1);
NMMemoryStateStoreService stateStore = new NMMemoryStateStoreService();
stateStore.init(conf);
stateStore.start();

LinuxContainerExecutor lce = Mockito.mock(LinuxContainerExecutor.class);
DeletionService del = new DeletionService(lce, stateStore);

try {
del.init(conf);
del.start();
DockerContainerDeletionTask deletionTask = new DockerContainerDeletionTask(del,
user, containerId);
del.delete(deletionTask);

List<DeletionServiceDeleteTaskProto> deleteTaskProtos =
loadDeletionTaskProtos(stateStore);

assertEquals(1, deleteTaskProtos.size());
DeletionServiceDeleteTaskProto deleteTaskProto = deleteTaskProtos.get(0);
assertEquals(user, deleteTaskProto.getUser());
assertEquals(containerId, deleteTaskProto.getDockerContainerId());

int msecToWait = 5 * 1000;
Thread.sleep(msecToWait);

deleteTaskProtos = loadDeletionTaskProtos(stateStore);
System.out.println("TEST deleteTaskProtos Size: " + deleteTaskProtos.size());
assertTrue(deleteTaskProtos.isEmpty());

} finally {
del.close();
stateStore.close();
}
}

private List<DeletionServiceDeleteTaskProto> loadDeletionTaskProtos(
NMStateStoreService stateStore) throws IOException {

RecoveryIterator<DeletionServiceDeleteTaskProto> it =
stateStore.loadDeletionServiceState().getIterator();
List<DeletionServiceDeleteTaskProto> deleteTaskProtos =
new ArrayList<DeletionServiceDeleteTaskProto>();
while (it.hasNext()) {
deleteTaskProtos.add(it.next());
}
return deleteTaskProtos;
}
}