You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by mx...@apache.org on 2016/03/18 16:13:44 UTC
incubator-beam git commit: [BEAM-126] remove strict job name check
Repository: incubator-beam
Updated Branches:
refs/heads/master 5b5c0e28f -> 81d5ff5a5
[BEAM-126] remove strict job name check
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/81d5ff5a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/81d5ff5a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/81d5ff5a
Branch: refs/heads/master
Commit: 81d5ff5a561ebcf323caea5bdc4363353e5e60dd
Parents: 5b5c0e2
Author: Maximilian Michels <mx...@apache.org>
Authored: Fri Mar 18 15:46:36 2016 +0100
Committer: Maximilian Michels <mx...@apache.org>
Committed: Fri Mar 18 16:01:48 2016 +0100
----------------------------------------------------------------------
.../runners/flink/FlinkPipelineExecutionEnvironment.java | 4 ++--
.../org/apache/beam/runners/flink/FlinkPipelineRunner.java | 8 --------
2 files changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/81d5ff5a/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/FlinkPipelineExecutionEnvironment.java
----------------------------------------------------------------------
diff --git a/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/FlinkPipelineExecutionEnvironment.java b/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/FlinkPipelineExecutionEnvironment.java
index 8825ed3..6f93478 100644
--- a/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/FlinkPipelineExecutionEnvironment.java
+++ b/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/FlinkPipelineExecutionEnvironment.java
@@ -141,7 +141,7 @@ public class FlinkPipelineExecutionEnvironment {
if (this.flinkPipelineTranslator == null) {
throw new RuntimeException("FlinkPipelineTranslator not initialized.");
}
- return this.flinkStreamEnv.execute();
+ return this.flinkStreamEnv.execute(options.getJobName());
} else {
if (this.flinkBatchEnv == null) {
throw new RuntimeException("FlinkPipelineExecutionEnvironment not initialized.");
@@ -149,7 +149,7 @@ public class FlinkPipelineExecutionEnvironment {
if (this.flinkPipelineTranslator == null) {
throw new RuntimeException("FlinkPipelineTranslator not initialized.");
}
- return this.flinkBatchEnv.execute();
+ return this.flinkBatchEnv.execute(options.getJobName());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/81d5ff5a/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/FlinkPipelineRunner.java
----------------------------------------------------------------------
diff --git a/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/FlinkPipelineRunner.java b/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/FlinkPipelineRunner.java
index fe773d9..4f53e35 100644
--- a/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/FlinkPipelineRunner.java
+++ b/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/FlinkPipelineRunner.java
@@ -87,14 +87,6 @@ public class FlinkPipelineRunner extends PipelineRunner<FlinkRunnerResult> {
LOG.debug("Classpath elements: {}", flinkOptions.getFilesToStage());
}
- // Verify jobName according to service requirements.
- String jobName = flinkOptions.getJobName().toLowerCase();
- Preconditions.checkArgument(jobName.matches("[a-z]([-a-z0-9]*[a-z0-9])?"), "JobName invalid; " +
- "the name must consist of only the characters " + "[-a-z0-9], starting with a letter " +
- "and ending with a letter " + "or number");
- Preconditions.checkArgument(jobName.length() <= 40,
- "JobName too long; must be no more than 40 characters in length");
-
// Set Flink Master to [auto] if no option was specified.
if (flinkOptions.getFlinkMaster() == null) {
flinkOptions.setFlinkMaster("[auto]");