You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by be...@apache.org on 2023/10/11 07:17:44 UTC
[incubator-streampark] branch dev updated: [ISSUE-3109][Improve] Improve streampark-testcontainer module based on [3.2 Constant Variables Definition] (#3234)
This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new 762923a41 [ISSUE-3109][Improve] Improve streampark-testcontainer module based on [3.2 Constant Variables Definition] (#3234)
762923a41 is described below
commit 762923a4106c6e485f0f6277baa501e43d7f15f9
Author: Yuepeng Pan <fl...@126.com>
AuthorDate: Wed Oct 11 02:17:37 2023 -0500
[ISSUE-3109][Improve] Improve streampark-testcontainer module based on [3.2 Constant Variables Definition] (#3234)
* [ISSUE-3109][Improve] Improve streampark-testcontainer module based on [3.2 Constant Variables Definition]
* Update based on review comments
---
.../streampark/testcontainer/flink/FlinkContainer.java | 5 ++---
.../flink/FlinkStandaloneSessionCluster.java | 16 ++++++----------
.../streampark/testcontainer/hadoop/HadoopContainer.java | 2 +-
3 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/streampark-tests/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/flink/FlinkContainer.java b/streampark-tests/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/flink/FlinkContainer.java
index 822f87b3b..074b5f04e 100644
--- a/streampark-tests/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/flink/FlinkContainer.java
+++ b/streampark-tests/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/flink/FlinkContainer.java
@@ -37,9 +37,8 @@ import static org.apache.streampark.testcontainer.flink.FlinkComponent.TASKMANAG
*/
class FlinkContainer extends GenericContainer<FlinkContainer> {
- public static final AtomicInteger TM_INDEX_SUFFIX = new AtomicInteger(0);
-
- public static final String FLINK_PROPS_KEY = "FLINK_PROPERTIES";
+ private static final String FLINK_PROPS_KEY = "FLINK_PROPERTIES";
+ private static final AtomicInteger TM_INDEX_SUFFIX = new AtomicInteger(0);
private final @Nonnull FlinkComponent component;
diff --git a/streampark-tests/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/flink/FlinkStandaloneSessionCluster.java b/streampark-tests/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/flink/FlinkStandaloneSessionCluster.java
index db5613316..7d1da5f22 100644
--- a/streampark-tests/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/flink/FlinkStandaloneSessionCluster.java
+++ b/streampark-tests/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/flink/FlinkStandaloneSessionCluster.java
@@ -46,19 +46,15 @@ public class FlinkStandaloneSessionCluster implements Startable {
public static final Logger LOG = LoggerFactory.getLogger(FlinkStandaloneSessionCluster.class);
- public static final Network NETWORK = Network.newNetwork();
-
- public static final String JM_RPC_ADDR_KEY = "jobmanager.rpc.address";
- public static final String TM_SLOT_NUM_KEY = "taskmanager.numberOfTaskSlots";
- public static final String SLOT_CONF_FORMAT = String.format("%s: %%s", TM_SLOT_NUM_KEY);
-
- public static final int BLOB_SERVER_PORT = 6123;
- public static final int WEB_PORT = 8081;
+ private static final int BLOB_SERVER_PORT = 6123;
+ private static final int WEB_PORT = 8081;
+ private static final Network NETWORK = Network.newNetwork();
+ private static final String JM_RPC_ADDR_KEY = "jobmanager.rpc.address";
+ private static final String TM_SLOT_NUM_KEY = "taskmanager.numberOfTaskSlots";
+ private static final String SLOT_CONF_FORMAT = String.format("%s: %%s", TM_SLOT_NUM_KEY);
private String yamlConfContent = String.format("%s: %s", JM_RPC_ADDR_KEY, JOBMANAGER.getName());
-
private final FlinkContainer jobManagerContainer;
-
private final List<FlinkContainer> taskManagerContainers = new ArrayList<>();
private FlinkStandaloneSessionCluster(
diff --git a/streampark-tests/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/hadoop/HadoopContainer.java b/streampark-tests/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/hadoop/HadoopContainer.java
index 93e34cd43..0e92fae83 100644
--- a/streampark-tests/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/hadoop/HadoopContainer.java
+++ b/streampark-tests/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/hadoop/HadoopContainer.java
@@ -37,7 +37,7 @@ public class HadoopContainer extends GenericContainer<HadoopContainer> {
public static final Logger LOG = LoggerFactory.getLogger(HadoopContainer.class);
// Hadoop version is 2.7.0
- public static final DockerImageName DOCKER_IMAGE_NAME =
+ private static final DockerImageName DOCKER_IMAGE_NAME =
DockerImageName.parse("sequenceiq/hadoop-docker:latest");
public static final Map<Integer, Integer> MAPPED_PORTS =