Skip to content

[BEAM-8471] Put back FlinkJobServerDriver.fromParams to fix post commit #9911

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
tweise merged 1 commit into from
Oct 29, 2019
Merged

[BEAM-8471] Put back FlinkJobServerDriver.fromParams to fix post commit #9911

Show file tree
Hide file tree
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
7 changes: 6 additions & 1 deletion runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkJobServerDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public static void main(String[] args) throws Exception {
options.as(GcsOptions.class).setGcsUploadBufferSizeBytes(1024 * 1024);
// Register standard file systems.
FileSystems.setDefaultPipelineOptions(options);
fromConfig(parseArgs(args)).run();
fromParams(args).run();
}

private static void printUsage(CmdLineParser parser) {
Expand All @@ -94,6 +94,11 @@ public static FlinkServerConfiguration parseArgs(String[] args) {
return configuration;
}

// this method is used via reflection in TestPortableRunner
public static FlinkJobServerDriver fromParams(String[] args) {
return fromConfig(parseArgs(args));
}

public static FlinkJobServerDriver fromConfig(FlinkServerConfiguration configuration) {
return create(
configuration,
Expand Down
5 changes: 2 additions & 3 deletions runners/flink/src/test/java/org/apache/beam/runners/flink/FlinkJobServerDriverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,8 @@ public void testJobServerDriver() throws Exception {
try {
System.setErr(newErr);
driver =
FlinkJobServerDriver.fromConfig(
FlinkJobServerDriver.parseArgs(
new String[] {"--job-port=0", "--artifact-port=0", "--expansion-port=0"}));
FlinkJobServerDriver.fromParams(
new String[] {"--job-port=0", "--artifact-port=0", "--expansion-port=0"});
driverThread = new Thread(driver);
driverThread.start();
boolean success = false;
Expand Down