The Unified and Autonomous Development Platform
Fix issue #1087 - After upgrade from 7.7.2: io.onedev.commons.utils.ExplicitException: Error validating build spec
Robin Shen5392a14cbe43
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex 50b54f4864..fa8c6a55ef 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -797,7 +797,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>});}-+@Transactional@Overridepublic void onDeleteBranch(Project project, String branchName) {@@ -1074,8 +1074,38 @@ public class DefaultProjectManager extends BaseEntityManager<Project>public File getLfsObjectsDir(Long projectId) {return new File(storageManager.getProjectGitDir(projectId), "lfs/objects");}++ @Override+ public Collection<String> getReservedNames() {+ return reservedNames;+ }++ @Override+ public MimeFileInfo getSiteFileInfo(Long projectId, String filePath) {+ return runOnProjectServer(projectId, new ClusterTask<MimeFileInfo>() {++ private static final long serialVersionUID = 1L;++ @Override+ public MimeFileInfo call() throws Exception {+ return LockUtils.read(Project.getSiteLockName(projectId), new Callable<MimeFileInfo>() {++ @Override+ public MimeFileInfo call() throws Exception {+ File siteFile = new File(storageManager.getProjectSiteDir(projectId), filePath);+ String mimeType = Files.probeContentType(siteFile.toPath());+ if (mimeType == null)+ mimeType = MediaType.APPLICATION_OCTET_STREAM;+ return new MimeFileInfo(filePath, siteFile.length(), siteFile.lastModified(), mimeType);+ }++ });+ }++ });+ }- private class StorageEntryListener implements EntryAddedListener<Long, ProjectServer>,+ private class StorageEntryListener implements EntryAddedListener<Long, ProjectServer>,EntryRemovedListener<Long, ProjectServer>, EntryUpdatedListener<Long, ProjectServer>, Serializable {private static final long serialVersionUID = 1L;@@ -1085,126 +1115,63 @@ public class DefaultProjectManager extends BaseEntityManager<Project>Long projectId = event.getKey();UUID oldServerUUID = event.getOldValue().getPrimary();Member oldServer = clusterManager.getServer(oldServerUUID, false);- if (oldServer != null) {- clusterManager.submitToServer(oldServer, new ClusterTask<Void>() {-- private static final long serialVersionUID = 1L;+ if (oldServer != null && oldServer.equals(clusterManager.getLocalServerUUID())) {+ sessionManager.run(new Runnable() {@Override- public Void call() throws Exception {- sessionManager.run(new Runnable() {-- @Override- public void run() {- jobManager.unschedule(load(projectId));- }-- });- return null;+ public void run() {+ jobManager.unschedule(load(projectId));}-+});}- clusterManager.submitToServer(event.getValue().getPrimary(), new ClusterTask<Void>() {-- private static final long serialVersionUID = 1L;++ if (event.getValue().getPrimary().equals(clusterManager.getLocalServerUUID())) {+ sessionManager.run(new Runnable() {- @Override- public Void call() throws Exception {- sessionManager.run(new Runnable() {+ @Override+ public void run() {+ jobManager.schedule(load(projectId));+ }- @Override- public void run() {- jobManager.schedule(load(projectId));- }-- });- return null;- }-- });+ });+ }}@Overridepublic void entryRemoved(EntryEvent<Long, ProjectServer> event) {- Long projectId = event.getKey();+ Long projectId = event.getKey();UUID oldServerUUID = event.getOldValue().getPrimary();Member oldServer = clusterManager.getServer(oldServerUUID, false);- if (oldServer != null) {- clusterManager.submitToServer(oldServer, new ClusterTask<Void>() {-- private static final long serialVersionUID = 1L;+ if (oldServer != null && oldServer.getUuid().equals(clusterManager.getLocalServerUUID())) {+ sessionManager.run(new Runnable() {@Override- public Void call() throws Exception {- sessionManager.run(new Runnable() {-- @Override- public void run() {- jobManager.unschedule(load(projectId));- }-- });- return null;+ public void run() {+ jobManager.unschedule(load(projectId));}-+});+}}@Overridepublic void entryAdded(EntryEvent<Long, ProjectServer> event) {Long projectId = event.getKey();- clusterManager.submitToServer(event.getValue().getPrimary(), new ClusterTask<Void>() {-- private static final long serialVersionUID = 1L;-- @Override- public Void call() throws Exception {- sessionManager.run(new Runnable() {-- @Override- public void run() {- jobManager.schedule(load(projectId));- }-- });- return null;- }-- });- }-- }-- @Override- public Collection<String> getReservedNames() {- return reservedNames;- }- @Override- public MimeFileInfo getSiteFileInfo(Long projectId, String filePath) {- return runOnProjectServer(projectId, new ClusterTask<MimeFileInfo>() {-- private static final long serialVersionUID = 1L;-- @Override- public MimeFileInfo call() throws Exception {- return LockUtils.read(Project.getSiteLockName(projectId), new Callable<MimeFileInfo>() {+ if (event.getValue().getPrimary().equals(clusterManager.getLocalServerUUID())) {+ sessionManager.run(new Runnable() {@Override- public MimeFileInfo call() throws Exception {- File siteFile = new File(storageManager.getProjectSiteDir(projectId), filePath);- String mimeType = Files.probeContentType(siteFile.toPath());- if (mimeType == null)- mimeType = MediaType.APPLICATION_OCTET_STREAM;- return new MimeFileInfo(filePath, siteFile.length(), siteFile.lastModified(), mimeType);+ public void run() {+ jobManager.schedule(load(projectId));}});}-- });+ }+}-+}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.javaindex 8bcebe0985..510a5643f8 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@@ -149,8 +149,6 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizprivate final BuildParamManager buildParamManager;- private final AgentManager agentManager;-private final TaskScheduler taskScheduler;private final Validator validator;@@ -161,8 +159,6 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizprivate final StorageManager storageManager;- private final ResourceAllocator resourceAllocator;-private final GitService gitService;private volatile Thread thread;@@ -173,13 +169,15 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizprivate volatile Map<String, Collection<String>> allocatedCaches;+ private final Collection<Long> projectIdsToScheduleAtStart = ConcurrentHashMap.newKeySet();+@Injectpublic 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, AgentManager agentManager,+ ProjectManager projectManager, Validator validator, TaskScheduler taskScheduler,ClusterManager clusterManager, CodeIndexManager codeIndexManager, StorageManager storageManager,- ResourceAllocator resourceAllocator, PullRequestManager pullRequestManager, GitService gitService) {+ PullRequestManager pullRequestManager, GitService gitService) {this.settingManager = settingManager;this.buildManager = buildManager;this.userManager = userManager;@@ -192,10 +190,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizthis.projectManager = projectManager;this.validator = validator;this.taskScheduler = taskScheduler;- this.agentManager = agentManager;this.codeIndexManager = codeIndexManager;this.clusterManager = clusterManager;- this.resourceAllocator = resourceAllocator;this.storageManager = storageManager;this.pullRequestManager = pullRequestManager;this.gitService = gitService;@@ -992,6 +988,11 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizthread = new Thread(this);thread.start();++ for (Long projectId: projectIdsToScheduleAtStart) {+ schedule(projectManager.load(projectId));+ }+ projectIdsToScheduleAtStart.clear();}@Listen@@ -1011,54 +1012,62 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz@Sessional@Overridepublic void schedule(Project project) {- Collection<String> tasksOfProject = new HashSet<>();- try {- String defaultBranch = project.getDefaultBranch();- if (defaultBranch != null) {- ObjectId commitId = project.getObjectId(defaultBranch, false);- if (commitId != null) {- JobSecretAuthorizationContext.push(new JobSecretAuthorizationContext(project, commitId, null));- try {- BuildSpec buildSpec = project.getBuildSpec(commitId);- if (buildSpec != null) {- validateBuildSpec(project, commitId, buildSpec);- ScheduledTimeReaches event = new ScheduledTimeReaches(project);- for (Job job: buildSpec.getJobMap().values()) {- for (JobTrigger trigger: job.getTriggers()) {- if (trigger instanceof ScheduleTrigger) {- ScheduleTrigger scheduledTrigger = (ScheduleTrigger) trigger;- SubmitReason reason = trigger.matches(event, job);- if (reason != null) {- String taskId = taskScheduler.schedule(newSchedulableTask(project, commitId, job, scheduledTrigger, reason));- tasksOfProject.add(taskId);+ if (thread != null) {+ Collection<String> tasksOfProject = new HashSet<>();+ try {+ String defaultBranch = project.getDefaultBranch();+ if (defaultBranch != null) {+ ObjectId commitId = project.getObjectId(defaultBranch, false);+ if (commitId != null) {+ JobSecretAuthorizationContext.push(new JobSecretAuthorizationContext(project, commitId, null));+ try {+ BuildSpec buildSpec = project.getBuildSpec(commitId);+ if (buildSpec != null) {+ validateBuildSpec(project, commitId, buildSpec);+ ScheduledTimeReaches event = new ScheduledTimeReaches(project);+ for (Job job : buildSpec.getJobMap().values()) {+ for (JobTrigger trigger : job.getTriggers()) {+ if (trigger instanceof ScheduleTrigger) {+ ScheduleTrigger scheduledTrigger = (ScheduleTrigger) trigger;+ SubmitReason reason = trigger.matches(event, job);+ if (reason != null) {+ String taskId = taskScheduler.schedule(newSchedulableTask(project, commitId, job, scheduledTrigger, reason));+ tasksOfProject.add(taskId);+ }}}}}+ } catch (BuildSpecParseException e) {+ logger.warn("Malformed build spec (project: {}, branch: {})",+ project.getPath(), defaultBranch);+ } finally {+ JobSecretAuthorizationContext.pop();}- } catch (BuildSpecParseException e) {- logger.warn("Malformed build spec (project: {}, branch: {})",- project.getPath(), defaultBranch);- } finally {- JobSecretAuthorizationContext.pop();}}+ } catch (Exception e) {+ logger.error("Error scheduling project '" + project.getPath() + "'", e);+ } finally {+ tasksOfProject = scheduledTasks.put(project.getId(), tasksOfProject);+ if (tasksOfProject != null)+ tasksOfProject.stream().forEach(it -> taskScheduler.unschedule(it));}- } catch (Exception e) {- logger.error("Error scheduling project '" + project.getPath() + "'", e);- } finally {- tasksOfProject = scheduledTasks.put(project.getId(), tasksOfProject);- if (tasksOfProject != null)- tasksOfProject.stream().forEach(it->taskScheduler.unschedule(it));+ } else {+ projectIdsToScheduleAtStart.add(project.getId());}}@Sessional@Overridepublic void unschedule(Project project) {- var tasksOfProject = scheduledTasks.remove(project.getId());- if (tasksOfProject != null)- tasksOfProject.stream().forEach(it->taskScheduler.unschedule(it));+ if (thread != null) {+ var tasksOfProject = scheduledTasks.remove(project.getId());+ if (tasksOfProject != null)+ tasksOfProject.stream().forEach(it -> taskScheduler.unschedule(it));+ } else {+ projectIdsToScheduleAtStart.remove(project.getId());+ }}private SchedulableTask newSchedulableTask(Project project, ObjectId commitId, Job job,