You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by gy...@apache.org on 2023/03/01 15:25:58 UTC
[flink-kubernetes-operator] branch main updated: [FLINK-31187] Fix standalone HA JobManager --host argument order
This is an automated email from the ASF dual-hosted git repository.
gyfora pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-kubernetes-operator.git
The following commit(s) were added to refs/heads/main by this push:
new 2af2c99d [FLINK-31187] Fix standalone HA JobManager --host argument order
2af2c99d is described below
commit 2af2c99d251bb84c77200f2896260bbe72a3ee6f
Author: Mate Czagany <cz...@gmail.com>
AuthorDate: Wed Feb 22 21:21:45 2023 +0100
[FLINK-31187] Fix standalone HA JobManager --host argument order
---
.../decorators/CmdStandaloneJobManagerDecorator.java | 10 +++++-----
.../decorators/CmdStandaloneJobManagerDecoratorTest.java | 10 ++++++++--
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/flink-kubernetes-standalone/src/main/java/org/apache/flink/kubernetes/operator/kubeclient/decorators/CmdStandaloneJobManagerDecorator.java b/flink-kubernetes-standalone/src/main/java/org/apache/flink/kubernetes/operator/kubeclient/decorators/CmdStandaloneJobManagerDecorator.java
index 0b54fd98..a2353e38 100644
--- a/flink-kubernetes-standalone/src/main/java/org/apache/flink/kubernetes/operator/kubeclient/decorators/CmdStandaloneJobManagerDecorator.java
+++ b/flink-kubernetes-standalone/src/main/java/org/apache/flink/kubernetes/operator/kubeclient/decorators/CmdStandaloneJobManagerDecorator.java
@@ -99,16 +99,16 @@ public class CmdStandaloneJobManagerDecorator extends AbstractKubernetesStepDeco
args.add(savepointPath);
}
- List<String> jobSpecArgs = kubernetesJobManagerParameters.getJobSpecArgs();
- if (jobSpecArgs != null) {
- args.addAll(kubernetesJobManagerParameters.getJobSpecArgs());
- }
-
if (kubernetesJobManagerParameters.isHAEnabled()) {
args.add("--host");
args.add(POD_IP_ARG);
}
+ List<String> jobSpecArgs = kubernetesJobManagerParameters.getJobSpecArgs();
+ if (jobSpecArgs != null) {
+ args.addAll(kubernetesJobManagerParameters.getJobSpecArgs());
+ }
+
return args;
}
}
diff --git a/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/decorators/CmdStandaloneJobManagerDecoratorTest.java b/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/decorators/CmdStandaloneJobManagerDecoratorTest.java
index 599893b8..f42f8a96 100644
--- a/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/decorators/CmdStandaloneJobManagerDecoratorTest.java
+++ b/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/decorators/CmdStandaloneJobManagerDecoratorTest.java
@@ -30,7 +30,10 @@ import org.apache.flink.runtime.jobgraph.SavepointConfigOptions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import java.util.List;
+
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsInAnyOrder;
/** @link CmdStandaloneJobManagerDecorator unit tests */
@@ -135,14 +138,17 @@ public class CmdStandaloneJobManagerDecoratorTest {
StandaloneKubernetesConfigOptionsInternal.ClusterMode.APPLICATION);
configuration.set(HighAvailabilityOptions.HA_MODE, "KUBERNETES");
+ configuration.set(ApplicationConfiguration.APPLICATION_ARGS, List.of("--test", "123"));
FlinkPod decoratedPod = decorator.decorateFlinkPod(new FlinkPod.Builder().build());
assertThat(
decoratedPod.getMainContainer().getArgs(),
- containsInAnyOrder(
+ contains(
CmdStandaloneJobManagerDecorator.APPLICATION_MODE_ARG,
"--host",
- CmdStandaloneJobManagerDecorator.POD_IP_ARG));
+ CmdStandaloneJobManagerDecorator.POD_IP_ARG,
+ "--test",
+ "123"));
}
}