[
https://issues.apache.org/jira/browse/FLINK-10057?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16655047#comment-16655047
]
ASF GitHub Bot commented on FLINK-10057:
----------------------------------------
asfgit closed pull request #6491: [FLINK-10057] Update FlinkYarnSessionCli.java
URL: https://github.com/apache/flink/pull/6491
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java
b/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java
index c0180a83be1..31cdbad922c 100644
---
a/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java
+++
b/flink-yarn/src/main/java/org/apache/flink/yarn/cli/FlinkYarnSessionCli.java
@@ -530,12 +530,14 @@ protected Configuration
applyCommandLineOptionsToConfiguration(CommandLine comma
private boolean isYarnPropertiesFileMode(CommandLine commandLine) {
boolean canApplyYarnProperties =
!commandLine.hasOption(addressOption.getOpt());
- for (Option option : commandLine.getOptions()) {
- if (allOptions.hasOption(option.getOpt())) {
- if (!isDetachedOption(option)) {
- // don't resume from properties file if
yarn options have been specified
- canApplyYarnProperties = false;
- break;
+ if (canApplyYarnProperties) {
+ for (Option option : commandLine.getOptions()) {
+ if (allOptions.hasOption(option.getOpt())) {
+ if (!isDetachedOption(option)) {
+ // don't resume from properties
file if yarn options have been specified
+ canApplyYarnProperties = false;
+ break;
+ }
}
}
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> optimalize
> org.apache.flink.yarn.cli.FlinkYarnSessionCli.isYarnPropertiesFileMode
> ---------------------------------------------------------------------------------
>
> Key: FLINK-10057
> URL: https://issues.apache.org/jira/browse/FLINK-10057
> Project: Flink
> Issue Type: Improvement
> Components: Client
> Affects Versions: 1.5.2
> Reporter: liuzq
> Priority: Major
> Labels: pull-request-available
> Fix For: 1.7.0
>
>
> --------------in function :
> org.apache.flink.yarn.cli.FlinkYarnSessionCli.isYarnPropertiesFileMode
>
> private boolean isYarnPropertiesFileMode(CommandLine commandLine) {
> boolean canApplyYarnProperties =
> !commandLine.hasOption(addressOption.getOpt());
> *//if canApplyYarnProperties is false,return quickly !*
> *//this code is added by me*
> *if(false==canApplyYarnProperties){*
> *return canApplyYarnProperties;*
> *}*
> for (Option option : commandLine.getOptions()) {
> if (allOptions.hasOption(option.getOpt())) {
> if (!isDetachedOption(option)) {
> ...
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
