quarkusio#2663 Making sure the right RocksDB native binary is added w…

…hen doing in-container build; Also ensuring KafkaProcessor runs when using kafka-streams extension.
gunnarmorling · Jun 13, 2019 · c405935 · c405935
1 parent e6b47d6
commit c405935
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/extensions/kafka-streams/deployment/pom.xml b/extensions/kafka-streams/deployment/pom.xml
@@ -34,6 +34,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-core-deployment</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kafka-client-deployment</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-kafka-streams</artifactId>

diff --git a/...s/deployment/src/main/java/io/quarkus/kafka/streams/deployment/KafkaStreamsProcessor.java b/...s/deployment/src/main/java/io/quarkus/kafka/streams/deployment/KafkaStreamsProcessor.java
@@ -56,7 +56,14 @@ void build(RecorderContext recorder,
         reflectiveClasses.produce(new ReflectiveClassBuildItem(true, false, false, ByteArraySerde.class));
         reflectiveClasses.produce(new ReflectiveClassBuildItem(true, false, false, FailOnInvalidTimestamp.class));
 
-        nativeLibs.produce(new SubstrateResourceBuildItem(Environment.getJniLibraryFileName("rocksdb")));
+        // for RocksDB, either add linux64 native lib when targeting containers
+        if (isContainerBuild()) {
+            nativeLibs.produce(new SubstrateResourceBuildItem("librocksdbjni-linux64.so"));
+        }
+        // otherwise the native lib of the platform this build runs on
+        else {
+            nativeLibs.produce(new SubstrateResourceBuildItem(Environment.getJniLibraryFileName("rocksdb")));
+        }
 
         // re-initializing RocksDB to enable load of native libs
         reinitialized.produce(new RuntimeReinitializedClassBuildItem("org.rocksdb.RocksDB"));
@@ -69,4 +76,22 @@ void build(KafkaStreamsTemplate template) {
         // static initializers which already ran during build
         template.loadRocksDb();
     }
+
+    private boolean isContainerBuild() {
+        String containerRuntime = System.getProperty("native-image.container-runtime");
+
+        if (containerRuntime != null) {
+            containerRuntime = containerRuntime.trim().toLowerCase();
+            return containerRuntime.equals("docker") || containerRuntime.equals("podman");
+        }
+
+        String dockerBuild = System.getProperty("native-image.docker-build");
+
+        if (dockerBuild != null) {
+            dockerBuild = dockerBuild.trim().toLowerCase();
+            return !"false".equals(dockerBuild);
+        }
+
+        return false;
+    }
 }