Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[fix][fn] Enable optimized Netty direct byte buffer support for Pulsar Function runtimes #22910

Merged
merged 3 commits into from
Jun 17, 2024
Merged

[fix][fn] Enable optimized Netty direct byte buffer support for Pulsar Function runtimes #22910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62bd92b
Add required "add-opens" for Netty and Pulsar checksum calculation
lhotari Jun 14, 2024
cbd2c32
Remove obsolete definition
lhotari Jun 14, 2024
90fb369
Fix tests
lhotari Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/RuntimeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,12 +367,26 @@ public static List<String> getCmd(InstanceConfig instanceConfig,
instanceConfig.getFunctionDetails().getName(),
shardId));

// Needed for optimized Netty direct byte buffer support
args.add("-Dio.netty.tryReflectionSetAccessible=true");
// Handle possible shaded Netty versions
args.add("-Dorg.apache.pulsar.shade.io.netty.tryReflectionSetAccessible=true");
args.add("-Dio.grpc.netty.shaded.io.netty.tryReflectionSetAccessible=true");

if (SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_11)) {
// Needed for optimized Netty direct byte buffer support
args.add("--add-opens");
args.add("java.base/java.nio=ALL-UNNAMED");
args.add("--add-opens");
args.add("java.base/jdk.internal.misc=ALL-UNNAMED");
}

// Needed for netty.DnsResolverUtil on JDK9+
if (SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9)) {
// Needed for optimized checksum calculation when com.scurrilous.circe.checksum.Java9IntHash
// is used. That gets used when the native library libcirce-checksum is not available or cannot
// be loaded.
args.add("--add-opens");
args.add("java.base/sun.net=ALL-UNNAMED");
args.add("java.base/java.util.zip=ALL-UNNAMED");
}

