YARN-3302. TestDockerContainerExecutor should run automatically if it can detect docker in the usual place (Ravindra Kumar Naik via raviprak)
This commit is contained in:
parent
5009ad4a7f
commit
c97f32e7b9
|
@ -417,6 +417,9 @@ Release 2.8.0 - UNRELEASED
|
|||
YARN-2421. RM still allocates containers to an app in the FINISHING
|
||||
state (Chang Li via jlowe)
|
||||
|
||||
YARN-3302. TestDockerContainerExecutor should run automatically if it can
|
||||
detect docker in the usual place (Ravindra Kumar Naik via raviprak)
|
||||
|
||||
Release 2.7.1 - UNRELEASED
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -51,10 +51,11 @@ import com.google.common.base.Strings;
|
|||
* This is intended to test the DockerContainerExecutor code, but it requires
|
||||
* docker to be installed.
|
||||
* <br><ol>
|
||||
* <li>Install docker, and Compile the code with docker-service-url set to the
|
||||
* host and port where docker service is running.
|
||||
* <li>To run the tests, set the docker-service-url to the host and port where
|
||||
* docker service is running (If docker-service-url is not specified then the
|
||||
* local daemon will be used).
|
||||
* <br><pre><code>
|
||||
* > mvn clean install -Ddocker-service-url=tcp://0.0.0.0:4243 -DskipTests
|
||||
* mvn test -Ddocker-service-url=tcp://0.0.0.0:4243 -Dtest=TestDockerContainerExecutor
|
||||
* </code></pre>
|
||||
*/
|
||||
public class TestDockerContainerExecutor {
|
||||
|
@ -98,10 +99,13 @@ public class TestDockerContainerExecutor {
|
|||
|
||||
dockerUrl = System.getProperty("docker-service-url");
|
||||
LOG.info("dockerUrl: " + dockerUrl);
|
||||
if (Strings.isNullOrEmpty(dockerUrl)) {
|
||||
if (!Strings.isNullOrEmpty(dockerUrl)) {
|
||||
dockerUrl = " -H " + dockerUrl;
|
||||
} else if(isDockerDaemonRunningLocally()) {
|
||||
dockerUrl = "";
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
dockerUrl = " -H " + dockerUrl;
|
||||
dockerExec = "docker " + dockerUrl;
|
||||
conf.set(
|
||||
YarnConfiguration.NM_DOCKER_CONTAINER_EXECUTOR_IMAGE_NAME, yarnImage);
|
||||
|
@ -136,6 +140,17 @@ public class TestDockerContainerExecutor {
|
|||
return exec != null;
|
||||
}
|
||||
|
||||
private boolean isDockerDaemonRunningLocally() {
|
||||
boolean dockerDaemonRunningLocally = true;
|
||||
try {
|
||||
shellExec("docker info");
|
||||
} catch (Exception e) {
|
||||
LOG.info("docker daemon is not running on local machine.");
|
||||
dockerDaemonRunningLocally = false;
|
||||
}
|
||||
return dockerDaemonRunningLocally;
|
||||
}
|
||||
|
||||
/**
|
||||
* Test that a docker container can be launched to run a command
|
||||
* @param cId a fake ContainerID
|
||||
|
@ -200,7 +215,7 @@ public class TestDockerContainerExecutor {
|
|||
* Test that a touch command can be launched successfully in a docker
|
||||
* container
|
||||
*/
|
||||
@Test
|
||||
@Test(timeout=1000000)
|
||||
public void testLaunchContainer() throws IOException {
|
||||
if (!shouldRun()) {
|
||||
LOG.warn("Docker not installed, aborting test.");
|
||||
|
|
Loading…
Reference in New Issue