From 729276a2b11b99a0c4f0a8ae5629e02c1d29be24 Mon Sep 17 00:00:00 2001 From: Walter Oggioni Date: Sat, 8 Mar 2025 14:35:50 +0800 Subject: [PATCH] fixed native image configuration --- gradle.properties | 2 +- rbcs-cli/native-image/reflect-config.json | 28 +++++++++---------- .../graal/GraalNativeImageConfiguration.kt | 14 ++++++---- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/gradle.properties b/gradle.properties index d97a028..b02e71a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.caching=true rbcs.version = 0.2.0 -lys.version = 2025.03.03 +lys.version = 2025.03.08 gitea.maven.url = https://gitea.woggioni.net/api/packages/woggioni/maven docker.registry.url=gitea.woggioni.net diff --git a/rbcs-cli/native-image/reflect-config.json b/rbcs-cli/native-image/reflect-config.json index bafe953..b819705 100644 --- a/rbcs-cli/native-image/reflect-config.json +++ b/rbcs-cli/native-image/reflect-config.json @@ -487,6 +487,10 @@ "name":"jdk.internal.misc.Unsafe", "methods":[{"name":"getUnsafe","parameterTypes":[] }] }, +{ + "name":"net.woggioni.rbcs.api.CacheHandler", + "methods":[{"name":"channelRead","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Object"] }] +}, { "name":"net.woggioni.rbcs.cli.RemoteBuildCacheServerCli", "allDeclaredFields":true, @@ -552,11 +556,7 @@ }, { "name":"net.woggioni.rbcs.client.RemoteBuildCacheClient$sendRequest$1$operationComplete$responseHandler$1", - "methods":[{"name":"channelInactive","parameterTypes":["io.netty.channel.ChannelHandlerContext"] }, {"name":"exceptionCaught","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Throwable"] }] -}, -{ - "name":"net.woggioni.rbcs.client.RemoteBuildCacheClient$sendRequest$1$operationComplete$timeoutHandler$1", - "methods":[{"name":"userEventTriggered","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Object"] }] + "methods":[{"name":"channelInactive","parameterTypes":["io.netty.channel.ChannelHandlerContext"] }, {"name":"exceptionCaught","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Throwable"] }, {"name":"userEventTriggered","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Object"] }] }, { "name":"net.woggioni.rbcs.server.RemoteBuildCacheServer$HttpChunkContentCompressor", @@ -588,17 +588,13 @@ "name":"net.woggioni.rbcs.server.exception.ExceptionHandler", "methods":[{"name":"exceptionCaught","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Throwable"] }] }, -{ - "name":"net.woggioni.rbcs.server.handler.CacheContentHandler", - "methods":[{"name":"exceptionCaught","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Throwable"] }] -}, { "name":"net.woggioni.rbcs.server.handler.MaxRequestSizeHandler", "methods":[{"name":"channelRead","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Object"] }] }, { "name":"net.woggioni.rbcs.server.handler.ServerHandler", - "methods":[{"name":"channelRead","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Object"] }, {"name":"exceptionCaught","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Throwable"] }, {"name":"write","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Object","io.netty.channel.ChannelPromise"] }] + "methods":[{"name":"channelRead","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Object"] }, {"name":"channelReadComplete","parameterTypes":["io.netty.channel.ChannelHandlerContext"] }, {"name":"exceptionCaught","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Throwable"] }, {"name":"write","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Object","io.netty.channel.ChannelPromise"] }] }, { "name":"net.woggioni.rbcs.server.handler.TraceHandler", @@ -641,10 +637,6 @@ "name":"sun.security.provider.DSA$SHA256withDSA", "methods":[{"name":"","parameterTypes":[] }] }, -{ - "name":"sun.security.provider.JavaKeyStore$JKS", - "methods":[{"name":"","parameterTypes":[] }] -}, { "name":"sun.security.provider.MD5", "methods":[{"name":"","parameterTypes":[] }] @@ -733,6 +725,14 @@ "name":"sun.security.x509.CertificatePoliciesExtension", "methods":[{"name":"","parameterTypes":["java.lang.Boolean","java.lang.Object"] }] }, +{ + "name":"sun.security.x509.ExtendedKeyUsageExtension", + "methods":[{"name":"","parameterTypes":["java.lang.Boolean","java.lang.Object"] }] +}, +{ + "name":"sun.security.x509.IssuerAlternativeNameExtension", + "methods":[{"name":"","parameterTypes":["java.lang.Boolean","java.lang.Object"] }] +}, { "name":"sun.security.x509.KeyUsageExtension", "methods":[{"name":"","parameterTypes":["java.lang.Boolean","java.lang.Object"] }] diff --git a/rbcs-cli/src/configureNativeImage/kotlin/net/woggioni/rbcs/cli/graal/GraalNativeImageConfiguration.kt b/rbcs-cli/src/configureNativeImage/kotlin/net/woggioni/rbcs/cli/graal/GraalNativeImageConfiguration.kt index 6027e20..6fdb607 100644 --- a/rbcs-cli/src/configureNativeImage/kotlin/net/woggioni/rbcs/cli/graal/GraalNativeImageConfiguration.kt +++ b/rbcs-cli/src/configureNativeImage/kotlin/net/woggioni/rbcs/cli/graal/GraalNativeImageConfiguration.kt @@ -32,7 +32,7 @@ object GraalNativeImageConfiguration { @JvmStatic fun main(vararg args : String) { - val serverURL = URI.create("file:conf/rbcs-client.xml").toURL() + val serverURL = URI.create("file:conf/rbcs-server.xml").toURL() val serverDoc = serverURL.openStream().use { Xml.parseXml(serverURL, it) } @@ -71,7 +71,6 @@ object GraalNativeImageConfiguration { compressionLevel = Deflater.DEFAULT_COMPRESSION, compressionEnabled = false, maxSize = 0x1000000, - chunkSize = 0x1000 ), FileSystemCacheConfiguration( Path.of(System.getProperty("java.io.tmpdir")).resolve("rbcs"), @@ -79,7 +78,6 @@ object GraalNativeImageConfiguration { digestAlgorithm = "MD5", compressionLevel = Deflater.DEFAULT_COMPRESSION, compressionEnabled = false, - chunkSize = 0x1000 ), MemcacheCacheConfiguration( listOf(MemcacheCacheConfiguration.Server( @@ -91,7 +89,6 @@ object GraalNativeImageConfiguration { "MD5", null, 1, - 0x1000 ) ) @@ -107,6 +104,7 @@ object GraalNativeImageConfiguration { Duration.ofSeconds(15), Duration.ofSeconds(15), 0x10000, + 0x1000 ), users.asSequence().map { it.name to it }.toMap(), sequenceOf(writersGroup, readersGroup).map { it.name to it }.toMap(), @@ -127,7 +125,6 @@ object GraalNativeImageConfiguration { "MD5", null, 1, - 0x1000 ) val serverHandle = RemoteBuildCacheServer(serverConfiguration).run() @@ -135,7 +132,12 @@ object GraalNativeImageConfiguration { val clientProfile = ClientConfiguration.Profile( URI.create("http://127.0.0.1:$serverPort/"), - null, + ClientConfiguration.Connection( + Duration.ofSeconds(5), + Duration.ofSeconds(5), + Duration.ofSeconds(7), + true, + ), ClientConfiguration.Authentication.BasicAuthenticationCredentials("user3", PASSWORD), Duration.ofSeconds(3), 10,