[FLINK-3774] [shell] Forwards Flink configuration to PlanExecutor #1904
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The ScalaShellRemoteEnvironment did not properly forward the given Flink configuration to the PlanExecutor. Consequently, it was not possible to configure the Client to connect to an HA cluster. This PR corrects the forwarding.
tillrohrmann
force-pushed
the
fixScalaShell
branch
from
427fe78
to
665925e
Compare
| } | ||
|
|
||
| // ------------------------------------------------------------------------ | ||
|
|
||
| @Override | ||
| public JobExecutionResult execute(String jobName) throws Exception { | ||
| ensureExecutorCreated(); | ||
| PlanExecutor executor = getExecutor(); |
There was a problem hiding this comment.
would it make sense to move the assignment to this.executor from getExecutor() to this line? as it stands the ScalaShellRemoteEnvironment executor is never closed.
There was a problem hiding this comment.
You're right, it's bad that the PlanExecutor is not stopped after it has been used. I will fix this by checking in ScalaShellRemoteEnvironment.getExecutor whether this.executor is set. If true, then it will call this.executor.stop(). That way, there will always be at most one PlanExecutor active and the last one is stopped by the dispose call.
2 tasks
| @@ -133,26 +137,31 @@ public RemoteEnvironment(String host, int port, Configuration clientConfig, | |||
| this.port = port; | |||
| this.clientConfiguration = clientConfig == null ? new Configuration() : clientConfig; | |||
| if (jarFiles != null) { | |||
| this.jarFiles = new URL[jarFiles.length]; | |||
| this.jarFiles = new ArrayList<URL>(jarFiles.length); | |||
| this.jarFiles = new URL[jarFiles.length]; | ||
| for (int i = 0; i < jarFiles.length; i++) { | ||
| this.jarFiles = new ArrayList<>(jarFiles.length); | ||
| for(String jarFile : jarFiles) { |
|
Changes look good! +1 to merge |
|
Failing test case is unrelated. Merging. |
kl0u
pushed a commit
to kl0u/flink
that referenced
this pull request
Apr 29, 2016
The ScalaShellRemoteEnvironment did not properly forward the given Flink configuration to the PlanExecutor. Consequently, it was not possible to configure the Client to connect to an HA cluster. This PR corrects the forwarding. Fix failing FlinkILoopTest with Scala 2.11 This closes apache#1904.
StefanRRichter
pushed a commit
to StefanRRichter/flink
that referenced
this pull request
May 3, 2016
The ScalaShellRemoteEnvironment did not properly forward the given Flink configuration to the PlanExecutor. Consequently, it was not possible to configure the Client to connect to an HA cluster. This PR corrects the forwarding. Fix failing FlinkILoopTest with Scala 2.11 This closes apache#1904.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Thanks for contributing to Apache Flink. Before you open your pull request, please take the following check list into consideration.
If your changes take all of the items into account, feel free to open your pull request. For more information and/or questions please refer to the How To Contribute guide.
In addition to going through the list, please provide a meaningful description of your changes.
mvn clean verifyhas been executed successfully locally or a Travis build has passedThe ScalaShellRemoteEnvironment did not properly forward the given Flink configuration
to the PlanExecutor. Consequently, it was not possible to configure the Client to connect
to an HA cluster. This PR corrects the forwarding.