if (instanceConfig.getAdditionalJavaRuntimeArguments() != null) {
Expand Down
36 changes: 20 additions & 16 deletions ...e/src/test/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,14 +441,14 @@ private void verifyJavaInstance(InstanceConfig config, String depsDir, boolean s
if (null != depsDir) {
extraDepsEnv = " -Dpulsar.functions.extra.dependencies.dir=" + depsDir;
classpath = classpath + ":" + depsDir + "/*";
totalArgs = 46;
portArg = 33;
metricsPortArg = 35;
totalArgs = 52;
portArg = 39;
metricsPortArg = 41;
} else {
extraDepsEnv = "";
portArg = 32;
metricsPortArg = 34;
totalArgs = 45;
portArg = 38;
metricsPortArg = 40;
totalArgs = 51;
}
if (secretsAttached) {
totalArgs += 4;
Expand Down Expand Up @@ -479,7 +479,11 @@ private void verifyJavaInstance(InstanceConfig config, String depsDir, boolean s
+ "-Dpulsar.function.log.dir=" + logDirectory + "/" + FunctionCommon.getFullyQualifiedName(config.getFunctionDetails())
+ " -Dpulsar.function.log.file=" + config.getFunctionDetails().getName() + "-$SHARD_ID"
+ " -Dio.netty.tryReflectionSetAccessible=true"
+ " --add-opens java.base/sun.net=ALL-UNNAMED"
+ " -Dorg.apache.pulsar.shade.io.netty.tryReflectionSetAccessible=true"
+ " -Dio.grpc.netty.shaded.io.netty.tryReflectionSetAccessible=true"
+ " --add-opens java.base/java.nio=ALL-UNNAMED"
+ " --add-opens java.base/jdk.internal.misc=ALL-UNNAMED"
+ " --add-opens java.base/java.util.zip=ALL-UNNAMED"
+ " -Xmx" + RESOURCES.getRam()
+ " org.apache.pulsar.functions.instance.JavaInstanceMain"
+ " --jar " + jarLocation
Expand Down Expand Up @@ -1314,7 +1318,7 @@ private void assertMetricsPortConfigured(Map<String, Object> functionRuntimeFact
.contains("--metrics_port 0"));
}
}

@Test
public void testDeleteStatefulSetWithTranslatedKubernetesLabelChars() throws Exception {
InstanceConfig config = createJavaInstanceConfig(FunctionDetails.Runtime.JAVA, false);
Expand All @@ -1323,22 +1327,22 @@ public void testDeleteStatefulSetWithTranslatedKubernetesLabelChars() throws Exc

CoreV1Api coreApi = mock(CoreV1Api.class);
AppsV1Api appsApi = mock(AppsV1Api.class);

Call successfulCall = mock(Call.class);
Response okResponse = mock(Response.class);
when(okResponse.code()).thenReturn(HttpURLConnection.HTTP_OK);
when(okResponse.isSuccessful()).thenReturn(true);
when(okResponse.message()).thenReturn("");
when(successfulCall.execute()).thenReturn(okResponse);

final String expectedFunctionNamePrefix = String.format("pf-%s-%s-%s", "c-tenant", "c-ns", "c-fn");

factory = createKubernetesRuntimeFactory(null, 10, 1.0, 1.0);
factory.setCoreClient(coreApi);
factory.setAppsClient(appsApi);

ArgumentMatcher<String> hasTranslatedFunctionName = (String t) -> t.startsWith(expectedFunctionNamePrefix);

when(appsApi.deleteNamespacedStatefulSetCall(
argThat(hasTranslatedFunctionName),
anyString(), isNull(), isNull(), anyInt(), isNull(), anyString(), any(), isNull())).thenReturn(successfulCall);
Expand All @@ -1350,14 +1354,14 @@ public void testDeleteStatefulSetWithTranslatedKubernetesLabelChars() throws Exc

V1PodList podList = mock(V1PodList.class);
when(podList.getItems()).thenReturn(Collections.emptyList());

String expectedLabels = String.format("tenant=%s,namespace=%s,name=%s", "c-tenant", "c-ns", "c-fn");

when(coreApi.listNamespacedPod(anyString(), isNull(), isNull(), isNull(), isNull(),
eq(expectedLabels), isNull(), isNull(), isNull(), isNull(), isNull())).thenReturn(podList);
KubernetesRuntime kr = factory.createContainer(config, "/test/code", "code.yml", "/test/transforms", "transform.yml", Long.MIN_VALUE);
KubernetesRuntime kr = factory.createContainer(config, "/test/code", "code.yml", "/test/transforms", "transform.yml", Long.MIN_VALUE);
kr.deleteStatefulSet();

verify(coreApi).listNamespacedPod(anyString(), isNull(), isNull(), isNull(), isNull(),
eq(expectedLabels), isNull(), isNull(), isNull(), isNull(), isNull());
}
Expand Down
16 changes: 10 additions & 6 deletions ...runtime/src/test/java/org/apache/pulsar/functions/runtime/process/ProcessRuntimeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,21 +297,21 @@ private void verifyJavaInstance(InstanceConfig config, Path depsDir, String webS
String extraDepsEnv;
int portArg;
int metricsPortArg;
int totalArgCount = 48;
int totalArgCount = 54;
if (webServiceUrl != null && config.isExposePulsarAdminClientEnabled()) {
totalArgCount += 3;
}
if (null != depsDir) {
assertEquals(args.size(), totalArgCount);
extraDepsEnv = " -Dpulsar.functions.extra.dependencies.dir=" + depsDir;
classpath = classpath + ":" + depsDir + "/*";
portArg = 31;
metricsPortArg = 33;
portArg = 37;
metricsPortArg = 39;
} else {
assertEquals(args.size(), totalArgCount-1);
extraDepsEnv = "";
portArg = 30;
metricsPortArg = 32;
portArg = 36;
metricsPortArg = 38;
}
if (webServiceUrl != null && config.isExposePulsarAdminClientEnabled()) {
portArg += 3;
Expand All @@ -328,7 +328,11 @@ private void verifyJavaInstance(InstanceConfig config, Path depsDir, String webS
+ "-Dpulsar.function.log.dir=" + logDirectory + "/functions/" + FunctionCommon.getFullyQualifiedName(config.getFunctionDetails())
+ " -Dpulsar.function.log.file=" + config.getFunctionDetails().getName() + "-" + config.getInstanceId()
+ " -Dio.netty.tryReflectionSetAccessible=true"
+ " --add-opens java.base/sun.net=ALL-UNNAMED"
+ " -Dorg.apache.pulsar.shade.io.netty.tryReflectionSetAccessible=true"
+ " -Dio.grpc.netty.shaded.io.netty.tryReflectionSetAccessible=true"
+ " --add-opens java.base/java.nio=ALL-UNNAMED"
+ " --add-opens java.base/jdk.internal.misc=ALL-UNNAMED"
+ " --add-opens java.base/java.util.zip=ALL-UNNAMED"
+ " org.apache.pulsar.functions.instance.JavaInstanceMain"
+ " --jar " + userJarFile
+ " --transform_function_jar " + userJarFile
Expand Down
Loading