-
Notifications
You must be signed in to change notification settings - Fork 119
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: Configure unix socket library for Graalvm (#1961)
This is a fix for the graalvm configuration issues related to the jnr.unixsocket library. The proxy classes are now being properly configured for reflection and dynamic proxy. Native library files that are usually loaded as resources from jffi-1.3.13-native.jar are included in the image. Fixes #1940
- Loading branch information
Showing
9 changed files
with
311 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
...age/com.google.cloud.sql/cloud-sql-jdbc-socket-factory-parent/jni-unix-socket-config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| [ | ||
| { | ||
| "name": "jnr.ffi.provider.LoadedLibrary" | ||
| }, | ||
| { | ||
| "name": "jnr.unixsocket.Native$LibC", | ||
| "interfaces": [ | ||
| "jnr.unixsocket.Native$LibC", | ||
| "jnr.ffi.provider.LoadedLibrary" | ||
| ] | ||
| }, | ||
| { | ||
| "name": "jnr.enxio.channels.Native$LibC", | ||
| "interfaces": [ | ||
| "jnr.enxio.channels.Native$LibC", | ||
| "jnr.ffi.provider.LoadedLibrary" | ||
| ] | ||
| } | ||
| ] |
5 changes: 5 additions & 0 deletions
5
...e-image/com.google.cloud.sql/cloud-sql-jdbc-socket-factory-parent/native-image.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,8 @@ | ||
| Args =\ | ||
| -H:+UnlockExperimentalVMOptions \ | ||
| -H:+AddAllCharsets \ | ||
| -H:+BuildReport \ | ||
| -H:ReflectionConfigurationResources=META-INF/native-image/com.google.cloud.sql/cloud-sql-jdbc-socket-factory-parent/jni-unix-socket-config.json \ | ||
| -H:ResourceConfigurationResources=META-INF/native-image/com.google.cloud.sql/cloud-sql-jdbc-socket-factory-parent/resource-config.json \ | ||
| -H:DynamicProxyConfigurationResources=META-INF/native-image/com.google.cloud.sql/cloud-sql-jdbc-socket-factory-parent/proxy-config.json \ | ||
| --features=com.google.cloud.sql.nativeimage.CloudSqlFeature |
22 changes: 22 additions & 0 deletions
22
.../native-image/com.google.cloud.sql/cloud-sql-jdbc-socket-factory-parent/proxy-config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| [ | ||
| { | ||
| "condition": { | ||
| "typeReachable": "jnr.unixsocket.Native$LibC" | ||
| }, | ||
| "name": "jnr.unixsocket.Native$LibC", | ||
| "interfaces": [ | ||
| "jnr.unixsocket.Native$LibC", | ||
| "jnr.ffi.provider.LoadedLibrary" | ||
| ] | ||
| }, | ||
| { | ||
| "condition": { | ||
| "typeReachable":"jnr.enxio.channels.Native$LibC" | ||
| }, | ||
| "name": "jnr.enxio.channels.Native$LibC", | ||
| "interfaces": [ | ||
| "jnr.enxio.channels.Native$LibC", | ||
| "jnr.ffi.provider.LoadedLibrary" | ||
| ] | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
133 changes: 133 additions & 0 deletions
133
core/src/test/java/com/google/cloud/sql/core/FakeUnixSocketServer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| /* | ||
| * Copyright 2024 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.cloud.sql.core; | ||
|
|
||
| import java.io.IOException; | ||
| import java.nio.ByteBuffer; | ||
| import java.nio.channels.SelectionKey; | ||
| import java.nio.channels.Selector; | ||
| import java.util.Iterator; | ||
| import java.util.Set; | ||
| import java.util.concurrent.atomic.AtomicBoolean; | ||
| import jnr.enxio.channels.NativeSelectorProvider; | ||
| import jnr.unixsocket.UnixServerSocketChannel; | ||
| import jnr.unixsocket.UnixSocketAddress; | ||
| import jnr.unixsocket.UnixSocketChannel; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| /** | ||
| * This is a simple echo unix socket server adapted from the JNR socket project. | ||
| * https://github.com/jnr/jnr-unixsocket/blob/master/src/test/java/jnr/unixsocket/example/UnixServer.java | ||
| */ | ||
| class FakeUnixSocketServer { | ||
| private static Logger log = LoggerFactory.getLogger(FakeUnixSocketServer.class); | ||
| private final String path; | ||
| private final UnixSocketAddress address; | ||
| private UnixServerSocketChannel channel; | ||
| private final AtomicBoolean closed = new AtomicBoolean(); | ||
|
|
||
| FakeUnixSocketServer(String path) { | ||
| this.path = path; | ||
| this.address = new UnixSocketAddress(path); | ||
| } | ||
|
|
||
| public synchronized void close() throws IOException { | ||
| if (!this.closed.get()) { | ||
| this.closed.set(true); | ||
| } | ||
| if (this.channel != null) { | ||
| channel.close(); | ||
| this.channel = null; | ||
| } | ||
| } | ||
|
|
||
| public synchronized void start() throws IOException { | ||
| java.io.File path = new java.io.File(this.path); | ||
| path.deleteOnExit(); | ||
|
|
||
| this.channel = UnixServerSocketChannel.open(); | ||
| channel.configureBlocking(false); | ||
| channel.socket().bind(address); | ||
|
|
||
| Thread t = new Thread(this::run); | ||
| t.start(); | ||
| } | ||
|
|
||
| public void run() { | ||
| log.info("Starting fake unix socket server at path " + this.path); | ||
| try { | ||
| Selector sel = NativeSelectorProvider.getInstance().openSelector(); | ||
| channel.register(sel, SelectionKey.OP_ACCEPT, new ServerActor(channel)); | ||
|
|
||
| log.info("Waiting for connections path " + this.path); | ||
| while (!this.closed.get()) { | ||
| if (sel.select() > 0) { | ||
| Set<SelectionKey> keys = sel.selectedKeys(); | ||
| Iterator<SelectionKey> iterator = keys.iterator(); | ||
| boolean running = false; | ||
| boolean cancelled = false; | ||
| while (iterator.hasNext()) { | ||
| SelectionKey k = iterator.next(); | ||
| Actor a = (Actor) k.attachment(); | ||
| if (a.rxready()) { | ||
| running = true; | ||
| } else { | ||
| k.cancel(); | ||
| cancelled = true; | ||
| } | ||
| iterator.remove(); | ||
| } | ||
| if (!running && cancelled) { | ||
| log.info("No Actors Running any more"); | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| } catch (IOException ex) { | ||
| log.info("IOException: waiting for sockets", ex); | ||
| } | ||
| log.info("UnixServer EXIT"); | ||
| } | ||
|
|
||
| static interface Actor { | ||
| public boolean rxready(); | ||
| } | ||
|
|
||
| static final class ServerActor implements Actor { | ||
| private final UnixServerSocketChannel channel; | ||
|
|
||
| public ServerActor(UnixServerSocketChannel channel) { | ||
| this.channel = channel; | ||
| } | ||
|
|
||
| @Override | ||
| public final boolean rxready() { | ||
| log.info("Handling unix socket connect."); | ||
| try { | ||
| UnixSocketChannel client = channel.accept(); | ||
| client.configureBlocking(false); | ||
| ByteBuffer response = ByteBuffer.wrap("HELLO\n".getBytes("UTF-8")); | ||
| client.write(response); | ||
| log.info("Handling unix socket done."); | ||
| return true; | ||
| } catch (IOException ex) { | ||
| return false; | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters