apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-28 08:47:29 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix the number of cancelled daemons displayed

Browse Source
This commit is contained in:
Guillaume Nodet
2021-04-29 15:43:48 +02:00
parent 3577951ed5
commit 6a7f172412
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
View File

@@ -232,10 +232,11 @@ public class DaemonConnector {
private DaemonClientConnection connectToCanceledDaemon(Collection<DaemonInfo> busyDaemons, private DaemonClientConnection connectToCanceledDaemon(Collection<DaemonInfo> busyDaemons,
DaemonCompatibilitySpec constraint) { DaemonCompatibilitySpec constraint) {
DaemonClientConnection connection = null; DaemonClientConnection connection = null;
Map<Boolean, List<DaemonInfo>> canceledBusy = busyDaemons.stream() List<DaemonInfo> canceledBusy = busyDaemons.stream()
.collect(Collectors.groupingBy(di -> di.getState() == Canceled)); .filter(di -> di.getState() == Canceled)
final Collection<DaemonInfo> compatibleCanceledDaemons = getCompatibleDaemons( .collect(Collectors.toList());
canceledBusy.getOrDefault(true, Collections.emptyList()), constraint); final List<DaemonInfo> compatibleCanceledDaemons = getCompatibleDaemons(
canceledBusy, constraint);
LOGGER.debug("Found {} busy daemons, {} cancelled, {} compatibles", busyDaemons.size(), canceledBusy.size(), LOGGER.debug("Found {} busy daemons, {} cancelled, {} compatibles", busyDaemons.size(), canceledBusy.size(),
compatibleCanceledDaemons.size()); compatibleCanceledDaemons.size());
if (!compatibleCanceledDaemons.isEmpty()) { if (!compatibleCanceledDaemons.isEmpty()) {

2
daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java
View File

@@ -508,7 +508,7 @@ public class Server implements AutoCloseable, Runnable {
} }
LOGGER.info("Received message: {}", message); LOGGER.info("Received message: {}", message);
if (message == Message.BareMessage.CANCEL_BUILD_SINGLETON) { if (message == Message.BareMessage.CANCEL_BUILD_SINGLETON) {
updateState(DaemonState.Canceled); updateState(Canceled);
return; return;
} else { } else {
synchronized (recvQueue) { synchronized (recvQueue) {