Spring/spring-data-dev-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use for-loop in GitHub.findTickets(…) instead offloading ticket lookup to the executor service.

Browse Source 
We now ensure that we do not block the executor service to avoid deadlocks caused by a blocked event loop.

Resolves #174.
This commit is contained in:
Mark Paluch
2021-02-18 10:55:08 +01:00
parent d6a19a3de8
commit 9101d7b306
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
release-tools/src/main/java/org/springframework/data/release/issues/github/GitHub.java
View File

@@ -23,7 +23,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -49,9 +48,7 @@ import org.springframework.data.release.model.Project;
import org.springframework.data.release.model.Projects;
import org.springframework.data.release.model.Tracker;
import org.springframework.data.release.model.TrainIteration;
import org.springframework.data.release.utils.ExecutionUtils;
import org.springframework.data.release.utils.Logger;
import org.springframework.data.util.Streamable;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@@ -92,16 +89,13 @@ class GitHub extends GitHubSupport implements IssueTracker {
private final Logger logger;
private final GitHubProperties properties;
private final ExecutorService executorService;
public GitHub(@Qualifier("tracker") RestTemplateBuilder templateBuilder, Logger logger, GitHubProperties properties,
ExecutorService executorService) {
public GitHub(@Qualifier("tracker") RestTemplateBuilder templateBuilder, Logger logger, GitHubProperties properties) {
super(createOperations(templateBuilder, properties));
this.logger = logger;
this.properties = properties;
this.executorService = executorService;
}
/*
@@ -481,9 +475,16 @@ class GitHub extends GitHubSupport implements IssueTracker {
String repositoryName = GitProject.of(moduleIteration.getProject()).getRepositoryName();
logger.log(moduleIteration, "Looking up GitHub issues …");
Collection<GitHubReadIssue> foundIssues = ExecutionUtils.runAndReturn(executorService,
Streamable.of(() -> ticketIds.stream().filter(it -> it.startsWith("#"))),
ticketReference -> getTicket(issues, repositoryName, ticketReference));
Collection<GitHubReadIssue> foundIssues = ticketIds.stream().filter(it -> it.startsWith("#")).flatMap(it -> {
GitHubReadIssue ticket = getTicket(issues, repositoryName, it);
if (ticket != null) {
return Stream.of(ticket);
}
return Stream.empty();
}).collect(Collectors.toList());
List<GitHubReadIssue> gitHubIssues = foundIssues.stream().filter(it -> {
Ticket ticket = toTicket(it);