grpc hot reload

fixes quarkusio#9327 fixes quarkusio#9328
michalszynkiewicz · Jul 8, 2020 · f256450 · f256450
1 parent 8ac1fb1
commit f256450
Show file tree

Hide file tree

Showing 27 changed files with 859 additions and 105 deletions.
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
@@ -1189,6 +1189,7 @@
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-grpc-protoc-plugin</artifactId>
                 <version>${project.version}</version>
+                <classifier>shaded</classifier>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/DevModeContext.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/DevModeContext.java
@@ -3,6 +3,7 @@
 import java.io.File;
 import java.io.Serializable;
 import java.net.URL;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -288,7 +289,7 @@ public String getSourceParent() {
 
         public void addSourcePaths(Collection<String> additionalPaths) {
             additionalPaths.stream()
-                    .map(p -> p.startsWith("/") ? p : (projectDirectory + File.separator + p))
+                    .map(p -> Paths.get(p).isAbsolute() ? p : (projectDirectory + File.separator + p))
                     .forEach(sourcePaths::add);
         }
 

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedDevModeMain.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedDevModeMain.java
@@ -21,7 +21,6 @@
 import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Executors;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
@@ -142,27 +141,21 @@ public void accept(Integer integer) {
     }
 
     private void startCodeGenWatcher(QuarkusClassLoader classLoader, List<CodeGenData> codeGens) {
-        Executors.newSingleThreadExecutor().execute(
-                () -> {
-                    Collection<FSWatchUtil.Watcher> watchers = new ArrayList<>();
-                    for (CodeGenData codeGen : codeGens) {
-                        watchers.add(new FSWatchUtil.Watcher(codeGen.sourceDir, codeGen.provider.inputExtension(),
-                                modifiedPaths -> {
-                                    try {
-                                        CodeGenerator.trigger(classLoader,
-                                                codeGen,
-                                                curatedApplication.getAppModel());
-                                    } catch (Exception any) {
-                                        log.warn("Code generation failed", any);
-                                    }
-                                }));
-                    }
-                    try {
-                        FSWatchUtil.observe(watchers, 500);
-                    } catch (InterruptedException e) {
-                        log.debug("Watching for code gen interrupted");
-                    }
-                });
+
+        Collection<FSWatchUtil.Watcher> watchers = new ArrayList<>();
+        for (CodeGenData codeGen : codeGens) {
+            watchers.add(new FSWatchUtil.Watcher(codeGen.sourceDir, codeGen.provider.inputExtension(),
+                    modifiedPaths -> {
+                        try {
+                            CodeGenerator.trigger(classLoader,
+                                    codeGen,
+                                    curatedApplication.getAppModel());
+                        } catch (Exception any) {
+                            log.warn("Code generation failed", any);
+                        }
+                    }));
+        }
+        FSWatchUtil.observe(watchers, 500);
     }
 
     @SuppressWarnings("unchecked")

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java
@@ -32,6 +32,7 @@
 import org.jboss.logging.Logger;
 
 import io.quarkus.bootstrap.runner.Timing;
+import io.quarkus.deployment.util.FSWatchUtil;
 import io.quarkus.deployment.util.FileUtil;
 import io.quarkus.dev.spi.HotReplacementContext;
 import io.quarkus.dev.spi.HotReplacementSetup;
@@ -536,5 +537,6 @@ public void startupFailed() {
     @Override
     public void close() throws IOException {
         compiler.close();
+        FSWatchUtil.shutdown();
     }
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/util/FSWatchUtil.java b/core/deployment/src/main/java/io/quarkus/deployment/util/FSWatchUtil.java
@@ -8,6 +8,8 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
@@ -18,23 +20,32 @@ public class FSWatchUtil {
 
     private static final Logger log = Logger.getLogger(FSWatchUtil.class);
 
+    private static final List<ExecutorService> executors = new ArrayList<>();
+
     /**
      * in a loop, checks for modifications in the files
      * 
      * @param watchers list of {@link Watcher}s
      */
     public static void observe(Collection<Watcher> watchers,
-            long intervalMs) throws InterruptedException {
-        Map<Path, Long> lastModified = new HashMap<>();
+            long intervalMs) {
+        ExecutorService executorService = Executors.newSingleThreadExecutor();
+        executorService.execute(
+                () -> doObserve(watchers, intervalMs));
+        executors.add(executorService);
+    }
 
+    private static void doObserve(Collection<Watcher> watchers, long intervalMs) {
+        Map<Path, Long> lastModified = new HashMap<>();
         long lastCheck = 0;
         // we're assuming no changes between the compilation and first execution, so don't trigger the watcher on first run
         boolean firstRun = true;
         //noinspection InfiniteLoopStatement
         while (true) {
             for (Watcher watcher : watchers) {
                 try {
-                    List<Path> matchingPaths = Files.walk(watcher.rootPath)
+                    Path rootPath = watcher.rootPath;
+                    List<Path> matchingPaths = Files.walk(rootPath)
                             .filter(path -> FilenameUtils.getExtension(path.toString()).equals(watcher.fileExtension))
                             .collect(Collectors.toList());
                     List<Path> changedFiles = new ArrayList<>();
@@ -50,20 +61,29 @@ public static void observe(Collection<Watcher> watchers,
                         watcher.action.accept(changedFiles);
                     }
                 } catch (IOException e) {
-                    log.warn("Failed checking for code gen source modifications", e);
+                    log.debug("Failed checking for code gen source modifications", e);
                 }
             }
 
             long toSleep = intervalMs - (System.currentTimeMillis() - lastCheck);
             if (toSleep > 0) {
-                //noinspection BusyWait
-                Thread.sleep(toSleep);
+                try {
+                    //noinspection BusyWait
+                    Thread.sleep(toSleep);
+                } catch (InterruptedException e) {
+                    log.debug("Watching for code gen interrupted");
+                }
             }
             lastCheck = System.currentTimeMillis();
             firstRun = false;
         }
     }
 
+    public static void shutdown() {
+        executors.forEach(ExecutorService::shutdown);
+        executors.clear();
+    }
+
     public static class Watcher {
         private final Path rootPath;
         private final String fileExtension;

diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusPrepare.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusPrepare.java
@@ -30,7 +30,7 @@ public class QuarkusPrepare extends QuarkusTask {
     public static final String INIT_AND_RUN = "initAndRun";
     private Path sourcesDirectory;
     private Consumer<Path> sourceRegistrar;
-    private boolean test = false; // mstodo test task!!!
+    private boolean test = false;
 
     public QuarkusPrepare() {
         super("Quarkus performs pre-build preparations, such as sources generation");

diff --git a/extensions/grpc/deployment/pom.xml b/extensions/grpc/deployment/pom.xml
@@ -132,6 +132,7 @@
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-grpc-protoc-plugin</artifactId>
+            <classifier>shaded</classifier>
         </dependency>
 
         <dependency>
@@ -159,6 +160,16 @@
             <artifactId>awaitility</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-health</artifactId>

diff --git a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcCodeGen.java b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcCodeGen.java
@@ -82,7 +82,8 @@ public boolean trigger(CodeGenContext context) throws CodeGenException {
                             .start();
                     int resultCode = process.waitFor();
                     if (resultCode != 0) {
-                        throw new CodeGenException("Failed to generate Java classes from proto file: " + protoFiles);
+                        throw new CodeGenException("Failed to generate Java classes from proto files: " + protoFiles +
+                                " to " + outDir.toAbsolutePath().toString());
                     }
                     return true;
                 }
@@ -164,15 +165,15 @@ private String osClassifier() throws CodeGenException {
     }
 
     private static Path prepareQuarkusGrpcExecutable(AppModel appModel, Path buildDir) throws CodeGenException {
-        Path pluginPath = findArtifactPath(appModel, "io.quarkus", "quarkus-grpc-protoc-plugin", "", "jar");
+        Path pluginPath = findArtifactPath(appModel, "io.quarkus", "quarkus-grpc-protoc-plugin", "shaded", "jar");
         if (pluginPath == null) {
             throw new CodeGenException("Failed to find Quarkus gRPC protoc plugin among dependencies");
         }
 
         if (OS.determineOS() != OS.WINDOWS) {
             return writeScript(buildDir, pluginPath, "#!/bin/sh\n", ".sh");
         } else {
-            return writeScript(buildDir, pluginPath, "", ".cmd");
+            return writeScript(buildDir, pluginPath, "@echo off\r\n", ".cmd");
         }
     }
 

diff --git a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServerProcessor.java b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServerProcessor.java
@@ -12,21 +12,25 @@
 
 import io.grpc.internal.DnsNameResolverProvider;
 import io.grpc.internal.PickFirstLoadBalancerProvider;
+import io.grpc.internal.ServerImpl;
 import io.grpc.netty.NettyChannelProvider;
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.processor.DotNames;
+import io.quarkus.deployment.IsDevelopment;
 import io.quarkus.deployment.IsNormal;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.ExecutionTime;
 import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.ServiceStartBuildItem;
 import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageConfigBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.grpc.deployment.devmode.FieldDefinalizingVisitor;
 import io.quarkus.grpc.runtime.GrpcContainer;
 import io.quarkus.grpc.runtime.GrpcServerRecorder;
 import io.quarkus.grpc.runtime.config.GrpcConfiguration;
@@ -80,12 +84,20 @@ ServiceStartBuildItem build(GrpcServerRecorder recorder, GrpcConfiguration confi
             ShutdownContextBuildItem shutdown, List<BindableServiceBuildItem> bindables,
             VertxBuildItem vertx) {
         if (!bindables.isEmpty()) {
-            recorder.initializeGrpcServer(vertx.getVertx(), config);
+            recorder.initializeGrpcServer(vertx.getVertx(), config, shutdown);
             return new ServiceStartBuildItem(GRPC_SERVER);
         }
         return null;
     }
 
+    @BuildStep(onlyIf = IsDevelopment.class)
+    void definializeGrpcFieldsForDevMode(BuildProducer<BytecodeTransformerBuildItem> transformers) {
+        transformers.produce(new BytecodeTransformerBuildItem("io.grpc.internal.InternalHandlerRegistry",
+                new FieldDefinalizingVisitor("services", "methods")));
+        transformers.produce(new BytecodeTransformerBuildItem(ServerImpl.class.getName(),
+                new FieldDefinalizingVisitor("interceptors")));
+    }
+
     @BuildStep
     public void configureNativeExecutable(CombinedIndexBuildItem combinedIndex,
             BuildProducer<ReflectiveClassBuildItem> reflectiveClass,

diff --git a/...deployment/src/main/java/io/quarkus/grpc/deployment/devmode/FieldDefinalizingVisitor.java b/...deployment/src/main/java/io/quarkus/grpc/deployment/devmode/FieldDefinalizingVisitor.java
@@ -0,0 +1,36 @@
+package io.quarkus.grpc.deployment.devmode;
+
+import static java.util.Arrays.asList;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.function.BiFunction;
+
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.Opcodes;
+
+import io.quarkus.gizmo.Gizmo;
+
+public class FieldDefinalizingVisitor implements BiFunction<String, ClassVisitor, ClassVisitor> {
+
+    private final Set<String> fields = new HashSet<>();
+
+    public FieldDefinalizingVisitor(String... fields) {
+        this.fields.addAll(asList(fields));
+    }
+
+    @Override
+    public ClassVisitor apply(String s, ClassVisitor classVisitor) {
+        return new ClassVisitor(Gizmo.ASM_API_VERSION, classVisitor) {
+            @Override
+            public FieldVisitor visitField(int access, String name, String descriptor, String signature, Object value) {
+                if (fields.contains(name)) {
+                    access = access & (~Opcodes.ACC_FINAL);
+                    access = access | Opcodes.ACC_VOLATILE;
+                }
+                return super.visitField(access, name, descriptor, signature, value);
+            }
+        };
+    }
+}
diff --git a/.../grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeTestInterceptor.java b/.../grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeTestInterceptor.java
@@ -0,0 +1,36 @@
+package io.quarkus.grpc.server.devmode;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import io.grpc.ForwardingServerCall;
+import io.grpc.Metadata;
+import io.grpc.ServerCall;
+import io.grpc.ServerCallHandler;
+import io.grpc.ServerInterceptor;
+
+@ApplicationScoped
+public class DevModeTestInterceptor implements ServerInterceptor {
+
+    private volatile String lastStatus = "initial";
+
+    @Override
+    public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(ServerCall<ReqT, RespT> serverCall,
+            Metadata metadata, ServerCallHandler<ReqT, RespT> serverCallHandler) {
+        return serverCallHandler
+                .startCall(new ForwardingServerCall.SimpleForwardingServerCall<ReqT, RespT>(serverCall) {
+                    @Override
+                    protected ServerCall<ReqT, RespT> delegate() {
+                        lastStatus = getStatus();
+                        return super.delegate();
+                    }
+                }, metadata);
+    }
+
+    public String getLastStatus() {
+        return lastStatus;
+    }
+
+    private String getStatus() {
+        return "status";
+    }
+}
diff --git a/...grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeTestRestResource.java b/...grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeTestRestResource.java
@@ -0,0 +1,33 @@
+package io.quarkus.grpc.server.devmode;
+
+import javax.inject.Inject;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+/**
+ * @author Michal Szynkiewicz, [email protected]
+ *         <br>
+ *         Date: 4/28/20
+ */
+@Path("/test")
+@Consumes(MediaType.TEXT_PLAIN)
+@Produces(MediaType.TEXT_PLAIN)
+public class DevModeTestRestResource {
+
+    @Inject
+    DevModeTestInterceptor interceptor;
+
+    @GET
+    public String get() {
+        return "testresponse";
+    }
+
+    @GET
+    @Path("/interceptor-status")
+    public String getInterceptorStatus() {
+        return interceptor.getLastStatus();
+    }
+}