This is an automated email from the ASF dual-hosted git repository.
kkloudas pushed a commit to branch executors
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 0a1bc88c5dd2d96085050cbb75c46284183ec94e
Author: Kostas Kloudas <kklou...@gmail.com>
AuthorDate: Fri Nov 1 11:10:38 2019 +0100
[hotfix] Rename DeploymentOptions to ExecutionOptions
---
.../flink/client/cli/AbstractCustomCommandLine.java | 4 ++--
.../apache/flink/client/cli/ExecutionConfigAccessor.java | 10 +++++-----
.../flink/client/deployment/StandaloneClientFactory.java | 4 ++--
.../flink/client/cli/util/DummyClusterClientFactory.java | 4 ++--
.../flink/client/cli/util/DummyCustomCommandLine.java | 4 ++--
.../deployment/ClusterClientServiceLoaderTest.java | 16 ++++++++--------
.../{DeploymentOptions.java => ExecutionOptions.java} | 2 +-
.../org/apache/flink/yarn/YarnClusterClientFactory.java | 4 ++--
.../org/apache/flink/yarn/YarnClusterDescriptor.java | 4 ++--
.../org/apache/flink/yarn/cli/FlinkYarnSessionCli.java | 6 +++---
.../apache/flink/yarn/YarnClusterClientFactoryTest.java | 4 ++--
11 files changed, 31 insertions(+), 31 deletions(-)
diff --git
a/flink-clients/src/main/java/org/apache/flink/client/cli/AbstractCustomCommandLine.java
b/flink-clients/src/main/java/org/apache/flink/client/cli/AbstractCustomCommandLine.java
index f32d4f8..dbaf829 100644
---
a/flink-clients/src/main/java/org/apache/flink/client/cli/AbstractCustomCommandLine.java
+++
b/flink-clients/src/main/java/org/apache/flink/client/cli/AbstractCustomCommandLine.java
@@ -19,7 +19,7 @@
package org.apache.flink.client.cli;
import org.apache.flink.configuration.Configuration;
-import org.apache.flink.configuration.DeploymentOptions;
+import org.apache.flink.configuration.ExecutionOptions;
import org.apache.flink.configuration.HighAvailabilityOptions;
import org.apache.flink.configuration.UnmodifiableConfiguration;
import org.apache.flink.util.FlinkException;
@@ -73,7 +73,7 @@ public abstract class AbstractCustomCommandLine implements
CustomCommandLine {
@Override
public Configuration applyCommandLineOptionsToConfiguration(CommandLine
commandLine) throws FlinkException {
final Configuration resultingConfiguration = new
Configuration(configuration);
- resultingConfiguration.setString(DeploymentOptions.TARGET,
getId());
+ resultingConfiguration.setString(ExecutionOptions.TARGET,
getId());
if (commandLine.hasOption(addressOption.getOpt())) {
String addressWithPort =
commandLine.getOptionValue(addressOption.getOpt());
diff --git
a/flink-clients/src/main/java/org/apache/flink/client/cli/ExecutionConfigAccessor.java
b/flink-clients/src/main/java/org/apache/flink/client/cli/ExecutionConfigAccessor.java
index ba53414..9355038 100644
---
a/flink-clients/src/main/java/org/apache/flink/client/cli/ExecutionConfigAccessor.java
+++
b/flink-clients/src/main/java/org/apache/flink/client/cli/ExecutionConfigAccessor.java
@@ -21,7 +21,7 @@ package org.apache.flink.client.cli;
import org.apache.flink.annotation.Internal;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.CoreOptions;
-import org.apache.flink.configuration.DeploymentOptions;
+import org.apache.flink.configuration.ExecutionOptions;
import org.apache.flink.configuration.PipelineOptions;
import org.apache.flink.runtime.jobgraph.SavepointRestoreSettings;
@@ -60,8 +60,8 @@ public class ExecutionConfigAccessor {
final Configuration configuration = new Configuration();
configuration.setInteger(CoreOptions.DEFAULT_PARALLELISM,
options.getParallelism());
- configuration.setBoolean(DeploymentOptions.ATTACHED,
!options.getDetachedMode());
-
configuration.setBoolean(DeploymentOptions.SHUTDOWN_IF_ATTACHED,
options.isShutdownOnAttachedExit());
+ configuration.setBoolean(ExecutionOptions.ATTACHED,
!options.getDetachedMode());
+ configuration.setBoolean(ExecutionOptions.SHUTDOWN_IF_ATTACHED,
options.isShutdownOnAttachedExit());
parseClasspathURLsToConfig(options.getClasspaths(),
configuration);
parseJarURLToConfig(options.getJarFilePath(), configuration);
@@ -113,7 +113,7 @@ public class ExecutionConfigAccessor {
}
public boolean getDetachedMode() {
- return !configuration.getBoolean(DeploymentOptions.ATTACHED);
+ return !configuration.getBoolean(ExecutionOptions.ATTACHED);
}
public SavepointRestoreSettings getSavepointRestoreSettings() {
@@ -121,6 +121,6 @@ public class ExecutionConfigAccessor {
}
public boolean isShutdownOnAttachedExit() {
- return
configuration.getBoolean(DeploymentOptions.SHUTDOWN_IF_ATTACHED);
+ return
configuration.getBoolean(ExecutionOptions.SHUTDOWN_IF_ATTACHED);
}
}
diff --git
a/flink-clients/src/main/java/org/apache/flink/client/deployment/StandaloneClientFactory.java
b/flink-clients/src/main/java/org/apache/flink/client/deployment/StandaloneClientFactory.java
index b441a63..f9e49e6 100644
---
a/flink-clients/src/main/java/org/apache/flink/client/deployment/StandaloneClientFactory.java
+++
b/flink-clients/src/main/java/org/apache/flink/client/deployment/StandaloneClientFactory.java
@@ -19,7 +19,7 @@
package org.apache.flink.client.deployment;
import org.apache.flink.configuration.Configuration;
-import org.apache.flink.configuration.DeploymentOptions;
+import org.apache.flink.configuration.ExecutionOptions;
import javax.annotation.Nullable;
@@ -35,7 +35,7 @@ public class StandaloneClientFactory implements
ClusterClientFactory<StandaloneC
@Override
public boolean isCompatibleWith(Configuration configuration) {
checkNotNull(configuration);
- return
ID.equals(configuration.getString(DeploymentOptions.TARGET));
+ return
ID.equals(configuration.getString(ExecutionOptions.TARGET));
}
@Override
diff --git
a/flink-clients/src/test/java/org/apache/flink/client/cli/util/DummyClusterClientFactory.java
b/flink-clients/src/test/java/org/apache/flink/client/cli/util/DummyClusterClientFactory.java
index d067576..0b88968 100644
---
a/flink-clients/src/test/java/org/apache/flink/client/cli/util/DummyClusterClientFactory.java
+++
b/flink-clients/src/test/java/org/apache/flink/client/cli/util/DummyClusterClientFactory.java
@@ -23,7 +23,7 @@ import org.apache.flink.client.deployment.ClusterDescriptor;
import org.apache.flink.client.deployment.ClusterSpecification;
import org.apache.flink.client.program.ClusterClient;
import org.apache.flink.configuration.Configuration;
-import org.apache.flink.configuration.DeploymentOptions;
+import org.apache.flink.configuration.ExecutionOptions;
import javax.annotation.Nullable;
@@ -45,7 +45,7 @@ public class DummyClusterClientFactory<ClusterID> implements
ClusterClientFactor
@Override
public boolean isCompatibleWith(Configuration configuration) {
- return
ID.equals(configuration.getString(DeploymentOptions.TARGET));
+ return
ID.equals(configuration.getString(ExecutionOptions.TARGET));
}
@Override
diff --git
a/flink-clients/src/test/java/org/apache/flink/client/cli/util/DummyCustomCommandLine.java
b/flink-clients/src/test/java/org/apache/flink/client/cli/util/DummyCustomCommandLine.java
index 4a94656..df44594 100644
---
a/flink-clients/src/test/java/org/apache/flink/client/cli/util/DummyCustomCommandLine.java
+++
b/flink-clients/src/test/java/org/apache/flink/client/cli/util/DummyCustomCommandLine.java
@@ -20,7 +20,7 @@ package org.apache.flink.client.cli.util;
import org.apache.flink.client.cli.CustomCommandLine;
import org.apache.flink.configuration.Configuration;
-import org.apache.flink.configuration.DeploymentOptions;
+import org.apache.flink.configuration.ExecutionOptions;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Options;
@@ -53,7 +53,7 @@ public class DummyCustomCommandLine implements
CustomCommandLine {
@Override
public Configuration applyCommandLineOptionsToConfiguration(CommandLine
commandLine) {
final Configuration configuration = new Configuration();
- configuration.setString(DeploymentOptions.TARGET,
DummyClusterClientFactory.ID);
+ configuration.setString(ExecutionOptions.TARGET,
DummyClusterClientFactory.ID);
return configuration;
}
}
diff --git
a/flink-clients/src/test/java/org/apache/flink/client/deployment/ClusterClientServiceLoaderTest.java
b/flink-clients/src/test/java/org/apache/flink/client/deployment/ClusterClientServiceLoaderTest.java
index a084021..489573d 100644
---
a/flink-clients/src/test/java/org/apache/flink/client/deployment/ClusterClientServiceLoaderTest.java
+++
b/flink-clients/src/test/java/org/apache/flink/client/deployment/ClusterClientServiceLoaderTest.java
@@ -19,7 +19,7 @@
package org.apache.flink.client.deployment;
import org.apache.flink.configuration.Configuration;
-import org.apache.flink.configuration.DeploymentOptions;
+import org.apache.flink.configuration.ExecutionOptions;
import org.junit.Before;
import org.junit.Test;
@@ -57,7 +57,7 @@ public class ClusterClientServiceLoaderTest {
@Test
public void testStandaloneClusterClientFactoryDiscovery() {
final Configuration config = new Configuration();
- config.setString(DeploymentOptions.TARGET,
StandaloneClientFactory.ID);
+ config.setString(ExecutionOptions.TARGET,
StandaloneClientFactory.ID);
ClusterClientFactory<StandaloneClusterId> factory =
serviceLoaderUnderTest.getClusterClientFactory(config);
assertTrue(factory instanceof StandaloneClientFactory);
@@ -66,7 +66,7 @@ public class ClusterClientServiceLoaderTest {
@Test
public void testFactoryDiscovery() {
final Configuration config = new Configuration();
- config.setString(DeploymentOptions.TARGET, VALID_TARGET);
+ config.setString(ExecutionOptions.TARGET, VALID_TARGET);
final ClusterClientFactory<Integer> factory =
serviceLoaderUnderTest.getClusterClientFactory(config);
assertNotNull(factory);
@@ -78,7 +78,7 @@ public class ClusterClientServiceLoaderTest {
@Test(expected = IllegalStateException.class)
public void testMoreThanOneCompatibleFactoriesException() {
final Configuration config = new Configuration();
- config.setString(DeploymentOptions.TARGET, AMBIGUOUS_TARGET);
+ config.setString(ExecutionOptions.TARGET, AMBIGUOUS_TARGET);
serviceLoaderUnderTest.getClusterClientFactory(config);
fail();
@@ -87,7 +87,7 @@ public class ClusterClientServiceLoaderTest {
@Test
public void testNoFactoriesFound() {
final Configuration config = new Configuration();
- config.setString(DeploymentOptions.TARGET, NON_EXISTING_TARGET);
+ config.setString(ExecutionOptions.TARGET, NON_EXISTING_TARGET);
final ClusterClientFactory<Integer> factory =
serviceLoaderUnderTest.getClusterClientFactory(config);
assertNull(factory);
@@ -102,7 +102,7 @@ public class ClusterClientServiceLoaderTest {
@Override
public boolean isCompatibleWith(Configuration configuration) {
- return
configuration.getString(DeploymentOptions.TARGET).equals(VALID_TARGET);
+ return
configuration.getString(ExecutionOptions.TARGET).equals(VALID_TARGET);
}
@Nullable
@@ -121,7 +121,7 @@ public class ClusterClientServiceLoaderTest {
@Override
public boolean isCompatibleWith(Configuration configuration) {
- return
configuration.getString(DeploymentOptions.TARGET).equals(AMBIGUOUS_TARGET);
+ return
configuration.getString(ExecutionOptions.TARGET).equals(AMBIGUOUS_TARGET);
}
}
@@ -134,7 +134,7 @@ public class ClusterClientServiceLoaderTest {
@Override
public boolean isCompatibleWith(Configuration configuration) {
- return
configuration.getString(DeploymentOptions.TARGET).equals(AMBIGUOUS_TARGET);
+ return
configuration.getString(ExecutionOptions.TARGET).equals(AMBIGUOUS_TARGET);
}
}
diff --git
a/flink-core/src/main/java/org/apache/flink/configuration/DeploymentOptions.java
b/flink-core/src/main/java/org/apache/flink/configuration/ExecutionOptions.java
similarity index 98%
rename from
flink-core/src/main/java/org/apache/flink/configuration/DeploymentOptions.java
rename to
flink-core/src/main/java/org/apache/flink/configuration/ExecutionOptions.java
index 9ffa93c..7d8bcee 100644
---
a/flink-core/src/main/java/org/apache/flink/configuration/DeploymentOptions.java
+++
b/flink-core/src/main/java/org/apache/flink/configuration/ExecutionOptions.java
@@ -26,7 +26,7 @@ import static
org.apache.flink.configuration.ConfigOptions.key;
* The {@link ConfigOption configuration options} relevant for all Executors.
*/
@PublicEvolving
-public class DeploymentOptions {
+public class ExecutionOptions {
public static final ConfigOption<String> TARGET =
key("execution.target")
diff --git
a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnClusterClientFactory.java
b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnClusterClientFactory.java
index aa138a7..f00e5c2 100644
---
a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnClusterClientFactory.java
+++
b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnClusterClientFactory.java
@@ -22,7 +22,7 @@ import
org.apache.flink.client.deployment.ClusterClientFactory;
import org.apache.flink.client.deployment.ClusterSpecification;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.ConfigurationUtils;
-import org.apache.flink.configuration.DeploymentOptions;
+import org.apache.flink.configuration.ExecutionOptions;
import org.apache.flink.configuration.TaskManagerOptions;
import org.apache.flink.yarn.configuration.YarnConfigOptions;
@@ -45,7 +45,7 @@ public class YarnClusterClientFactory implements
ClusterClientFactory<Applicatio
@Override
public boolean isCompatibleWith(Configuration configuration) {
checkNotNull(configuration);
- return
ID.equals(configuration.getString(DeploymentOptions.TARGET));
+ return
ID.equals(configuration.getString(ExecutionOptions.TARGET));
}
@Override
diff --git
a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java
b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java
index ae59d92..1d60249 100644
--- a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java
+++ b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java
@@ -29,7 +29,7 @@ import org.apache.flink.client.program.rest.RestClusterClient;
import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.CoreOptions;
-import org.apache.flink.configuration.DeploymentOptions;
+import org.apache.flink.configuration.ExecutionOptions;
import org.apache.flink.configuration.HighAvailabilityOptions;
import org.apache.flink.configuration.IllegalConfigurationException;
import org.apache.flink.configuration.JobManagerOptions;
@@ -171,7 +171,7 @@ public class YarnClusterDescriptor implements
ClusterDescriptor<ApplicationId> {
getLocalFlinkDistPath(flinkConfiguration).ifPresent(this::setLocalJarPath);
decodeDirsToShipToCluster(flinkConfiguration).ifPresent(this::addShipFiles);
- this.detached =
!flinkConfiguration.getBoolean(DeploymentOptions.ATTACHED);
+ this.detached =
!flinkConfiguration.getBoolean(ExecutionOptions.ATTACHED);
this.yarnQueue =
flinkConfiguration.getString(YarnConfigOptions.APPLICATION_QUEUE);
this.dynamicPropertiesEncoded =
flinkConfiguration.getString(YarnConfigOptionsInternal.DYNAMIC_PROPERTIES);
this.customName =
flinkConfiguration.getString(YarnConfigOptions.APPLICATION_NAME);
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 970fdeb..4f1f762 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
@@ -29,7 +29,7 @@ import
org.apache.flink.client.deployment.DefaultClusterClientServiceLoader;
import org.apache.flink.client.program.ClusterClient;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.CoreOptions;
-import org.apache.flink.configuration.DeploymentOptions;
+import org.apache.flink.configuration.ExecutionOptions;
import org.apache.flink.configuration.GlobalConfiguration;
import org.apache.flink.configuration.JobManagerOptions;
import org.apache.flink.configuration.MemorySize;
@@ -345,7 +345,7 @@ public class FlinkYarnSessionCli extends
AbstractCustomCommandLine {
public Configuration applyCommandLineOptionsToConfiguration(CommandLine
commandLine) throws FlinkException {
// we ignore the addressOption because it can only contain
"yarn-cluster"
final Configuration effectiveConfiguration = new
Configuration(configuration);
- effectiveConfiguration.setString(DeploymentOptions.TARGET,
getId());
+ effectiveConfiguration.setString(ExecutionOptions.TARGET,
getId());
applyDescriptorOptionToConfig(commandLine,
effectiveConfiguration);
@@ -418,7 +418,7 @@ public class FlinkYarnSessionCli extends
AbstractCustomCommandLine {
configuration.setString(YarnConfigOptionsInternal.DYNAMIC_PROPERTIES,
dynamicPropertiesEncoded);
final boolean detached =
commandLine.hasOption(YARN_DETACHED_OPTION.getOpt()) ||
commandLine.hasOption(DETACHED_OPTION.getOpt());
- configuration.setBoolean(DeploymentOptions.ATTACHED, !detached);
+ configuration.setBoolean(ExecutionOptions.ATTACHED, !detached);
if (commandLine.hasOption(name.getOpt())) {
final String appName =
commandLine.getOptionValue(name.getOpt());
diff --git
a/flink-yarn/src/test/java/org/apache/flink/yarn/YarnClusterClientFactoryTest.java
b/flink-yarn/src/test/java/org/apache/flink/yarn/YarnClusterClientFactoryTest.java
index 931313a..e735da0 100644
---
a/flink-yarn/src/test/java/org/apache/flink/yarn/YarnClusterClientFactoryTest.java
+++
b/flink-yarn/src/test/java/org/apache/flink/yarn/YarnClusterClientFactoryTest.java
@@ -22,7 +22,7 @@ import
org.apache.flink.client.deployment.ClusterClientFactory;
import org.apache.flink.client.deployment.ClusterClientServiceLoader;
import org.apache.flink.client.deployment.DefaultClusterClientServiceLoader;
import org.apache.flink.configuration.Configuration;
-import org.apache.flink.configuration.DeploymentOptions;
+import org.apache.flink.configuration.ExecutionOptions;
import org.apache.hadoop.yarn.api.records.ApplicationId;
import org.junit.Test;
@@ -37,7 +37,7 @@ public class YarnClusterClientFactoryTest {
@Test
public void testYarnClusterClientFactoryDiscovery() {
final Configuration configuration = new Configuration();
- configuration.setString(DeploymentOptions.TARGET,
YarnClusterClientFactory.ID);
+ configuration.setString(ExecutionOptions.TARGET,
YarnClusterClientFactory.ID);
final ClusterClientServiceLoader serviceLoader = new
DefaultClusterClientServiceLoader();
final ClusterClientFactory<ApplicationId> factory =
serviceLoader.getClusterClientFactory(configuration);
