Skip to content

Commit 4e9e483

Browse files
committed
Fix Flink XVR for Flink 2
1 parent a467fdc commit 4e9e483

3 files changed

Lines changed: 19 additions & 4 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"modification": 2,
2+
"modification": 3,
33
"trigger-2026-04-04": "portable_runner expand_sdf opt-in"
44
}

.github/trigger_files/beam_PostCommit_XVR_Samza.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

runners/flink/job-server/flink_job_server.gradle

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,10 +248,26 @@ def setupTask = project.tasks.register("flinkJobServerSetup", Exec) {
248248
def flinkJobServerJar = shadowJar.archivePath
249249
def flinkDir = project.project(":runners:flink").projectDir
250250
def additionalArgs = ""
251-
if (project.hasProperty('flinkConfDir'))
251+
252+
if (project.hasProperty('flinkConfDir')) {
252253
additionalArgs += " --flink-conf-dir=${project.property('flinkConfDir')}"
253-
else
254+
}
255+
else if (isFlink2) {
256+
def flinkConfDir = "$flinkDir/2.0/src/test/resources"
257+
additionalArgs += "--flink-conf-dir=${project.buildDir}/flink-conf"
258+
259+
doFirst {
260+
copy {
261+
from "$flinkDir/2.0/src/test/resources/flink-test-config.yaml"
262+
into "${project.buildDir}/flink-conf"
263+
264+
// Rename the file during the copy process
265+
rename 'flink-test-config.yaml', 'config.yaml'
266+
}
267+
}
268+
} else {
254269
additionalArgs += "--flink-conf-dir=$flinkDir/src/test/resources"
270+
}
255271

256272
executable 'sh'
257273
args '-c', "$pythonDir/scripts/run_job_server.sh stop --group_id ${project.name} && $pythonDir/scripts/run_job_server.sh start --group_id ${project.name} --job_port ${jobPort} --artifact_port ${artifactPort} --job_server_jar ${flinkJobServerJar} --additional_args \"${additionalArgs}\""

0 commit comments

Comments
 (0)