apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2026-01-13 07:04:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Refactor usage of properties in the client / daemon, fixes #188

Browse Source
This commit is contained in:
Guillaume Nodet
2020-11-05 15:02:24 +01:00
committed by Peter Palaga
parent 759ca73c2d
commit 4030f8b5a4
31 changed files with 932 additions and 941 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
View File

@@ -417,14 +417,14 @@ public class DaemonMavenCli {
}
List<File> extClassPath = Stream
.of(Environment.DAEMON_EXT_CLASSPATH.systemProperty().orDefault(() -> "").asString().split(","))
.of(Environment.DAEMON_EXT_CLASSPATH.asString().split(","))
.map(File::new)
.collect(Collectors.toList());
CoreExtensionEntry coreEntry = CoreExtensionEntry.discoverFrom(coreRealm);
List<CoreExtension> extensions = Stream
.of(Environment.DAEMON_CORE_EXTENSIONS.systemProperty().orDefault(() -> "").asString().split(","))
.of(Environment.DAEMON_CORE_EXTENSIONS.asString().split(","))
.filter(s -> s != null && !s.isEmpty())
.map(s -> {
String[] parts = s.split(":");

6
daemon/src/main/java/org/jboss/fuse/mvnd/builder/ReactorBuildStats.java
View File

@@ -79,7 +79,11 @@ class ReactorBuildStats {
}
public void recordServiceTime(MavenProject project, long durationNanos) {
serviceTimes.get(projectGA(project)).addAndGet(durationNanos);
AtomicLong serviceTime = serviceTimes.get(projectGA(project));
if (serviceTime == null) {
throw new IllegalStateException("Unknown project " + projectGA(project) + ", found " + serviceTimes.keySet());
}
serviceTime.addAndGet(durationNanos);
}
public void recordBottlenecks(Set<MavenProject> projects, int degreeOfConcurrency,

11
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonExpiration.java
View File

@@ -21,13 +21,13 @@ import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
import java.util.function.ToLongFunction;
import java.util.stream.Collectors;
import org.jboss.fuse.mvnd.common.DaemonCompatibilitySpec;
import org.jboss.fuse.mvnd.common.DaemonCompatibilitySpec.Result;
import org.jboss.fuse.mvnd.common.DaemonExpirationStatus;
import org.jboss.fuse.mvnd.common.DaemonInfo;
import org.jboss.fuse.mvnd.common.DaemonState;
import org.jboss.fuse.mvnd.common.Environment;
import static org.jboss.fuse.mvnd.common.DaemonExpirationStatus.DO_NOT_EXPIRE;
import static org.jboss.fuse.mvnd.common.DaemonExpirationStatus.GRACEFUL_EXPIRE;
@@ -53,7 +53,7 @@ public class DaemonExpiration {
return any(
any(gcTrashing(), lowHeapSpace(), lowNonHeap()),
all(compatible(), duplicateGracePeriod(), notMostRecentlyUsed()),
idleTimeout(Server::getIdleTimeout),
idleTimeout(Environment.DAEMON_IDLE_TIMEOUT_MS.asInt()),
all(duplicateGracePeriod(), notMostRecentlyUsed(), lowMemory(0.05)),
registryUnavailable());
}
@@ -82,18 +82,17 @@ public class DaemonExpiration {
}
static DaemonExpirationStrategy duplicateGracePeriod() {
return idleTimeout(daemon -> DUPLICATE_DAEMON_GRACE_PERIOD_MS);
return idleTimeout(Environment.DAEMON_DUPLICATE_DAEMON_GRACE_PERIOD_MS.asInt());
}
private static final long HOUR = 60 * 60 * 1000;
private static final long MINUTE = 60 * 1000;
private static final long SECOND = 1000;
static DaemonExpirationStrategy idleTimeout(ToLongFunction<Server> timeout) {
static DaemonExpirationStrategy idleTimeout(long timeout) {
return daemon -> {
long len = timeout.applyAsLong(daemon);
long idl = System.currentTimeMillis() - daemon.getLastIdle();
if (daemon.getState() == DaemonState.Idle && idl > len) {
if (daemon.getState() == DaemonState.Idle && idl > timeout) {
String str;
if (idl > HOUR) {
str = (idl / HOUR) + " hours";

52
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Server.java
View File

@@ -21,9 +21,9 @@ import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.nio.channels.ServerSocketChannel;
import java.nio.channels.SocketChannel;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
import java.util.Locale;
@@ -36,6 +36,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
import org.apache.maven.cli.CliRequest;
import org.apache.maven.cli.CliRequestBuilder;
import org.apache.maven.cli.DaemonMavenCli;
@@ -48,7 +49,6 @@ import org.jboss.fuse.mvnd.common.DaemonRegistry;
import org.jboss.fuse.mvnd.common.DaemonState;
import org.jboss.fuse.mvnd.common.DaemonStopEvent;
import org.jboss.fuse.mvnd.common.Environment;
import org.jboss.fuse.mvnd.common.Layout;
import org.jboss.fuse.mvnd.common.Message;
import org.jboss.fuse.mvnd.common.Message.BuildEvent;
import org.jboss.fuse.mvnd.common.Message.BuildEvent.Type;
@@ -76,7 +76,6 @@ public class Server implements AutoCloseable, Runnable {
private final DaemonMavenCli cli;
private volatile DaemonInfo info;
private final DaemonRegistry registry;
private final Layout layout;
private final ScheduledExecutorService executor;
private final DaemonExpirationStrategy strategy;
@@ -85,33 +84,33 @@ public class Server implements AutoCloseable, Runnable {
private final Condition condition = stateLock.newCondition();
private final DaemonMemoryStatus memoryStatus;
public Server(String uid) throws IOException {
this.uid = uid;
this.layout = Layout.getEnvInstance();
public Server() throws IOException {
this.uid = Environment.DAEMON_UID.asString();
try {
cli = new DaemonMavenCli();
registry = new DaemonRegistry(layout.registry());
registry = new DaemonRegistry(Environment.DAEMON_REGISTRY.asPath());
socket = ServerSocketChannel.open().bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
final int idleTimeout = Environment.DAEMON_IDLE_TIMEOUT_MS
.systemProperty()
.orDefault(() -> String.valueOf(Environment.DEFAULT_IDLE_TIMEOUT))
.asInt();
executor = Executors.newScheduledThreadPool(1);
strategy = DaemonExpiration.master();
memoryStatus = new DaemonMemoryStatus(executor);
List<String> opts = new ArrayList<>();
Environment.DAEMON_EXT_CLASSPATH.systemProperty().asOptional()
.ifPresent(s -> opts.add(Environment.DAEMON_EXT_CLASSPATH.asCommandLineProperty(s)));
Environment.DAEMON_CORE_EXTENSIONS.systemProperty().asOptional()
.ifPresent(s -> opts.add(Environment.DAEMON_CORE_EXTENSIONS.asCommandLineProperty(s)));
Arrays.stream(Environment.values())
.filter(Environment::isDiscriminating)
.map(v -> v.getProperty() + "=" + v.asString())
.forEach(opts::add);
if (LOGGER.isDebugEnabled()) {
LOGGER.debug(opts.stream().collect(Collectors.joining(
"\n ", "Initializing daemon with properties:\n ", "\n")));
}
long cur = System.currentTimeMillis();
final Path javaHome = Paths.get(System.getProperty("mvnd.java.home"));
info = new DaemonInfo(uid, javaHome.toString(), layout.mavenHome().toString(),
DaemonRegistry.getProcessId(), socket.socket().getLocalPort(),
idleTimeout, Locale.getDefault().toLanguageTag(), opts,
info = new DaemonInfo(uid,
Environment.JAVA_HOME.asString(),
Environment.MVND_HOME.asString(),
DaemonRegistry.getProcessId(),
socket.socket().getLocalPort(),
Locale.getDefault().toLanguageTag(),
opts,
Busy, cur, cur);
registry.store(info);
} catch (Exception e) {
@@ -162,10 +161,7 @@ public class Server implements AutoCloseable, Runnable {
public void run() {
try {
int expirationCheckDelayMs = Environment.EXPIRATION_CHECK_DELAY_MS
.systemProperty()
.orDefault(() -> String.valueOf(Environment.DEFAULT_EXPIRATION_CHECK_DELAY))
.asInt();
int expirationCheckDelayMs = Environment.DAEMON_EXPIRATION_CHECK_DELAY_MS.asInt();
executor.scheduleAtFixedRate(this::expirationCheck,
expirationCheckDelayMs, expirationCheckDelayMs, TimeUnit.MILLISECONDS);
LOGGER.info("Daemon started");
@@ -397,7 +393,7 @@ public class Server implements AutoCloseable, Runnable {
private void handle(DaemonConnection connection, BuildRequest buildRequest) {
updateState(Busy);
try {
int keepAlive = Environment.DAEMON_KEEP_ALIVE_MS.systemProperty().asInt();
int keepAlive = Environment.DAEMON_KEEP_ALIVE_MS.asInt();
LOGGER.info("Executing request");
CliRequest req = new CliRequestBuilder()
@@ -509,10 +505,6 @@ public class Server implements AutoCloseable, Runnable {
return info;
}
public int getIdleTimeout() {
return info.getIdleTimeout();
}
public String getUid() {
return info.getUid();
}