Skip to content

YARN-11187. Remove WhiteBox in yarn module. #4463

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

Merged
merged 21 commits into from
Oct 6, 2022
Merged

YARN-11187. Remove WhiteBox in yarn module. #4463

Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c859dd2
YARN-11187. Remove WhiteBox in yarn module.
Jun 18, 2022
448bc1d
Merge branch 'apache:trunk' into YARN-11187
slfan1989 Jun 20, 2022
b755b9c
YARN-11187. Fix CheckStyle.
Jun 20, 2022
a2d6eda
YARN-11187. Fix CheckStyle.
Jun 21, 2022
c927ab7
Merge branch 'apache:trunk' into YARN-11187
slfan1989 Jul 6, 2022
e8f2c75
Merge branch 'apache:trunk' into YARN-11187
slfan1989 Jul 9, 2022
2876700
Merge branch 'apache:trunk' into YARN-11187
slfan1989 Jul 16, 2022
c446ac8
YARN-11187. Remove WhiteBox in yarn module.
Jul 16, 2022
b89d8e7
YARN-11187. Remove WhiteBox in yarn module.
Jul 17, 2022
87f3fdd
Merge branch 'apache:trunk' into YARN-11187
slfan1989 Jul 23, 2022
ccfe0d0
Merge branch 'apache:trunk' into YARN-11187
slfan1989 Jul 28, 2022
e6bd863
Merge branch 'apache:trunk' into YARN-11187
slfan1989 Aug 2, 2022
43f513b
Merge branch 'apache:trunk' into YARN-11187
slfan1989 Aug 11, 2022
d7d69e0
Merge branch 'apache:trunk' into YARN-11187
slfan1989 Aug 22, 2022
e5d6c3a
Merge branch 'apache:trunk' into YARN-11187
slfan1989 Sep 12, 2022
5da3ce7
Merge branch 'apache:trunk' into YARN-11187
slfan1989 Sep 18, 2022
f055958
Merge branch 'apache:trunk' into YARN-11187
slfan1989 Sep 20, 2022
d8b9e81
Merge branch 'apache:trunk' into YARN-11187
slfan1989 Sep 20, 2022
a5f15d2
YARN-11187. Fix CheckStyle.
Sep 25, 2022
a9c4f16
YARN-11187. Fix CheckStyle.
Sep 26, 2022
fff7380
Merge branch 'apache:trunk' into YARN-11187
slfan1989 Oct 4, 2022
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
63 changes: 22 additions & 41 deletions ...ache/hadoop/yarn/server/nodemanager/containermanager/launcher/TestContainersLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package org.apache.hadoop.yarn.server.nodemanager.containermanager.launcher;

import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.test.Whitebox;
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
import org.apache.hadoop.yarn.api.records.ApplicationId;
import org.apache.hadoop.yarn.api.records.ContainerId;
Expand All @@ -40,8 +39,6 @@

