You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by kk...@apache.org on 2019/11/19 04:42:17 UTC
[flink] 06/15: [hotfix] Make ClusterClientFactory.isCompatibleWith
case-insensitive
This is an automated email from the ASF dual-hosted git repository.
kkloudas pushed a commit to branch executors-clean
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 7722b70041a9e2392e2592db5db9e7ab9ef2fa65
Author: Kostas Kloudas <kk...@gmail.com>
AuthorDate: Mon Nov 18 14:30:45 2019 +0100
[hotfix] Make ClusterClientFactory.isCompatibleWith case-insensitive
---
.../org/apache/flink/client/deployment/StandaloneClientFactory.java | 2 +-
.../apache/flink/client/deployment/ClusterClientServiceLoaderTest.java | 2 +-
.../src/main/java/org/apache/flink/yarn/YarnClusterClientFactory.java | 2 +-
.../test/java/org/apache/flink/yarn/YarnClusterClientFactoryTest.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
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 f71563e..647f14f 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
@@ -37,7 +37,7 @@ public class StandaloneClientFactory implements ClusterClientFactory<StandaloneC
@Override
public boolean isCompatibleWith(Configuration configuration) {
checkNotNull(configuration);
- return ID.equals(configuration.getString(DeploymentOptions.TARGET));
+ return ID.equalsIgnoreCase(configuration.getString(DeploymentOptions.TARGET));
}
@Override
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..a8e34ab 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
@@ -57,7 +57,7 @@ public class ClusterClientServiceLoaderTest {
@Test
public void testStandaloneClusterClientFactoryDiscovery() {
final Configuration config = new Configuration();
- config.setString(DeploymentOptions.TARGET, StandaloneClientFactory.ID);
+ config.setString(DeploymentOptions.TARGET, StandaloneClientFactory.ID.toUpperCase());
ClusterClientFactory<StandaloneClusterId> factory = serviceLoaderUnderTest.getClusterClientFactory(config);
assertTrue(factory instanceof StandaloneClientFactory);
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 156790f..fd23699 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
@@ -47,7 +47,7 @@ public class YarnClusterClientFactory implements ClusterClientFactory<Applicatio
@Override
public boolean isCompatibleWith(Configuration configuration) {
checkNotNull(configuration);
- return ID.equals(configuration.getString(DeploymentOptions.TARGET));
+ return ID.equalsIgnoreCase(configuration.getString(DeploymentOptions.TARGET));
}
@Override
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..6bdd920 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
@@ -37,7 +37,7 @@ public class YarnClusterClientFactoryTest {
@Test
public void testYarnClusterClientFactoryDiscovery() {
final Configuration configuration = new Configuration();
- configuration.setString(DeploymentOptions.TARGET, YarnClusterClientFactory.ID);
+ configuration.setString(DeploymentOptions.TARGET, YarnClusterClientFactory.ID.toUpperCase());
final ClusterClientServiceLoader serviceLoader = new DefaultClusterClientServiceLoader();
final ClusterClientFactory<ApplicationId> factory = serviceLoader.getClusterClientFactory(configuration);