File tree Expand file tree Collapse file tree 7 files changed +461
-322
lines changed
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src
main/java/org/apache/hadoop/yarn/server/nodemanager
resourceplugin/deviceframework
test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime Expand file tree Collapse file tree 7 files changed +461
-322
lines changed Original file line number Diff line number Diff line change 46
46
import org .apache .hadoop .yarn .server .nodemanager .containermanager .linux .runtime .DelegatingLinuxContainerRuntime ;
47
47
import org .apache .hadoop .yarn .server .nodemanager .containermanager .linux .runtime .DockerLinuxContainerRuntime ;
48
48
import org .apache .hadoop .yarn .server .nodemanager .containermanager .linux .runtime .LinuxContainerRuntime ;
49
+ import org .apache .hadoop .yarn .server .nodemanager .containermanager .linux .runtime .OCIContainerRuntime ;
49
50
import org .apache .hadoop .yarn .server .nodemanager .containermanager .linux .runtime .docker .DockerCommandExecutor ;
50
51
import org .apache .hadoop .yarn .server .nodemanager .containermanager .linux .runtime .docker .DockerRmCommand ;
51
52
import org .apache .hadoop .yarn .server .nodemanager .containermanager .localizer .ContainerLocalizer ;
94
95
* appropriate {@link LinuxContainerRuntime} instance. This class uses a
95
96
* {@link DelegatingLinuxContainerRuntime} instance, which will delegate calls
96
97
* to either a {@link DefaultLinuxContainerRuntime} instance or a
97
- * {@link DockerLinuxContainerRuntime } instance, depending on the job's
98
+ * {@link OCIContainerRuntime } instance, depending on the job's
98
99
* configuration.</p>
99
100
*
100
101
* @see LinuxContainerRuntime
101
102
* @see DelegatingLinuxContainerRuntime
102
103
* @see DefaultLinuxContainerRuntime
103
104
* @see DockerLinuxContainerRuntime
104
- * @see DockerLinuxContainerRuntime#isDockerContainerRequested
105
+ * @see OCIContainerRuntime#isOCICompliantContainerRequested
105
106
*/
106
107
public class LinuxContainerExecutor extends ContainerExecutor {
107
108
Original file line number Diff line number Diff line change 35
35
import org .apache .hadoop .yarn .server .nodemanager .containermanager .container .ContainerEventType ;
36
36
import org .apache .hadoop .yarn .server .nodemanager .containermanager .container .ContainerExitEvent ;
37
37
import org .apache .hadoop .yarn .server .nodemanager .containermanager .deletion .task .DockerContainerDeletionTask ;
38
- import org .apache .hadoop .yarn .server .nodemanager .containermanager .linux .runtime .DockerLinuxContainerRuntime ;
38
+ import org .apache .hadoop .yarn .server .nodemanager .containermanager .linux .runtime .OCIContainerRuntime ;
39
39
import org .apache .hadoop .yarn .server .nodemanager .executor .ContainerReapContext ;
40
40
import org .apache .hadoop .yarn .server .nodemanager .executor .ContainerSignalContext ;
41
41
import org .slf4j .Logger ;
@@ -147,7 +147,7 @@ public void run() {
147
147
}
148
148
149
149
// rm container in docker
150
- if (DockerLinuxContainerRuntime . isDockerContainerRequested (conf ,
150
+ if (OCIContainerRuntime . isOCICompliantContainerRequested (conf ,
151
151
container .getLaunchContext ().getEnvironment ())) {
152
152
rmDockerContainerDelayed ();
153
153
}
Original file line number Diff line number Diff line change 32
32
import org .apache .hadoop .yarn .server .nodemanager .containermanager .linux .resources .CGroupsHandler ;
33
33
import org .apache .hadoop .yarn .server .nodemanager .containermanager .linux .resources .ResourceHandler ;
34
34
import org .apache .hadoop .yarn .server .nodemanager .containermanager .linux .resources .ResourceHandlerException ;
35
- import org .apache .hadoop .yarn .server .nodemanager .containermanager .linux .runtime .DockerLinuxContainerRuntime ;
35
+ import org .apache .hadoop .yarn .server .nodemanager .containermanager .linux .runtime .OCIContainerRuntime ;
36
36
import org .apache .hadoop .yarn .server .nodemanager .containermanager .resourceplugin .gpu .GpuDevice ;
37
37
import org .apache .hadoop .yarn .server .nodemanager .containermanager .resourceplugin .gpu .GpuDiscoverer ;
38
38
@@ -105,7 +105,7 @@ public synchronized List<PrivilegedOperation> preStart(Container container)
105
105
// Create device cgroups for the container
106
106
cGroupsHandler .createCGroup (CGroupsHandler .CGroupController .DEVICES ,
107
107
containerIdStr );
108
- if (!DockerLinuxContainerRuntime . isDockerContainerRequested (
108
+ if (!OCIContainerRuntime . isOCICompliantContainerRequested (
109
109
nmContext .getConf (),
110
110
container .getLaunchContext ().getEnvironment ())) {
111
111
// Write to devices cgroup only for non-docker container. The reason is
You can’t perform that action at this time.
0 commit comments