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

Support use staged harness for Dataflow runner v2 job #33508

Merged
merged 1 commit into from
Jan 10, 2025
Merged

Support use staged harness for Dataflow runner v2 job #33508

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 13 additions & 3 deletions sdks/java/container/boot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,21 +134,31 @@ func main() {
}

const jarsDir = "/opt/apache/beam/jars"
const javaHarnessJar = "beam-sdks-java-harness.jar"
cp := []string{
filepath.Join(jarsDir, "slf4j-api.jar"),
filepath.Join(jarsDir, "slf4j-jdk14.jar"),
filepath.Join(jarsDir, "jcl-over-slf4j.jar"),
filepath.Join(jarsDir, "log4j-over-slf4j.jar"),
filepath.Join(jarsDir, "log4j-to-slf4j.jar"),
filepath.Join(jarsDir, "beam-sdks-java-harness.jar"),
filepath.Join(jarsDir, javaHarnessJar),
}

var hasWorkerExperiment = strings.Contains(options, "use_staged_dataflow_worker_jar")
for _, a := range artifacts {
name, _ := artifact.MustExtractFilePayload(a)
if hasWorkerExperiment {
if strings.HasPrefix(name, "beam-runners-google-cloud-dataflow-java-fn-api-worker") {
continue
if strings.HasPrefix(name, "beam-sdks-java-harness") {
// Remove system "beam-sdks-java-harness.jar". User-provided jar will be
// added to classpath as a normal user jar further below.
for i, cl := range cp {
if !strings.HasSuffix(cl, javaHarnessJar) {
continue
}
logger.Printf(ctx, "Using staged java harness: %v", name)
cp = append(cp[:i], cp[i+1:]...)
break
}
}
if name == "dataflow-worker.jar" {
continue
Expand Down
Loading