import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
Expand Down Expand Up @@ -123,10 +120,8 @@ public void setup() throws IllegalArgumentException, IllegalAccessException {
@SuppressWarnings("unchecked")
@Test
public void testLaunchContainerEvent()
throws IllegalArgumentException, IllegalAccessException {
Map<ContainerId, ContainerLaunch> dummyMap =
(Map<ContainerId, ContainerLaunch>) Whitebox.getInternalState(spy,
"running");
throws IllegalArgumentException {
Map<ContainerId, ContainerLaunch> dummyMap = spy.running;
when(event.getType())
.thenReturn(ContainersLauncherEventType.LAUNCH_CONTAINER);
assertEquals(0, dummyMap.size());
Expand All @@ -139,10 +134,8 @@ public void testLaunchContainerEvent()
@SuppressWarnings("unchecked")
@Test
public void testRelaunchContainerEvent()
throws IllegalArgumentException, IllegalAccessException {
Map<ContainerId, ContainerLaunch> dummyMap =
(Map<ContainerId, ContainerLaunch>) Whitebox.getInternalState(spy,
"running");
throws IllegalArgumentException {
Map<ContainerId, ContainerLaunch> dummyMap = spy.running;
when(event.getType())
.thenReturn(ContainersLauncherEventType.RELAUNCH_CONTAINER);
assertEquals(0, dummyMap.size());
Expand All @@ -159,10 +152,8 @@ public void testRelaunchContainerEvent()
@SuppressWarnings("unchecked")
@Test
public void testRecoverContainerEvent()
throws IllegalArgumentException, IllegalAccessException {
Map<ContainerId, ContainerLaunch> dummyMap =
(Map<ContainerId, ContainerLaunch>) Whitebox.getInternalState(spy,
"running");
throws IllegalArgumentException {
Map<ContainerId, ContainerLaunch> dummyMap = spy.running;
when(event.getType())
.thenReturn(ContainersLauncherEventType.RECOVER_CONTAINER);
assertEquals(0, dummyMap.size());
Expand All @@ -178,7 +169,7 @@ public void testRecoverContainerEvent()

@Test
public void testRecoverPausedContainerEvent()
throws IllegalArgumentException, IllegalAccessException {
throws IllegalArgumentException {
when(event.getType())
.thenReturn(ContainersLauncherEventType.RECOVER_PAUSED_CONTAINER);
spy.handle(event);
Expand All @@ -189,27 +180,23 @@ public void testRecoverPausedContainerEvent()
@Test
public void testCleanupContainerEvent()
throws IllegalArgumentException, IllegalAccessException, IOException {
Map<ContainerId, ContainerLaunch> dummyMap = Collections
.synchronizedMap(new HashMap<ContainerId, ContainerLaunch>());
dummyMap.put(containerId, containerLaunch);
Whitebox.setInternalState(spy, "running", dummyMap);
spy.running.clear();
spy.running.put(containerId, containerLaunch);

when(event.getType())
.thenReturn(ContainersLauncherEventType.CLEANUP_CONTAINER);
assertEquals(1, dummyMap.size());
assertEquals(1, spy.running.size());
spy.handle(event);
assertEquals(0, dummyMap.size());
assertEquals(0, spy.running.size());
Mockito.verify(containerLauncher, Mockito.times(1))
.submit(Mockito.any(ContainerCleanup.class));
}

@Test
public void testCleanupContainerForReINITEvent()
throws IllegalArgumentException, IllegalAccessException, IOException {
Map<ContainerId, ContainerLaunch> dummyMap = Collections
.synchronizedMap(new HashMap<ContainerId, ContainerLaunch>());
dummyMap.put(containerId, containerLaunch);
Whitebox.setInternalState(spy, "running", dummyMap);
spy.running.clear();
spy.running.put(containerId, containerLaunch);

when(event.getType())
.thenReturn(ContainersLauncherEventType.CLEANUP_CONTAINER_FOR_REINIT);
Expand All @@ -226,9 +213,6 @@ public void testCleanupContainerForReINITEvent()
@Test
public void testSignalContainerEvent()
throws IllegalArgumentException, IllegalAccessException, IOException {
Map<ContainerId, ContainerLaunch> dummyMap = Collections
.synchronizedMap(new HashMap<ContainerId, ContainerLaunch>());
dummyMap.put(containerId, containerLaunch);

SignalContainersLauncherEvent dummyEvent =
mock(SignalContainersLauncherEvent.class);
Expand All @@ -238,46 +222,43 @@ public void testSignalContainerEvent()
when(containerId.getApplicationAttemptId().getApplicationId())
.thenReturn(appId);

Whitebox.setInternalState(spy, "running", dummyMap);
spy.running.clear();
spy.running.put(containerId, containerLaunch);
when(dummyEvent.getType())
.thenReturn(ContainersLauncherEventType.SIGNAL_CONTAINER);
when(dummyEvent.getCommand())
.thenReturn(SignalContainerCommand.GRACEFUL_SHUTDOWN);
doNothing().when(containerLaunch)
.signalContainer(SignalContainerCommand.GRACEFUL_SHUTDOWN);
spy.handle(dummyEvent);
assertEquals(1, dummyMap.size());
assertEquals(1, spy.running.size());
Mockito.verify(containerLaunch, Mockito.times(1))
.signalContainer(SignalContainerCommand.GRACEFUL_SHUTDOWN);
}

@Test
public void testPauseContainerEvent()
throws IllegalArgumentException, IllegalAccessException, IOException {
Map<ContainerId, ContainerLaunch> dummyMap = Collections
.synchronizedMap(new HashMap<ContainerId, ContainerLaunch>());
dummyMap.put(containerId, containerLaunch);
Whitebox.setInternalState(spy, "running", dummyMap);
spy.running.clear();
spy.running.put(containerId, containerLaunch);
when(event.getType())
.thenReturn(ContainersLauncherEventType.PAUSE_CONTAINER);
doNothing().when(containerLaunch).pauseContainer();
spy.handle(event);
assertEquals(1, dummyMap.size());
assertEquals(1, spy.running.size());
Mockito.verify(containerLaunch, Mockito.times(1)).pauseContainer();
}

@Test
public void testResumeContainerEvent()
throws IllegalArgumentException, IllegalAccessException, IOException {
Map<ContainerId, ContainerLaunch> dummyMap = Collections
.synchronizedMap(new HashMap<ContainerId, ContainerLaunch>());
dummyMap.put(containerId, containerLaunch);
Whitebox.setInternalState(spy, "running", dummyMap);
spy.running.clear();
spy.running.put(containerId, containerLaunch);
when(event.getType())
.thenReturn(ContainersLauncherEventType.RESUME_CONTAINER);
doNothing().when(containerLaunch).resumeContainer();
spy.handle(event);
assertEquals(1, dummyMap.size());
assertEquals(1, spy.running.size());
Mockito.verify(containerLaunch, Mockito.times(1)).resumeContainer();
}
}