Skip to content

The Unified and Autonomous Development Platform

Fix a minor issue of sending duplicate thread interruption when running server step

Robin Shen7388f665d75c
diff --git a/pom.xml b/pom.xml
index 9cbc85dbc2..852375976f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -619,8 +619,8 @@
</repository>
</repositories>
<properties>
- <commons.version>2.7.3</commons.version>
- <agent.version>1.7.16</agent.version>
+ <commons.version>2.7.4</commons.version>
+ <agent.version>1.7.17</agent.version>
<slf4j.version>1.7.36</slf4j.version>
<logback.version>1.2.11</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java
index 00e6d71b97..bafed1cdeb 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java
@@ -1,28 +1,10 @@
package io.onedev.server.buildspec.step;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
-
-import javax.validation.constraints.NotEmpty;
-
-import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.revwalk.RevWalk;
-
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
import com.google.common.collect.MapDifference;
import com.google.common.collect.MapDifference.ValueDifference;
import com.google.common.collect.Maps;
-
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.ExplicitException;
@@ -44,6 +26,21 @@ import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
import io.onedev.server.web.editable.annotation.ShowCondition;
+import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevWalk;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
@Editable(order=60, name="Pull from Remote", group=StepGroup.REPOSITORY_SYNC, description=""
+ "This step pulls specified refs from remote. For security reason, it is only allowed "
diff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java
index 5ee333f34f..7d16c61e02 100644
--- a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java
+++ b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java
@@ -109,70 +109,70 @@ import static io.onedev.k8shelper.KubernetesHelper.replacePlaceholders;
public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizationSource, Serializable {
private static final int CHECK_INTERVAL = 1000; // check internal in milli-seconds
-
+
private static final Logger logger = LoggerFactory.getLogger(DefaultJobManager.class);
-
+
private final Map<Long, JobExecution> jobExecutions = new ConcurrentHashMap<>();
-
+
private final Map<String, Collection<Thread>> serverStepThreads = new ConcurrentHashMap<>();
-
+
private final Map<String, List<Action>> jobActions = new ConcurrentHashMap<>();
-
+
private final Map<String, JobRunnable> jobRunnables = new ConcurrentHashMap<>();
-
+
private final Map<Long, Collection<String>> scheduledTasks = new ConcurrentHashMap<>();
-
+
private final Map<String, Shell> jobShells = new ConcurrentHashMap<>();
-
+
private final ProjectManager projectManager;
-
+
private final BuildManager buildManager;
-
+
private final PullRequestManager pullRequestManager;
-
+
private final ListenerRegistry listenerRegistry;
-
+
private final TransactionManager transactionManager;
-
+
private final SessionManager sessionManager;
-
+
private final LogManager logManager;
-
+
private final UserManager userManager;
-
+
private final SettingManager settingManager;
-
+
private final ExecutorService executorService;
-
+
private final BuildParamManager buildParamManager;
-
+
private final TaskScheduler taskScheduler;
-
+
private final Validator validator;
-
+
private final ClusterManager clusterManager;
-
+
private final CodeIndexManager codeIndexManager;
-
+
private final StorageManager storageManager;
-
+
private final GitService gitService;
-
+
private volatile Thread thread;
-
+
private volatile Map<String, JobContext> jobContexts;
-
+
private volatile Map<String, UUID> jobServers;
-
+
private volatile Map<String, Collection<String>> allocatedCaches;
-
+
@Inject
- public DefaultJobManager(BuildManager buildManager, UserManager userManager, ListenerRegistry listenerRegistry,
- SettingManager settingManager, TransactionManager transactionManager, LogManager logManager,
- ExecutorService executorService, SessionManager sessionManager, BuildParamManager buildParamManager,
- ProjectManager projectManager, Validator validator, TaskScheduler taskScheduler,
- ClusterManager clusterManager, CodeIndexManager codeIndexManager, StorageManager storageManager,
- PullRequestManager pullRequestManager, GitService gitService) {
+ public DefaultJobManager(BuildManager buildManager, UserManager userManager, ListenerRegistry listenerRegistry,
+ SettingManager settingManager, TransactionManager transactionManager, LogManager logManager,
+ ExecutorService executorService, SessionManager sessionManager, BuildParamManager buildParamManager,
+ ProjectManager projectManager, Validator validator, TaskScheduler taskScheduler,
+ ClusterManager clusterManager, CodeIndexManager codeIndexManager, StorageManager storageManager,
+ PullRequestManager pullRequestManager, GitService gitService) {
this.settingManager = settingManager;
this.buildManager = buildManager;
this.userManager = userManager;
@@ -191,68 +191,68 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
this.pullRequestManager = pullRequestManager;
this.gitService = gitService;
}
-
+
public Object writeReplace() throws ObjectStreamException {
return new ManagedSerializedForm(JobManager.class);
}
-
+
private void validateBuildSpec(Project project, ObjectId commitId, BuildSpec buildSpec) {
Project.push(project);
try {
- for (ConstraintViolation<?> violation: validator.validate(buildSpec)) {
- String message = String.format("Error validating build spec (project: %s, commit: %s, location: %s, message: %s)",
- project.getPath(), commitId.name(), violation.getPropertyPath(), violation.getMessage());
- throw new ExplicitException(message);
- }
+ for (ConstraintViolation<?> violation : validator.validate(buildSpec)) {
+ String message = String.format("Error validating build spec (project: %s, commit: %s, location: %s, message: %s)",
+ project.getPath(), commitId.name(), violation.getPropertyPath(), violation.getMessage());
+ throw new ExplicitException(message);
+ }
} finally {
Project.pop();
}
}
-
+
@Transactional
@Override
- public Build submit(Project project, ObjectId commitId, String jobName,
- Map<String, List<String>> paramMap, String pipeline, SubmitReason reason) {
- Lock lock = LockUtils.getLock("job-manager: " + project.getId() + "-" + commitId.name());
- transactionManager.mustRunAfterTransaction(new Runnable() {
+ public Build submit(Project project, ObjectId commitId, String jobName,
+ Map<String, List<String>> paramMap, String pipeline, SubmitReason reason) {
+ Lock lock = LockUtils.getLock("job-manager: " + project.getId() + "-" + commitId.name());
+ transactionManager.mustRunAfterTransaction(new Runnable() {
@Override
public void run() {
lock.unlock();
}
-
- });
-
- JobSecretAuthorizationContext.push(new JobSecretAuthorizationContext(project, commitId, reason.getPullRequest()));
- try {
- // Lock to guarantee uniqueness of build (by project, commit, job and parameters)
- lock.lockInterruptibly();
-
- BuildSpec buildSpec = project.getBuildSpec(commitId);
- if (buildSpec == null) {
- throw new ExplicitException(String.format(
- "Build spec not defined (project: %s, commit: %s)",
- project.getPath(), commitId.name()));
- }
-
- validateBuildSpec(project, commitId, buildSpec);
-
- if (!buildSpec.getJobMap().containsKey(jobName)) {
- throw new ExplicitException(String.format(
- "Job not found (project: %s, commit: %s, job: %s)",
- project.getPath(), commitId.name(), jobName));
- }
-
- return doSubmit(project, commitId, jobName, paramMap, pipeline, reason);
- } catch (Throwable e) {
- throw ExceptionUtils.unchecked(e);
+
+ });
+
+ JobSecretAuthorizationContext.push(new JobSecretAuthorizationContext(project, commitId, reason.getPullRequest()));
+ try {
+ // Lock to guarantee uniqueness of build (by project, commit, job and parameters)
+ lock.lockInterruptibly();
+
+ BuildSpec buildSpec = project.getBuildSpec(commitId);
+ if (buildSpec == null) {
+ throw new ExplicitException(String.format(
+ "Build spec not defined (project: %s, commit: %s)",
+ project.getPath(), commitId.name()));
+ }
+
+ validateBuildSpec(project, commitId, buildSpec);
+
+ if (!buildSpec.getJobMap().containsKey(jobName)) {
+ throw new ExplicitException(String.format(
+ "Job not found (project: %s, commit: %s, job: %s)",
+ project.getPath(), commitId.name(), jobName));
+ }
+
+ return doSubmit(project, commitId, jobName, paramMap, pipeline, reason);
+ } catch (Throwable e) {
+ throw ExceptionUtils.unchecked(e);
} finally {
JobSecretAuthorizationContext.pop();
}
}
-
- private Build doSubmit(Project project, ObjectId commitId, String jobName,
- Map<String, List<String>> paramMap, String pipeline, SubmitReason reason) {
+
+ private Build doSubmit(Project project, ObjectId commitId, String jobName,
+ Map<String, List<String>> paramMap, String pipeline, SubmitReason reason) {
ScriptIdentity.push(new JobIdentity(project, commitId));
try {
Build build = new Build();
@@ -266,24 +266,24 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
build.setRefName(reason.getRefName());
build.setRequest(reason.getPullRequest());
build.setPipeline(pipeline);
-
+
ParamUtils.validateParamMap(build.getJob().getParamSpecs(), paramMap);
-
+
Map<String, List<String>> paramMapToQuery = new HashMap<>(paramMap);
- for (ParamSpec paramSpec: build.getJob().getParamSpecs()) {
+ for (ParamSpec paramSpec : build.getJob().getParamSpecs()) {
if (paramSpec instanceof SecretParam)
paramMapToQuery.remove(paramSpec.getName());
}
-
- Collection<Build> builds = buildManager.query(project, commitId, jobName,
- reason.getRefName(), Optional.ofNullable(reason.getPullRequest()),
+
+ Collection<Build> builds = buildManager.query(project, commitId, jobName,
+ reason.getRefName(), Optional.ofNullable(reason.getPullRequest()),
paramMapToQuery, pipeline);
-
+
if (builds.isEmpty()) {
- for (Map.Entry<String, List<String>> entry: paramMap.entrySet()) {
+ for (Map.Entry<String, List<String>> entry : paramMap.entrySet()) {
ParamSpec paramSpec = Preconditions.checkNotNull(build.getJob().getParamSpecMap().get(entry.getKey()));
if (!entry.getValue().isEmpty()) {
- for (String string: entry.getValue()) {
+ for (String string : entry.getValue()) {
BuildParam param = new BuildParam();
param.setBuild(build);
param.setName(entry.getKey());
@@ -299,16 +299,16 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
build.getParams().add(param);
}
}
-
+
VariableInterpolator interpolator = new VariableInterpolator(build, build.getParamCombination());
- for (JobDependency dependency: build.getJob().getJobDependencies()) {
+ for (JobDependency dependency : build.getJob().getJobDependencies()) {
JobDependency interpolated = interpolator.interpolateProperties(dependency);
- new MatrixRunner<List<String>>(ParamUtils.getParamMatrix(build, build.getParamCombination(),
+ new MatrixRunner<List<String>>(ParamUtils.getParamMatrix(build, build.getParamCombination(),
interpolated.getJobParams())) {
-
+
@Override
public void run(Map<String, List<String>> paramMap) {
- Build dependencyBuild = doSubmit(project, commitId,
+ Build dependencyBuild = doSubmit(project, commitId,
interpolated.getJobName(), paramMap, pipeline, reason);
BuildDependence dependence = new BuildDependence();
dependence.setDependency(dependencyBuild);
@@ -318,43 +318,43 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
dependence.setDestinationPath(interpolated.getDestinationPath());
build.getDependencies().add(dependence);
}
-
+
}.run();
}
-
- for (ProjectDependency dependency: build.getJob().getProjectDependencies()) {
+
+ for (ProjectDependency dependency : build.getJob().getProjectDependencies()) {
dependency = interpolator.interpolateProperties(dependency);
Project dependencyProject = projectManager.findByPath(dependency.getProjectPath());
if (dependencyProject == null)
throw new ExplicitException("Unable to find dependency project: " + dependency.getProjectPath());
-
+
Subject subject;
if (dependency.getAccessTokenSecret() != null) {
String accessToken = build.getJobSecretAuthorizationContext().getSecretValue(dependency.getAccessTokenSecret());
User user = userManager.findByAccessToken(accessToken);
if (user == null) {
- throw new ExplicitException("Unable to access dependency project '"
+ throw new ExplicitException("Unable to access dependency project '"
+ dependency.getProjectPath() + "': invalid access token");
}
subject = user.asSubject();
} else {
subject = SecurityUtils.asSubject(0L);
}
-
+
Build dependencyBuild = dependency.getBuildProvider().getBuild(dependencyProject);
if (dependencyBuild == null) {
- String errorMessage = String.format("Unable to find dependency build in project '"
+ String errorMessage = String.format("Unable to find dependency build in project '"
+ dependencyProject.getPath() + "'");
throw new ExplicitException(errorMessage);
}
-
+
JobPermission jobPermission = new JobPermission(dependencyBuild.getJobName(), new AccessBuild());
- if (!dependencyProject.isPermittedByLoginUser(jobPermission)
+ if (!dependencyProject.isPermittedByLoginUser(jobPermission)
&& !subject.isPermitted(new ProjectPermission(dependencyProject, jobPermission))) {
- throw new ExplicitException("Unable to access dependency build '"
+ throw new ExplicitException("Unable to access dependency build '"
+ dependencyBuild.getFQN() + "': permission denied");
}
-
+
BuildDependence dependence = new BuildDependence();
dependence.setDependency(dependencyBuild);
dependence.setDependent(build);
@@ -362,7 +362,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
dependence.setDestinationPath(dependency.getDestinationPath());
build.getDependencies().add(dependence);
}
-
+
buildManager.create(build);
buildSubmitted(build);
@@ -380,17 +380,17 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
pullRequest = pullRequestManager.load(pullRequestId);
else
pullRequest = null;
- for (Build unfinished: buildManager.queryUnfinished(project, jobName, reason.getRefName(),
+ for (Build unfinished : buildManager.queryUnfinished(project, jobName, reason.getRefName(),
Optional.ofNullable(pullRequest), paramMapToQuery)) {
- if (unfinished.getId() < buildId
- && gitService.isMergedInto(project, null, unfinished.getCommitId(), commitId)) {
+ if (unfinished.getId() < buildId
+ && gitService.isMergedInto(project, null, unfinished.getCommitId(), commitId)) {
cancel(unfinished);
}
}
}
-
+
});
-
+
return build;
} else {
return builds.iterator().next();
@@ -399,7 +399,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
ScriptIdentity.pop();
}
}
-
+
private void buildSubmitted(Build build) {
Long projectId = build.getProject().getId();
Long buildNumber = build.getNumber();
@@ -412,43 +412,43 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
FileUtils.cleanDir(storageManager.getBuildDir(projectId, buildNumber));
return null;
}
-
+
});
listenerRegistry.post(new BuildSubmitted(build));
}
-
+
private boolean isAuthorized(JobExecutor executor, Build build) {
if (executor.getJobAuthorization() != null) {
JobAuthorization authorization = JobAuthorization.parse(executor.getJobAuthorization());
Collection<ObjectId> descendants = OneDev.getInstance(CommitInfoManager.class)
.getDescendants(build.getProject().getId(), Sets.newHashSet(build.getCommitId()));
descendants.add(build.getCommitId());
-
- for (RefFacade ref: build.getProject().getBranchRefs()) {
+
+ for (RefFacade ref : build.getProject().getBranchRefs()) {
if (descendants.contains(ref.getPeeledObj())) {
String branch = Preconditions.checkNotNull(GitUtils.ref2branch(ref.getName()));
- if (authorization.matches(new Context(build.getProject(), branch, build.getJobName())))
+ if (authorization.matches(new Context(build.getProject(), branch, build.getJobName())))
return true;
}
}
PullRequest request = build.getRequest();
- return request != null
- && request.getSource() != null
- && authorization.matches(new Context(request.getTargetProject(), request.getTargetBranch(), build.getJobName()))
+ return request != null
+ && request.getSource() != null
+ && authorization.matches(new Context(request.getTargetProject(), request.getTargetBranch(), build.getJobName()))
&& authorization.matches(new Context(request.getSourceProject(), request.getSourceBranch(), build.getJobName()));
} else {
return true;
}
}
-
+
private JobExecutor getJobExecutor(Build build, @Nullable String jobExecutorName, TaskLogger jobLogger) {
if (StringUtils.isNotBlank(jobExecutorName)) {
JobExecutor jobExecutor = null;
- for (JobExecutor each: settingManager.getJobExecutors()) {
+ for (JobExecutor each : settingManager.getJobExecutors()) {
if (each.getName().equals(jobExecutorName)) {
jobExecutor = each;
break;
- }
+ }
}
if (jobExecutor != null) {
if (!jobExecutor.isEnabled())
@@ -461,8 +461,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
throw new ExplicitException("Unable to find specified job executor '" + jobExecutorName + "'");
}
} else {
- if (!settingManager.getJobExecutors().isEmpty()) {
- for (JobExecutor executor: settingManager.getJobExecutors()) {
+ if (!settingManager.getJobExecutors().isEmpty()) {
+ for (JobExecutor executor : settingManager.getJobExecutors()) {
if (executor.isEnabled() && isAuthorized(executor, build))
return executor;
}
@@ -471,11 +471,11 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
jobLogger.log("No job executor defined, auto-discovering...");
List<JobExecutorDiscoverer> discoverers = new ArrayList<>(OneDev.getExtensions(JobExecutorDiscoverer.class));
discoverers.sort(Comparator.comparing(JobExecutorDiscoverer::getOrder));
- for (JobExecutorDiscoverer discoverer: discoverers) {
+ for (JobExecutorDiscoverer discoverer : discoverers) {
JobExecutor jobExecutor = discoverer.discover();
if (jobExecutor != null) {
jobExecutor.setName("auto-discovered");
- jobLogger.log("Discovered job executor type: "
+ jobLogger.log("Discovered job executor type: "
+ EditableUtils.getDisplayName(jobExecutor.getClass()));
return jobExecutor;
}
@@ -488,11 +488,11 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
private JobExecution execute(Build build) {
String jobToken = UUID.randomUUID().toString();
VariableInterpolator interpolator = new VariableInterpolator(build, build.getParamCombination());
-
+
Collection<String> jobSecretsToMask = Sets.newHashSet(jobToken, clusterManager.getCredentialValue());
TaskLogger jobLogger = logManager.newLogger(build, jobSecretsToMask);
String jobExecutorName = interpolator.interpolate(build.getJob().getJobExecutor());
-
+
JobExecutor jobExecutor = getJobExecutor(build, jobExecutorName, jobLogger);
Long projectId = build.getProject().getId();
String projectPath = build.getProject().getPath();
@@ -515,20 +515,20 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
Build.push(build);
try {
job = build.getJob();
-
- for (Step step: job.getSteps()) {
+
+ for (Step step : job.getSteps()) {
step = interpolator.interpolateProperties(step);
actions.add(step.getAction(build, jobToken, build.getParamCombination()));
}
-
- for (CacheSpec cache: job.getCaches())
+
+ for (CacheSpec cache : job.getCaches())
caches.add(interpolator.interpolateProperties(cache));
-
- for (String serviceName: job.getRequiredServices()) {
+
+ for (String serviceName : job.getRequiredServices()) {
Service service = buildSpec.getServiceMap().get(serviceName);
services.add(interpolator.interpolateProperties(service));
}
-
+
maxRetries.set(job.getMaxRetries());
retryDelay.set(job.getRetryDelay());
} finally {
@@ -543,8 +543,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
public void run() {
AtomicInteger retried = new AtomicInteger(0);
while (true) {
- JobContext jobContext = new JobContext(jobToken, jobExecutor, projectId, projectPath,
- projectGitDir, buildId, buildNumber, actions, refName, commitId, caches, services,
+ JobContext jobContext = new JobContext(jobToken, jobExecutor, projectId, projectPath,
+ projectGitDir, buildId, buildNumber, actions, refName, commitId, caches, services,
retried.get());
// Store original job actions as the copy in job context will be fetched from cluster and
// some transient fields (such as step object in ServerSideFacade) will not be preserved
@@ -561,7 +561,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Override
public Boolean call() {
RetryCondition retryCondition = RetryCondition.parse(job, job.getRetryCondition());
-
+
AtomicReference<String> errorMessage = new AtomicReference<>(null);
log(e, new TaskLogger() {
@@ -569,11 +569,11 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
public void log(String message, String sessionId) {
errorMessage.set(message);
}
-
+
});
return retryCondition.matches(new RetryContext(buildManager.load(buildId), errorMessage.get()));
}
-
+
})) {
log(e, jobLogger);
jobLogger.warning("Job will be retried after a while...");
@@ -589,10 +589,10 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
listenerRegistry.post(new BuildRetrying(build));
buildManager.save(build);
}
-
+
});
- try {
- Thread.sleep(retryDelay.get() * (long)(Math.pow(2, retried.get())) * 1000L);
+ try {
+ Thread.sleep(retryDelay.get() * (long) (Math.pow(2, retried.get())) * 1000L);
} catch (InterruptedException e2) {
throw new RuntimeException(e2);
}
@@ -609,7 +609,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
listenerRegistry.post(new BuildPending(build));
buildManager.save(build);
}
-
+
});
} else {
throw ExceptionUtils.unchecked(e);
@@ -617,28 +617,28 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
} finally {
Collection<Thread> threads = serverStepThreads.remove(jobToken);
synchronized (threads) {
- for (Thread thread: threads)
+ for (Thread thread : threads)
thread.interrupt();
}
logManager.removeJobLogger(jobToken);
jobContexts.remove(jobToken);
jobActions.remove(jobToken);
}
- }
- }
-
- }), job.getTimeout()*1000L));
+ }
+ }
+
+ }), job.getTimeout() * 1000L));
return executionRef.get();
}
-
+
private void log(Throwable e, TaskLogger logger) {
if (e instanceof ExplicitException)
logger.error(e.getMessage());
else
logger.error("Exception catched", e);
}
-
+
@Override
public JobContext getJobContext(String jobToken, boolean mustExist) {
JobContext jobContext = jobContexts.get(jobToken);
@@ -646,7 +646,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
throw new ExplicitException("No job context found for specified job token");
return jobContext;
}
-
+
private void markBuildError(Build build, String errorMessage) {
build.setStatus(Build.Status.FAILED);
logManager.newLogger(build).error(errorMessage);
@@ -659,7 +659,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
public void on(ProjectCreated event) {
schedule(event.getProject());
}
-
+
@Sessional
@Listen
public void on(ProjectEvent event) {
@@ -667,7 +667,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
ObjectId commitId = ((CommitAware) event).getCommit().getCommitId();
if (!commitId.equals(ObjectId.zeroId())) {
String pipeline;
- if (event instanceof BuildEvent)
+ if (event instanceof BuildEvent)
pipeline = ((BuildEvent) event).getBuild().getPipeline();
else
pipeline = UUID.randomUUID().toString();
@@ -680,13 +680,13 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
BuildSpec buildSpec = event.getProject().getBuildSpec(commitId);
if (buildSpec != null) {
validateBuildSpec(event.getProject(), commitId, buildSpec);
- for (Job job: buildSpec.getJobMap().values()) {
+ for (Job job : buildSpec.getJobMap().values()) {
JobTriggerMatch match = job.getTriggerMatch(event);
if (match != null) {
- Map<String, List<List<String>>> paramMatrix =
- ParamUtils.getParamMatrix(null, null, match.getTrigger().getParams());
+ Map<String, List<List<String>>> paramMatrix =
+ ParamUtils.getParamMatrix(null, null, match.getTrigger().getParams());
Long projectId = event.getProject().getId();
-
+
// run asynchrously as session may get closed due to exception
sessionManager.runAsyncAfterCommit(new Runnable() {
@@ -696,27 +696,27 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
Project project = projectManager.load(projectId);
try {
new MatrixRunner<List<String>>(paramMatrix) {
-
+
@Override
public void run(Map<String, List<String>> paramMap) {
- submit(project, commitId, job.getName(), paramMap,
- pipeline, match.getReason());
+ submit(project, commitId, job.getName(), paramMap,
+ pipeline, match.getReason());
}
-
+
}.run();
} catch (Throwable e) {
- String message = String.format("Error submitting build (project: %s, commit: %s, job: %s)",
+ String message = String.format("Error submitting build (project: %s, commit: %s, job: %s)",
project.getPath(), commitId.name(), job.getName());
logger.error(message, e);
}
}
-
+
});
}
}
}
} catch (Throwable e) {
- String message = String.format("Error checking job triggers (project: %s, commit: %s)",
+ String message = String.format("Error checking job triggers (project: %s, commit: %s)",
event.getProject().getPath(), commitId.name());
logger.error(message, e);
} finally {
@@ -726,7 +726,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
}
}
-
+
@Transactional
@Override
public void resubmit(Build build, String reason) {
@@ -736,19 +736,19 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
BuildSpec buildSpec = build.getSpec();
if (buildSpec == null) {
- throw new ExplicitException(String.format(
- "Build spec not defined (project: %s, commit: %s)",
- build.getProject().getPath(), build.getCommitHash()));
- }
-
- validateBuildSpec(build.getProject(), build.getCommitId(), buildSpec);
-
- if (!buildSpec.getJobMap().containsKey(build.getJobName())) {
- throw new ExplicitException(String.format(
- "Job not found (project: %s, commit: %s, job: %s)",
- build.getProject().getPath(), build.getCommitId().name(), build.getJobName()));
- }
-
+ throw new ExplicitException(String.format(
+ "Build spec not defined (project: %s, commit: %s)",
+ build.getProject().getPath(), build.getCommitHash()));
+ }
+
+ validateBuildSpec(build.getProject(), build.getCommitId(), buildSpec);
+
+ if (!buildSpec.getJobMap().containsKey(build.getJobName())) {
+ throw new ExplicitException(String.format(
+ "Job not found (project: %s, commit: %s, job: %s)",
+ build.getProject().getPath(), build.getCommitId().name(), build.getJobName()));
+ }
+
build.setStatus(Build.Status.WAITING);
build.setFinishDate(null);
build.setPendingDate(null);
@@ -759,15 +759,15 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
build.setSubmitReason(reason);
build.setCanceller(null);
build.setAgent(null);
-
+
buildParamManager.deleteParams(build);
- for (Map.Entry<String, List<String>> entry: build.getParamMap().entrySet()) {
+ for (Map.Entry<String, List<String>> entry : build.getParamMap().entrySet()) {
ParamSpec paramSpec = build.getJob().getParamSpecMap().get(entry.getKey());
Preconditions.checkNotNull(paramSpec);
String type = paramSpec.getType();
List<String> values = entry.getValue();
if (!values.isEmpty()) {
- for (String value: values) {
+ for (String value : values) {
BuildParam param = new BuildParam();
param.setBuild(build);
param.setName(entry.getKey());
@@ -790,10 +790,10 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
} finally {
JobSecretAuthorizationContext.pop();
}
-
- for (BuildDependence dependence: build.getDependencies()) {
+
+ for (BuildDependence dependence : build.getDependencies()) {
Build dependency = dependence.getDependency();
- if (dependence.isRequireSuccessful() && !dependency.isSuccessful())
+ if (dependence.isRequireSuccessful() && !dependency.isSuccessful())
resubmit(dependency, "Resubmitted by dependent build");
}
} else {
@@ -823,22 +823,22 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
return null;
}
-
+
});
build.setPaused(false);
listenerRegistry.post(new BuildUpdated(build));
}
}
}
-
+
@Override
public WebShell openShell(Long buildId, Terminal terminal) {
JobContext jobContext = getJobContext(buildId);
- if (jobContext!= null) {
+ if (jobContext != null) {
String jobToken = jobContext.getJobToken();
UUID shellServerUUID = jobServers.get(jobToken);
if (shellServerUUID != null) {
- if (SecurityUtils.isAdministrator() || jobContext.getJobExecutor().isShellAccessEnabled()) {
+ if (SecurityUtils.isAdministrator() || jobContext.getJobExecutor().isShellAccessEnabled()) {
clusterManager.runOnServer(shellServerUUID, new ClusterTask<Void>() {
private static final long serialVersionUID = 1L;
@@ -855,11 +855,11 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
return null;
}
-
+
});
-
+
return new WebShell(buildId, terminal.getSessionId()) {
-
+
private static final long serialVersionUID = 1L;
@Override
@@ -875,7 +875,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
shell.sendInput(input);
return null;
}
-
+
});
}
@@ -892,7 +892,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
shell.resize(rows, cols);
return null;
}
-
+
});
}
@@ -909,12 +909,12 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
shell.exit();
return null;
}
-
+
});
}
-
+
};
- } else {
+ } else {
throw new UnauthorizedException();
}
} else {
@@ -923,19 +923,19 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
} else {
throw new ExplicitException("Job shell not ready");
}
-
+
}
-
+
@Override
public Shell getShellLocal(String sessionId) {
return jobShells.get(sessionId);
}
-
+
@Override
public JobContext getJobContext(Long buildId) {
- for (Map.Entry<String, JobContext> entry: jobContexts.entrySet()) {
+ for (Map.Entry<String, JobContext> entry : jobContexts.entrySet()) {
JobContext jobContext = entry.getValue();
- if (jobContext.getBuildId().equals(buildId))
+ if (jobContext.getBuildId().equals(buildId))
return jobContext;
}
return null;
@@ -970,23 +970,23 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
listenerRegistry.post(new BuildFinished(build));
}
}
-
+
});
}
return null;
}
-
+
});
}
-
+
@Sessional
@Listen(100000)
public void on(SystemStarted event) {
jobContexts = clusterManager.getHazelcastInstance().getMap("jobContexts");
allocatedCaches = clusterManager.getHazelcastInstance().getMap("allocatedCaches");
jobServers = clusterManager.getHazelcastInstance().getMap("jobRunServers");
-
- for (var entry: projectManager.getStorageServers().entrySet()) {
+
+ for (var entry : projectManager.getStorageServers().entrySet()) {
if (entry.getValue().getPrimary().equals(clusterManager.getLocalServerUUID())) {
schedule(projectManager.load(entry.getKey()));
}
@@ -995,12 +995,12 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
thread = new Thread(this);
thread.start();
}
-
+
@Listen
public void on(DefaultBranchChanged event) {
schedule(event.getProject());
}
-
+
@Sessional
@Listen
public void on(RefUpdated event) {
@@ -1009,7 +1009,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
if (branch != null && branch.equals(project.getDefaultBranch()) && !event.getNewCommitId().equals(ObjectId.zeroId()))
schedule(project);
}
-
+
@Sessional
@Override
public void schedule(Project project) {
@@ -1062,9 +1062,9 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
if (tasksOfProject != null)
tasksOfProject.forEach(taskScheduler::unschedule);
}
-
- private SchedulableTask newSchedulableTask(Project project, ObjectId commitId, Job job,
- ScheduleTrigger trigger, SubmitReason reason) {
+
+ private SchedulableTask newSchedulableTask(Project project, ObjectId commitId, Job job,
+ ScheduleTrigger trigger, SubmitReason reason) {
Long projectId = project.getId();
return new SchedulableTask() {
@@ -1078,15 +1078,15 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
Project project = projectManager.load(projectId);
String pipeline = UUID.randomUUID().toString();
new MatrixRunner<List<String>>(ParamUtils.getParamMatrix(null, null, trigger.getParams())) {
-
+
@Override
public void run(Map<String, List<String>> paramMap) {
- submit(project, commitId, job.getName(), paramMap, pipeline, reason);
+ submit(project, commitId, job.getName(), paramMap, pipeline, reason);
}
-
+
}.run();
}
-
+
});
}
@@ -1094,10 +1094,10 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
public ScheduleBuilder<?> getScheduleBuilder() {
return CronScheduleBuilder.cronSchedule(trigger.getCronExpression());
}
-
+
};
}
-
+
@Listen
public void on(SystemStopping event) {
Thread copy = thread;
@@ -1108,7 +1108,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
} catch (InterruptedException e) {
}
}
- scheduledTasks.values().forEach(it1-> it1.forEach(taskScheduler::unschedule));
+ scheduledTasks.values().forEach(it1 -> it1.forEach(taskScheduler::unschedule));
scheduledTasks.clear();
}
@@ -1120,7 +1120,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
try {
if (clusterManager.isLeaderServer()) {
Map<UUID, Collection<Long>> buildIds = new HashMap<>();
- for (var entry: buildManager.queryUnfinished().entrySet()) {
+ for (var entry : buildManager.queryUnfinished().entrySet()) {
UUID storageServerUUID = projectManager.getStorageServerUUID(entry.getValue(), false);
if (storageServerUUID != null) {
Collection<Long> buildIdsOfServer = buildIds.get(storageServerUUID);
@@ -1131,9 +1131,9 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
buildIdsOfServer.add(entry.getKey());
}
}
-
+
Collection<Future<?>> futures = new ArrayList<>();
- for (var entry: buildIds.entrySet()) {
+ for (var entry : buildIds.entrySet()) {
var buildIdsOfServer = entry.getValue();
futures.add(clusterManager.submitToServer(entry.getKey(), new ClusterTask<Void>() {
@@ -1145,9 +1145,9 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Override
public void run() {
- for (Long buildId: buildIdsOfServer) {
+ for (Long buildId : buildIdsOfServer) {
Build build = buildManager.load(buildId);
- if (build.getStatus() == Build.Status.RUNNING
+ if (build.getStatus() == Build.Status.RUNNING
|| build.getStatus() == Build.Status.PENDING) {
JobExecution execution = jobExecutions.get(build.getId());
if (execution != null) {
@@ -1173,26 +1173,26 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
build.setPendingDate(new Date());
listenerRegistry.post(new BuildPending(build));
}
- } else if (build.getDependencies().stream().anyMatch(it -> it.isRequireSuccessful()
- && it.getDependency().isFinished()
+ } else if (build.getDependencies().stream().anyMatch(it -> it.isRequireSuccessful()
+ && it.getDependency().isFinished()
&& it.getDependency().getStatus() != Build.Status.SUCCESSFUL)) {
markBuildError(build, "Some dependencies are required to be successful but failed");
- } else if (build.getDependencies().stream().allMatch(it->it.getDependency().isFinished())) {
+ } else if (build.getDependencies().stream().allMatch(it -> it.getDependency().isFinished())) {
build.setStatus(Build.Status.PENDING);
build.setPendingDate(new Date());
listenerRegistry.post(new BuildPending(build));
}
- }
+ }
}
}
-
+
});
return null;
}
-
+
}));
}
- for (var future: futures) {
+ for (var future : futures) {
try {
future.get();
} catch (InterruptedException | ExecutionException e) {
@@ -1200,12 +1200,12 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
}
}
-
+
sessionManager.run(new Runnable() {
-
+
@Override
public void run() {
- for (Iterator<Map.Entry<Long, JobExecution>> it = jobExecutions.entrySet().iterator(); it.hasNext();) {
+ for (Iterator<Map.Entry<Long, JobExecution>> it = jobExecutions.entrySet().iterator(); it.hasNext(); ) {
Map.Entry<Long, JobExecution> entry = it.next();
Build build = buildManager.get(entry.getKey());
JobExecution execution = entry.getValue();
@@ -1244,15 +1244,15 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
}
}
-
+
});
Thread.sleep(CHECK_INTERVAL);
} catch (Throwable e) {
logger.error("Error checking unfinished builds", e);
- }
- }
+ }
+ }
}
-
+
@Transactional
@Listen
public void on(BuildFinished event) {
@@ -1264,8 +1264,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
Map<String, String> placeholderValues = new HashMap<>();
placeholderValues.put(BUILD_VERSION, build.getVersion());
if (build.getJob() != null) {
- for (PostBuildAction action: build.getJob().getPostBuildActions()) {
- action = interpolator.interpolateProperties(action);
+ for (PostBuildAction action : build.getJob().getPostBuildActions()) {
+ action = interpolator.interpolateProperties(action);
if (ActionCondition.parse(build.getJob(), action.getCondition()).matches(build))
action.execute(build);
}
@@ -1273,7 +1273,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
throw new ExplicitException("Job not found");
}
} catch (Throwable e) {
- String message = String.format("Error processing post build actions (project: %s, commit: %s, job: %s)",
+ String message = String.format("Error processing post build actions (project: %s, commit: %s, job: %s)",
build.getProject().getPath(), build.getCommitHash(), build.getJobName());
logger.error(message, e);
} finally {
@@ -1281,12 +1281,12 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
JobSecretAuthorizationContext.pop();
}
}
-
+
@Override
public boolean canPullCode(HttpServletRequest request, Project project) {
String jobToken = SecurityUtils.getBearerToken(request);
if (jobToken != null) {
- JobContext jobContext = jobContexts.get(jobToken);
+ JobContext jobContext = jobContexts.get(jobToken);
if (jobContext != null)
return jobContext.getProjectId().equals(project.getId());
}
@@ -1306,40 +1306,40 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
public Map<CacheInstance, String> call() throws Exception {
synchronized (allocatedCaches) {
JobContext jobContext = getJobContext(jobToken, true);
-
+
List<CacheInstance> sortedInstances = new ArrayList<>(request.getInstances().keySet());
sortedInstances.sort(new Comparator<CacheInstance>() {
-
+
@Override
public int compare(CacheInstance o1, CacheInstance o2) {
return request.getInstances().get(o2).compareTo(request.getInstances().get(o1));
}
-
+
});
-
+
Collection<String> allAllocated = new HashSet<>();
Collection<String> activeJobTokens = jobContexts.keySet();
Collection<String> removeKeys = new HashSet<>();
- for (var entry: allocatedCaches.entrySet()) {
+ for (var entry : allocatedCaches.entrySet()) {
if (activeJobTokens.contains(entry.getKey()))
allAllocated.addAll(entry.getValue());
else
removeKeys.add(entry.getKey());
}
- for (var key: removeKeys)
+ for (var key : removeKeys)
allocatedCaches.remove(key);
-
+
Map<CacheInstance, String> allocations = new HashMap<>();
-
- Collection<String> allocatedCachesOfJob = new ArrayList<>();
- for (CacheSpec cacheSpec: jobContext.getCacheSpecs()) {
+
+ Collection<String> allocatedCachesOfJob = new ArrayList<>();
+ for (CacheSpec cacheSpec : jobContext.getCacheSpecs()) {
Optional<CacheInstance> result = sortedInstances
.stream()
- .filter(it->it.getCacheKey().equals(cacheSpec.getNormalizedKey()))
- .filter(it->!allAllocated.contains(it.getName()))
+ .filter(it -> it.getCacheKey().equals(cacheSpec.getNormalizedKey()))
+ .filter(it -> !allAllocated.contains(it.getName()))
.findFirst();
CacheInstance allocation;
- if (result.isPresent())
+ if (result.isPresent())
allocation = result.get();
else
allocation = new CacheInstance(UUID.randomUUID().toString(), cacheSpec.getNormalizedKey());
@@ -1347,9 +1347,9 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
allocatedCachesOfJob.add(allocation.getName());
allAllocated.add(allocation.getName());
}
-
+
Consumer<CacheInstance> deletionMarker = new Consumer<CacheInstance>() {
-
+
@Override
public void accept(CacheInstance instance) {
long ellapsed = request.getCurrentTime().getTime() - request.getInstances().get(instance).getTime();
@@ -1359,20 +1359,20 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
allAllocated.add(instance.getName());
}
}
-
+
};
-
+
allocatedCaches.put(jobToken, allocatedCachesOfJob);
-
+
request.getInstances().keySet()
.stream()
- .filter(it->!allAllocated.contains(it.getName()))
+ .filter(it -> !allAllocated.contains(it.getName()))
.forEach(deletionMarker);
-
+
return allocations;
}
}
-
+
});
}
@@ -1404,7 +1404,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
throw new RuntimeException(e);
}
}
-
+
@Override
public void runJobLocal(JobContext jobContext, JobRunnable runnable) {
while (thread == null) {
@@ -1414,12 +1414,12 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
throw new RuntimeException(e);
}
}
-
+
Long buildId = jobContext.getBuildId();
String jobToken = jobContext.getJobToken();
jobServers.put(jobToken, clusterManager.getLocalServerUUID());
-
+
jobRunnables.put(jobToken, runnable);
try {
TaskLogger jobLogger = logManager.getJobLogger(jobToken);
@@ -1446,7 +1446,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
jobServers.remove(jobToken);
}
}
-
+
@Override
public void reportJobWorkspace(JobContext jobContext, String jobWorkspace) {
transactionManager.run(new Runnable() {
@@ -1457,18 +1457,18 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
build.setJobWorkspace(jobWorkspace);
buildManager.save(build);
}
-
+
});
}
-
+
@Sessional
@Override
public void copyDependencies(JobContext jobContext, File tempDir) {
Build build = buildManager.load(jobContext.getBuildId());
- for (BuildDependence dependence: build.getDependencies()) {
+ for (BuildDependence dependence : build.getDependencies()) {
if (dependence.getArtifacts() != null) {
Build dependency = dependence.getDependency();
-
+
File targetDir;
if (dependence.getDestinationPath() != null) {
targetDir = new File(tempDir, dependence.getDestinationPath());
@@ -1487,15 +1487,15 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
File artifactsDir = dependency.getArtifactsDir();
if (artifactsDir.exists()) {
PatternSet patternSet = PatternSet.parse(dependence.getArtifacts());
- int baseLen = artifactsDir.getAbsolutePath().length()+1;
- for (File file: FileUtils.listFiles(artifactsDir, patternSet.getIncludes(), patternSet.getExcludes())) {
- FileUtils.copyFile(file,
+ int baseLen = artifactsDir.getAbsolutePath().length() + 1;
+ for (File file : FileUtils.listFiles(artifactsDir, patternSet.getIncludes(), patternSet.getExcludes())) {
+ FileUtils.copyFile(file,
new File(targetDir, file.getAbsolutePath().substring(baseLen)));
}
}
return null;
}
-
+
});
} else {
String serverUrl = clusterManager.getServerUrl(dependencyStorageServerUUID);
@@ -1505,17 +1505,17 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
.queryParam("projectId", dependency.getProject().getId())
.queryParam("buildNumber", dependency.getNumber())
.queryParam("artifacts", dependence.getArtifacts());
- Invocation.Builder builder = target.request();
- builder.header(HttpHeaders.AUTHORIZATION, KubernetesHelper.BEARER + " "
+ Invocation.Builder builder = target.request();
+ builder.header(HttpHeaders.AUTHORIZATION, KubernetesHelper.BEARER + " "
+ clusterManager.getCredentialValue());
-
- try (Response response = builder.get()){
+
+ try (Response response = builder.get()) {
KubernetesHelper.checkStatus(response);
try (InputStream is = response.readEntity(InputStream.class)) {
FileUtils.untar(is, targetDir, false);
} catch (IOException e) {
throw new RuntimeException(e);
- }
+ }
}
} finally {
client.close();
@@ -1523,14 +1523,15 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
}
}
- }
-
+ }
+
@Override
- public Map<String, byte[]> runServerStep(JobContext jobContext, List<Integer> stepPosition,
- File inputDir, Map<String, String> placeholderValues, TaskLogger logger) {
+ public Map<String, byte[]> runServerStep(JobContext jobContext, List<Integer> stepPosition,
+ File inputDir, Map<String, String> placeholderValues,
+ boolean callByAgent, TaskLogger logger) {
UUID storageServerUUID = projectManager.getStorageServerUUID(jobContext.getProjectId(), true);
if (storageServerUUID.equals(clusterManager.getLocalServerUUID())) {
-
+
// Some steps need the commit to be indexed, for instance various
// report publishing steps need to query the full blob path based
// on a partial path (java package/class etc)
@@ -1542,15 +1543,14 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
throw new RuntimeException(e);
}
}
-
+
return sessionManager.call(new Callable<Map<String, byte[]>>() {
@Override
public Map<String, byte[]> call() {
Thread thread = Thread.currentThread();
-
Collection<Thread> threads = serverStepThreads.get(jobContext.getJobToken());
- if (threads != null) synchronized (threads) {
+ if (callByAgent && threads != null) synchronized (threads) {
threads.add(thread);
}
try {
@@ -1558,14 +1558,14 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
if (actions != null) {
ServerSideFacade serverSideFacade = (ServerSideFacade) LeafFacade.of(actions, stepPosition);
ServerSideStep serverSideStep = (ServerSideStep) serverSideFacade.getStep();
-
+
serverSideStep = new EditableStringTransformer(new Function<String, String>() {
@Override
public String apply(String t) {
return replacePlaceholders(t, placeholderValues);
}
-
+
}).transformProperties(serverSideStep, Interpolative.class);
Build build = buildManager.load(jobContext.getBuildId());
@@ -1574,19 +1574,19 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
throw new IllegalStateException("Job actions not found");
}
} finally {
- if (threads != null) synchronized (threads) {
+ if (callByAgent && threads != null) synchronized (threads) {
threads.remove(thread);
}
}
-
+
}
-
+
});
} else {
String serverUrl = clusterManager.getServerUrl(storageServerUUID);
- return KubernetesHelper.runServerStep(serverUrl, jobContext.getJobToken(), stepPosition,
+ return KubernetesHelper.runServerStep(serverUrl, jobContext.getJobToken(), stepPosition,
inputDir, Lists.newArrayList("**"), Lists.newArrayList(), placeholderValues, logger);
}
}
-
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/job/JobManager.java b/server-core/src/main/java/io/onedev/server/job/JobManager.java
index 264d961bf6..8a074ca6d0 100644
--- a/server-core/src/main/java/io/onedev/server/job/JobManager.java
+++ b/server-core/src/main/java/io/onedev/server/job/JobManager.java
@@ -59,6 +59,6 @@ public interface JobManager {
void copyDependencies(JobContext jobContext, File targetDir);
Map<String, byte[]> runServerStep(JobContext jobContext, List<Integer> stepPosition, File inputDir,
- Map<String, String> placeholderValues, TaskLogger logger);
+ Map<String, String> placeholderValues, boolean callByAgent, TaskLogger logger);
}
diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
index 9eaf903e74..9a4aa983c0 100644
--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
@@ -75,6 +75,8 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
static final int ORDER = 40;
+ private static final int POD_WATCH_TIMEOUT = 60;
+
private static final Logger logger = LoggerFactory.getLogger(KubernetesExecutor.class);
private static final long NAMESPACE_DELETION_TIMEOUT = 120;
@@ -243,7 +245,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
@Override
public void run(TaskLogger jobLogger) {
- execute(jobLogger, jobContext);
+ execute(jobLogger, jobContext);
}
@Override
@@ -1395,6 +1397,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
StringBuilder json = new StringBuilder();
kubectl.addArgs("get", "pod", POD_NAME, "-n", namespace, "--watch", "-o", "json");
+ kubectl.timeout(POD_WATCH_TIMEOUT);
Thread thread = Thread.currentThread();
diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java
index db1fe93917..cbf97d9846 100644
--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java
+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java
@@ -116,7 +116,7 @@ public class KubernetesResource {
JobContext jobContext = jobManager.getJobContext(getJobToken(), true);
Map<String, byte[]> outputFiles = jobManager.runServerStep(jobContext,
- stepPosition, filesDir, placeholderValues, new TaskLogger() {
+ stepPosition, filesDir, placeholderValues, true, new TaskLogger() {
@Override
public void log(String message, String sessionId) {
diff --git a/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java
index 2edef016dd..6c4acb75fc 100644
--- a/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java
+++ b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java
@@ -126,7 +126,7 @@ public class RemoteDockerExecutor extends ServerDockerExecutor {
try {
WebsocketUtils.call(agentSession, jobData, 0);
- } catch (InterruptedException | TimeoutException e) {
+ } catch (InterruptedException|TimeoutException e) {
new Message(MessageTypes.CANCEL_JOB, jobToken).sendBy(agentSession);
}
}
diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
index faa35461b9..573408ca29 100644
--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
@@ -470,12 +470,13 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
@Override
public Map<String, byte[]> run(File inputDir, Map<String, String> placeholderValues) {
return getJobManager().runServerStep(jobContext, position, inputDir,
- placeholderValues, jobLogger);
+ placeholderValues, false, jobLogger);
}
});
} catch (Exception e) {
- jobLogger.error("Step \"" + stepNames + "\" is failed: " + getErrorMessage(e));
+ if (ExceptionUtils.find(e, InterruptedException.class) == null)
+ jobLogger.error("Step \"" + stepNames + "\" is failed: " + getErrorMessage(e));
return false;
}
}
diff --git a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
index 5eb3b52572..e3f8141b3a 100644
--- a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
+++ b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
@@ -5,6 +5,7 @@ import io.onedev.agent.ExecutorUtils;
import io.onedev.agent.job.FailedException;
import io.onedev.commons.bootstrap.Bootstrap;
import io.onedev.commons.loader.AppLoader;
+import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.TaskLogger;
@@ -251,12 +252,13 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat
@Override
public Map<String, byte[]> run(File inputDir, Map<String, String> placeholderValues) {
return getJobManager().runServerStep(jobContext, position, inputDir,
- placeholderValues, jobLogger);
+ placeholderValues, false, jobLogger);
}
});
} catch (Exception e) {
- jobLogger.error("Step \"" + stepNames + "\" is failed: " + getErrorMessage(e));
+ if (ExceptionUtils.find(e, InterruptedException.class) == null)
+ jobLogger.error("Step \"" + stepNames + "\" is failed: " + getErrorMessage(e));
return false;
}
}