Skip to content

The Unified and Autonomous Development Platform

Report docker command execution error

Robin Shen80b75accd060
diff --git a/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java
index f22451e95d..32865e9afd 100644
--- a/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java
+++ b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java
@@ -281,10 +281,10 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT
Logger logger = logManager.getLogger(build.getProject().getId(), build.getId(), job.getLogLevel());
Long buildId = build.getId();
- JobExecution execution = new JobExecution(executorService.submit(new Callable<Boolean>() {
+ JobExecution execution = new JobExecution(executorService.submit(new Runnable() {
@Override
- public Boolean call() {
+ public void run() {
logger.info("Creating workspace...");
File workspace = FileUtils.createTempDir("workspace");
try {
@@ -320,7 +320,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT
logger.info("Executing job with executor '" + executor.getName() + "'...");
- boolean result = executor.execute(job.getEnvironment(), workspace, envVars, job.getCommands(), snapshot,
+ executor.execute(job.getEnvironment(), workspace, envVars, job.getCommands(), snapshot,
job.getCaches(), new PatternSet(includeFiles, excludeFiles), logger);
sessionManager.run(new Runnable() {
@@ -334,8 +334,6 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT
}
});
-
- return result;
} catch (Exception e) {
if (ExceptionUtils.find(e, InterruptedException.class) == null)
logger.error("Error running build", e);
@@ -519,10 +517,8 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT
} else if (execution.isDone()) {
it.remove();
try {
- if (execution.get())
- build.setStatus(Build.Status.SUCCESSFUL);
- else
- build.setStatus(Build.Status.FAILED);
+ execution.check();
+ build.setStatus(Build.Status.SUCCESSFUL);
} catch (TimeoutException e) {
build.setStatus(Build.Status.TIMED_OUT);
} catch (CancellationException e) {
diff --git a/core/src/main/java/io/onedev/server/ci/job/JobExecution.java b/core/src/main/java/io/onedev/server/ci/job/JobExecution.java
index f676ea3a1a..c7c71b0a1b 100644
--- a/core/src/main/java/io/onedev/server/ci/job/JobExecution.java
+++ b/core/src/main/java/io/onedev/server/ci/job/JobExecution.java
@@ -8,7 +8,7 @@ import javax.annotation.Nullable;
public class JobExecution {
- private final Future<Boolean> future;
+ private final Future<?> future;
private final long beginTime;
@@ -16,7 +16,7 @@ public class JobExecution {
private volatile Long cancellerId;
- public JobExecution(Future<Boolean> future, long timeout) {
+ public JobExecution(Future<?> future, long timeout) {
this.future = future;
beginTime = System.currentTimeMillis();
this.timeout = timeout;
@@ -39,13 +39,13 @@ public class JobExecution {
return future.isDone();
}
- public boolean get() throws InterruptedException, TimeoutException, ExecutionException {
+ public void check() throws InterruptedException, TimeoutException, ExecutionException {
if (isTimedout())
throw new TimeoutException();
else if (cancellerId != null)
throw new CancellerAwareCancellationException(cancellerId);
else
- return future.get();
+ future.get();
}
}
diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java
index 73d28011ff..a136108a16 100644
--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java
+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java
@@ -135,7 +135,7 @@ public abstract class JobExecutor implements Serializable {
this.cacheTTL = cacheTTL;
}
- public abstract boolean execute(String environment, File workspace, Map<String, String> envVars,
+ public abstract void execute(String environment, File workspace, Map<String, String> envVars,
List<String> commands, @Nullable SourceSnapshot snapshot, Collection<JobCache> caches,
PatternSet collectFiles, Logger logger);
diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/KubernetesExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/KubernetesExecutor.java
index ad46570460..cd0154ed3d 100644
--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/KubernetesExecutor.java
+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/KubernetesExecutor.java
@@ -17,7 +17,7 @@ public class KubernetesExecutor extends JobExecutor {
private static final long serialVersionUID = 1L;
@Override
- public boolean execute(String environment, File workspace, Map<String, String> envVars,
+ public void execute(String environment, File workspace, Map<String, String> envVars,
List<String> commands, SourceSnapshot snapshot, Collection<JobCache> caches,
PatternSet collectFiles, Logger logger) {
throw new UnsupportedOperationException();
diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.java
index 870cee311e..618c1eadb3 100644
--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.java
+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.java
@@ -26,7 +26,6 @@ import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
import io.onedev.commons.utils.StringUtils;
import io.onedev.commons.utils.command.Commandline;
-import io.onedev.commons.utils.command.ExecuteResult;
import io.onedev.commons.utils.command.LineConsumer;
import io.onedev.commons.utils.command.ProcessKiller;
import io.onedev.commons.utils.concurrent.ConstrainedRunner;
@@ -206,17 +205,17 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
}
@Override
- public boolean execute(String environment, File workspace, Map<String, String> envVars,
+ public void execute(String environment, File workspace, Map<String, String> envVars,
List<String> commands, SourceSnapshot snapshot, Collection<JobCache> caches,
PatternSet collectFiles, Logger logger) {
- return getConstrainedRunner().call(new Callable<Boolean>() {
+ getConstrainedRunner().call(new Callable<Void>() {
@Override
- public Boolean call() {
- return new CacheRunner(getCacheHome(), caches).call(new CacheCallable<Boolean>() {
+ public Void call() {
+ return new CacheRunner(getCacheHome(), caches).call(new CacheCallable<Void>() {
@Override
- public Boolean call(Collection<CacheAllocation> allocations) {
+ public Void call(Collection<CacheAllocation> allocations) {
login(logger);
logger.info("Pulling image...") ;
@@ -266,7 +265,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
cmd.addArgs("-v", effectiveWorkspace.getAbsolutePath() + ":" + dockerWorkspacePath);
for (CacheAllocation allocation: allocations) {
if (!allocation.isWorkspace())
- cmd.addArgs("-v", allocation.getInstance().getAbsolutePath() + ":" + allocation.getPath());
+ cmd.addArgs("-v", allocation.getInstance().getAbsolutePath() + ":" + allocation.resolvePath(dockerWorkspacePath));
}
cmd.addArgs("-w", dockerWorkspacePath);
@@ -291,21 +290,22 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
}
logger.info("Running container to execute job...");
- ExecuteResult result = cmd.execute(newInfoLogger(logger), newErrorLogger(logger), null, new ProcessKiller() {
-
- @Override
- public void kill(Process process) {
- logger.info("Stopping container...");
- Commandline cmd = getDockerCmd();
- cmd.addArgs("stop", jobInstance);
- cmd.execute(newInfoLogger(logger), newErrorLogger(logger));
- }
-
- });
- if (result.getReturnCode() == 125 || result.getReturnCode() == 126 || result.getReturnCode() == 127) {
- throw result.buildException();
- } else if (result.getReturnCode() != 0) {
+ try {
+ cmd.execute(newInfoLogger(logger), newErrorLogger(logger), null, new ProcessKiller() {
+
+ @Override
+ public void kill(Process process) {
+ logger.info("Stopping container...");
+ Commandline cmd = getDockerCmd();
+ cmd.addArgs("stop", jobInstance);
+ cmd.execute(newInfoLogger(logger), newErrorLogger(logger));
+ }
+
+ }).checkReturnCode();
+
+ return null;
+ } finally {
if (workspaceCache != null) {
int baseLen = workspaceCache.getAbsolutePath().length()+1;
for (File file: collectFiles.listFiles(workspaceCache)) {
@@ -316,9 +316,6 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
}
}
}
- return false;
- } else {
- return true;
}
}