Skip to content

Fix flink XVR tests #24228

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

Merged
damccorm merged 15 commits into from
Nov 18, 2022
Merged

Fix flink XVR tests #24228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
aaeabf3
WIP: Attempt to fix flink XVR tests
damccorm Nov 17, 2022
ad5f94b
Add some debugging info
damccorm Nov 17, 2022
e205ae1
Fix logging
damccorm Nov 17, 2022
bc09700
Fix pathing
damccorm Nov 17, 2022
0d67ef1
Disable caching for now
damccorm Nov 17, 2022
4429139
Try manually setting flink-conf-dir
damccorm Nov 17, 2022
43dc035
Try manually setting flink-conf-dir
damccorm Nov 17, 2022
ba6c872
Try setting it in run_job_server
damccorm Nov 17, 2022
fdb45e9
Clean up method of passing extra args
damccorm Nov 17, 2022
59520ac
Accept additional args in script
damccorm Nov 17, 2022
5382b02
Try more explicit route
damccorm Nov 18, 2022
3bd5333
Try more explicit route
damccorm Nov 18, 2022
d251020
Try to prove this works
damccorm Nov 18, 2022
aab44ec
A little indirection
damccorm Nov 18, 2022
049fabd
Fix pathing
damccorm Nov 18, 2022
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
10 changes: 9 additions & 1 deletion runners/flink/job-server/flink_job_server.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ runShadow {
if (project.hasProperty('sdkWorkerParallelism'))
args += ["--sdk-worker-parallelism=${project.property('sdkWorkerParallelism')}"]

logger.info('Will start flink job server with args {}', args)

// Enable remote debugging.
jvmArgs = ["-Xdebug", "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"]
if (project.hasProperty("logLevel"))
Expand Down Expand Up @@ -228,9 +230,15 @@ def setupTask = project.tasks.register("flinkJobServerSetup", Exec) {
dependsOn shadowJar
def pythonDir = project.project(":sdks:python").projectDir
def flinkJobServerJar = shadowJar.archivePath
def flinkDir = project.project(":runners:flink").projectDir
def additionalArgs = ""
if (project.hasProperty('flinkConfDir'))
additionalArgs += " --flink-conf-dir=${project.property('flinkConfDir')}"
else
additionalArgs += "--flink-conf-dir=$flinkDir/src/test/resources"

executable 'sh'
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}"
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}\""
}

def cleanupTask = project.tasks.register("flinkJobServerCleanup", Exec) {
Expand Down
7 changes: 6 additions & 1 deletion sdks/python/scripts/run_job_server.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ while [[ $# -gt 0 ]]; do
shift
shift
;;
--additional_args)
ADDITIONAL_ARGS="$2"
shift
shift
;;
start)
STARTSTOP="$1"
shift
Expand Down Expand Up @@ -97,7 +102,7 @@ case $STARTSTOP in
fi

echo "Launching job server @ $JOB_PORT ..."
java -jar $JOB_SERVER_JAR --job-port=$JOB_PORT --artifact-port=$ARTIFACT_PORT --expansion-port=0 >$TEMP_DIR/$FILE_BASE.log 2>&1 </dev/null &
java -jar $JOB_SERVER_JAR --job-port=$JOB_PORT --artifact-port=$ARTIFACT_PORT --expansion-port=0 $ADDITIONAL_ARGS >$TEMP_DIR/$FILE_BASE.log 2>&1 </dev/null &
mypid=$!
if kill -0 $mypid >/dev/null 2>&1; then
echo $mypid >> $pid
Expand Down