Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrated code lifecycle: Fix an issue with concurrent build queue access #9876

Merged
merged 6 commits into from
Nov 27, 2024
Merged

Integrated code lifecycle: Fix an issue with concurrent build queue access #9876

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bf5d9ac
remove IQueue.stream()
BBesrour Nov 26, 2024
a99ee2c
remove IQueue.stream()
BBesrour Nov 26, 2024
7a5ec24
dont pass pub key
BBesrour Nov 26, 2024
5d74a91
dont use Imap.stream()
BBesrour Nov 27, 2024
59dd5d5
add comments
BBesrour Nov 27, 2024
9bae068
improve comments
krusche Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 24 additions & 17 deletions ...java/de/tum/cit/aet/artemis/programming/service/localci/SharedQueueManagementService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,36 +109,37 @@ public void pushDockerImageCleanupInfo() {
}

public List<BuildJobQueueItem> getQueuedJobs() {
return queue.stream().toList();
// NOTE: we should not use streams with IQueue, because it can be unstable, when many items are added at the same time
return new ArrayList<>(queue);
}

public List<BuildJobQueueItem> getProcessingJobs() {
return processingJobs.values().stream().toList();
return new ArrayList<>(processingJobs.values());
}

public List<BuildJobQueueItem> getQueuedJobsForCourse(long courseId) {
return queue.stream().filter(job -> job.courseId() == courseId).toList();
return getQueuedJobs().stream().filter(job -> job.courseId() == courseId).toList();
}

public List<BuildJobQueueItem> getProcessingJobsForCourse(long courseId) {
return processingJobs.values().stream().filter(job -> job.courseId() == courseId).toList();
return getProcessingJobs().stream().filter(job -> job.courseId() == courseId).toList();
}

public List<BuildJobQueueItem> getQueuedJobsForParticipation(long participationId) {
return queue.stream().filter(job -> job.participationId() == participationId).toList();
return getQueuedJobs().stream().filter(job -> job.participationId() == participationId).toList();
}

public List<BuildJobQueueItem> getProcessingJobsForParticipation(long participationId) {
return processingJobs.values().stream().filter(job -> job.participationId() == participationId).toList();
return getProcessingJobs().stream().filter(job -> job.participationId() == participationId).toList();
}

public List<BuildAgentInformation> getBuildAgentInformation() {
return buildAgentInformation.values().stream().toList();
return new ArrayList<>(buildAgentInformation.values());
}

public List<BuildAgentInformation> getBuildAgentInformationWithoutRecentBuildJobs() {
return buildAgentInformation.values().stream().map(agent -> new BuildAgentInformation(agent.buildAgent(), agent.maxNumberOfConcurrentBuildJobs(),
agent.numberOfCurrentBuildJobs(), agent.runningBuildJobs(), agent.status(), null, null)).toList();
return getBuildAgentInformation().stream().map(agent -> new BuildAgentInformation(agent.buildAgent(), agent.maxNumberOfConcurrentBuildJobs(),
agent.numberOfCurrentBuildJobs(), agent.runningBuildJobs(), agent.status(), null, agent.publicSshKey())).toList();
}

public void pauseBuildAgent(String agent) {
Expand All @@ -156,9 +157,10 @@ public void resumeBuildAgent(String agent) {
*/
public void cancelBuildJob(String buildJobId) {
// Remove build job if it is queued
if (queue.stream().anyMatch(job -> Objects.equals(job.id(), buildJobId))) {
List<BuildJobQueueItem> queuedJobs = getQueuedJobs();
if (queuedJobs.stream().anyMatch(job -> Objects.equals(job.id(), buildJobId))) {
List<BuildJobQueueItem> toRemove = new ArrayList<>();
for (BuildJobQueueItem job : queue) {
for (BuildJobQueueItem job : queuedJobs) {
if (Objects.equals(job.id(), buildJobId)) {
toRemove.add(job);
}
Expand Down Expand Up @@ -197,7 +199,8 @@ public void cancelAllQueuedBuildJobs() {
* Cancel all running build jobs.
*/
public void cancelAllRunningBuildJobs() {
for (BuildJobQueueItem buildJob : processingJobs.values()) {
List<BuildJobQueueItem> values = getProcessingJobs();
for (BuildJobQueueItem buildJob : values) {
cancelBuildJob(buildJob.id());
}
}
Expand All @@ -208,7 +211,7 @@ public void cancelAllRunningBuildJobs() {
* @param agentName name of the agent
*/
public void cancelAllRunningBuildJobsForAgent(String agentName) {
processingJobs.values().stream().filter(job -> Objects.equals(job.buildAgent().name(), agentName)).forEach(job -> cancelBuildJob(job.id()));
getProcessingJobs().stream().filter(job -> Objects.equals(job.buildAgent().name(), agentName)).forEach(job -> cancelBuildJob(job.id()));
}

/**
Expand All @@ -217,8 +220,9 @@ public void cancelAllRunningBuildJobsForAgent(String agentName) {
* @param courseId id of the course
*/
public void cancelAllQueuedBuildJobsForCourse(long courseId) {
List<BuildJobQueueItem> queuedJobs = getQueuedJobs();
List<BuildJobQueueItem> toRemove = new ArrayList<>();
for (BuildJobQueueItem job : queue) {
for (BuildJobQueueItem job : queuedJobs) {
if (job.courseId() == courseId) {
toRemove.add(job);
}
Expand All @@ -232,7 +236,8 @@ public void cancelAllQueuedBuildJobsForCourse(long courseId) {
* @param courseId id of the course
*/
public void cancelAllRunningBuildJobsForCourse(long courseId) {
for (BuildJobQueueItem buildJob : processingJobs.values()) {
List<BuildJobQueueItem> values = getProcessingJobs();
for (BuildJobQueueItem buildJob : values) {
if (buildJob.courseId() == courseId) {
cancelBuildJob(buildJob.id());
}
Expand All @@ -246,14 +251,16 @@ public void cancelAllRunningBuildJobsForCourse(long courseId) {
*/
public void cancelAllJobsForParticipation(long participationId) {
List<BuildJobQueueItem> toRemove = new ArrayList<>();
for (BuildJobQueueItem queuedJob : queue) {
List<BuildJobQueueItem> queuedJobs = getQueuedJobs();
for (BuildJobQueueItem queuedJob : queuedJobs) {
if (queuedJob.participationId() == participationId) {
toRemove.add(queuedJob);
}
}
queue.removeAll(toRemove);

for (BuildJobQueueItem runningJob : processingJobs.values()) {
List<BuildJobQueueItem> values = getProcessingJobs();
for (BuildJobQueueItem runningJob : values) {
if (runningJob.participationId() == participationId) {
cancelBuildJob(runningJob.id());
}
Expand Down
Loading