This is an automated email from the ASF dual-hosted git repository. benjobs pushed a commit to branch workspace in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
commit 2b1c758b4ddef87f6ccc29459e953e30cf879695 Author: benjobs <[email protected]> AuthorDate: Wed Sep 13 15:55:08 2023 +0800 [Improve] init workspace path improvement --- pom.xml | 2 +- .../streampark/console/core/runner/EnvInitializer.java | 2 +- .../org/apache/streampark/flink/client/FlinkClient.scala | 6 +++--- ...linkClientHandler.scala => FlinkClientEndpoint.scala} | 2 +- .../streampark/flink/kubernetes/v2/FlinkK8sConfig.scala | 16 ++++++++-------- {streampark-test-utils => streampark-tests}/pom.xml | 4 ++-- .../streampark-testcontainer/pom.xml | 2 +- .../streampark/testcontainer/flink/FlinkComponent.java | 0 .../streampark/testcontainer/flink/FlinkContainer.java | 0 .../flink/FlinkStandaloneSessionCluster.java | 0 .../streampark/testcontainer/hadoop/HadoopContainer.java | 0 .../flink/FlinkStandaloneSessionClusterITest.java | 0 .../testcontainer/hadoop/HadoopContainerTest.java | 0 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index d23981124..9cb9ba5f0 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ <module>streampark-common</module> <module>streampark-flink</module> <module>streampark-console</module> - <module>streampark-test-utils</module> + <module>streampark-tests</module> </modules> <properties> diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/runner/EnvInitializer.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/runner/EnvInitializer.java index 73214ea7f..f854eb6a4 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/runner/EnvInitializer.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/runner/EnvInitializer.java @@ -55,7 +55,7 @@ import java.util.regex.Pattern; import static org.apache.streampark.common.enums.StorageType.LFS; -@Order +@Order(1) @Slf4j @Component public class EnvInitializer implements ApplicationRunner { diff --git a/streampark-flink/streampark-flink-client/streampark-flink-client-api/src/main/scala/org/apache/streampark/flink/client/FlinkClient.scala b/streampark-flink/streampark-flink-client/streampark-flink-client-api/src/main/scala/org/apache/streampark/flink/client/FlinkClient.scala index c2ea9ba48..10d2fd28c 100644 --- a/streampark-flink/streampark-flink-client/streampark-flink-client-api/src/main/scala/org/apache/streampark/flink/client/FlinkClient.scala +++ b/streampark-flink/streampark-flink-client/streampark-flink-client-api/src/main/scala/org/apache/streampark/flink/client/FlinkClient.scala @@ -27,8 +27,8 @@ import scala.reflect.ClassTag object FlinkClient extends Logger { - private[this] val FLINK_CLIENT_HANDLER_CLASS_NAME = - "org.apache.streampark.flink.client.FlinkClientHandler" + private[this] val FLINK_CLIENT_ENDPOINT_CLASS = + "org.apache.streampark.flink.client.FlinkClientEndpoint" private[this] val SUBMIT_REQUEST = "org.apache.streampark.flink.client.bean.SubmitRequest" -> "submit" @@ -73,7 +73,7 @@ object FlinkClient extends Logger { FlinkShimsProxy.proxy( flinkVersion, (classLoader: ClassLoader) => { - val submitClass = classLoader.loadClass(FLINK_CLIENT_HANDLER_CLASS_NAME) + val submitClass = classLoader.loadClass(FLINK_CLIENT_ENDPOINT_CLASS) val requestClass = classLoader.loadClass(requestBody._1) val method = submitClass.getDeclaredMethod(requestBody._2, requestClass) method.setAccessible(true) diff --git a/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/FlinkClientHandler.scala b/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/FlinkClientEndpoint.scala similarity index 99% rename from streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/FlinkClientHandler.scala rename to streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/FlinkClientEndpoint.scala index bdd1f1f2a..c36c2d1bf 100644 --- a/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/FlinkClientHandler.scala +++ b/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/FlinkClientEndpoint.scala @@ -24,7 +24,7 @@ import org.apache.streampark.flink.client.`trait`.FlinkClientTrait import org.apache.streampark.flink.client.bean._ import org.apache.streampark.flink.client.impl._ -object FlinkClientHandler { +object FlinkClientEndpoint { private[this] val clients: Map[ExecutionMode, FlinkClientTrait] = Map( LOCAL -> LocalClient, diff --git a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/FlinkK8sConfig.scala b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/FlinkK8sConfig.scala index 10d96dce8..188eb1ee7 100644 --- a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/FlinkK8sConfig.scala +++ b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/FlinkK8sConfig.scala @@ -23,14 +23,14 @@ object FlinkK8sConfig { // ----- embedded http file server config ----- - val EMBEDDED_HTTP_FILE_SERVER_LOCAL_MIRROR_DIR: InternalOption = InternalOption( + lazy val EMBEDDED_HTTP_FILE_SERVER_LOCAL_MIRROR_DIR: InternalOption = InternalOption( key = "streampark.flink-k8s.fs.mirror-dir", defaultValue = s"${Workspace.local.WORKSPACE}/mirror", classType = classOf[String], description = "Local mirror directory for embedded file server" ) - val EMBEDDED_HTTP_FILE_SERVER_PORT: InternalOption = InternalOption( + lazy val EMBEDDED_HTTP_FILE_SERVER_PORT: InternalOption = InternalOption( key = "streampark.flink-k8s.fs-server.port", defaultValue = 10030, classType = classOf[Integer], @@ -39,35 +39,35 @@ object FlinkK8sConfig { // ----- observer config ----- - val EVAL_FLINK_JOB_SNAPSHOT_PARALLELISM: InternalOption = InternalOption( + lazy val EVAL_FLINK_JOB_SNAPSHOT_PARALLELISM: InternalOption = InternalOption( key = "streampark.flink-k8s.job-snapshot.eval-parallelism", defaultValue = 5, classType = classOf[Integer], description = "Parallelism of fibers evaluating flink job status" ) - val EVAL_FLINK_JOB_SNAP_INTERVAL_MILLIS: InternalOption = InternalOption( + lazy val EVAL_FLINK_JOB_SNAP_INTERVAL_MILLIS: InternalOption = InternalOption( key = "streampark.flink-k8s.job-snapshot.eval-interval", defaultValue = 1000L, classType = classOf[Long], description = "Interval for evaluating the status of the flink task, in milliseconds" ) - val POLL_FLINK_REST_INTERVAL: InternalOption = InternalOption( + lazy val POLL_FLINK_REST_INTERVAL: InternalOption = InternalOption( key = "streampark.flink-k8s.flink-rest.poll-interval", defaultValue = 1000L, classType = classOf[Long], description = "Interval for polling the flink rest api, in milliseconds" ) - val RETRY_FLINK_REST_INTERVAL: InternalOption = InternalOption( + lazy val RETRY_FLINK_REST_INTERVAL: InternalOption = InternalOption( key = "streampark.flink-k8s.flink-rest.poll-retry-interval", defaultValue = 2000L, classType = classOf[Long], description = "Polling interval when the flink rest api request fails, in milliseconds" ) - val REACH_FLINK_REST_TYPE: InternalOption = InternalOption( + lazy val REACH_FLINK_REST_TYPE: InternalOption = InternalOption( key = "streampark.flink-k8s.flink-rest.access-type", defaultValue = "IP", classType = classOf[String], @@ -76,7 +76,7 @@ object FlinkK8sConfig { // ----- operator config ----- - val LOG_FLINK_CR_YAML: InternalOption = InternalOption( + lazy val LOG_FLINK_CR_YAML: InternalOption = InternalOption( key = "streampark.flink-k8s.log-cr-yaml", defaultValue = true, classType = classOf[Boolean], diff --git a/streampark-test-utils/pom.xml b/streampark-tests/pom.xml similarity index 94% rename from streampark-test-utils/pom.xml rename to streampark-tests/pom.xml index 90c3b252f..97f75dea0 100644 --- a/streampark-test-utils/pom.xml +++ b/streampark-tests/pom.xml @@ -24,10 +24,10 @@ <version>2.2.0-SNAPSHOT</version> </parent> - <artifactId>streampark-test-utils</artifactId> + <artifactId>streampark-tests</artifactId> <packaging>pom</packaging> - <name>StreamPark : Test Utils</name> + <name>StreamPark : Tests</name> <url>http://maven.apache.org</url> <modules> <module>streampark-testcontainer</module> diff --git a/streampark-test-utils/streampark-testcontainer/pom.xml b/streampark-tests/streampark-testcontainer/pom.xml similarity index 98% rename from streampark-test-utils/streampark-testcontainer/pom.xml rename to streampark-tests/streampark-testcontainer/pom.xml index f666932d3..78a3c7838 100644 --- a/streampark-test-utils/streampark-testcontainer/pom.xml +++ b/streampark-tests/streampark-testcontainer/pom.xml @@ -20,7 +20,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.streampark</groupId> - <artifactId>streampark-test-utils</artifactId> + <artifactId>streampark-tests</artifactId> <version>2.2.0-SNAPSHOT</version> </parent> diff --git a/streampark-test-utils/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/flink/FlinkComponent.java b/streampark-tests/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/flink/FlinkComponent.java similarity index 100% rename from streampark-test-utils/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/flink/FlinkComponent.java rename to streampark-tests/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/flink/FlinkComponent.java diff --git a/streampark-test-utils/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 similarity index 100% rename from streampark-test-utils/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/flink/FlinkContainer.java rename to streampark-tests/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/flink/FlinkContainer.java diff --git a/streampark-test-utils/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 similarity index 100% rename from streampark-test-utils/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/flink/FlinkStandaloneSessionCluster.java rename to streampark-tests/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/flink/FlinkStandaloneSessionCluster.java diff --git a/streampark-test-utils/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 similarity index 100% rename from streampark-test-utils/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/hadoop/HadoopContainer.java rename to streampark-tests/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/hadoop/HadoopContainer.java diff --git a/streampark-test-utils/streampark-testcontainer/src/test/java/org/apache/streampark/testcontainer/flink/FlinkStandaloneSessionClusterITest.java b/streampark-tests/streampark-testcontainer/src/test/java/org/apache/streampark/testcontainer/flink/FlinkStandaloneSessionClusterITest.java similarity index 100% rename from streampark-test-utils/streampark-testcontainer/src/test/java/org/apache/streampark/testcontainer/flink/FlinkStandaloneSessionClusterITest.java rename to streampark-tests/streampark-testcontainer/src/test/java/org/apache/streampark/testcontainer/flink/FlinkStandaloneSessionClusterITest.java diff --git a/streampark-test-utils/streampark-testcontainer/src/test/java/org/apache/streampark/testcontainer/hadoop/HadoopContainerTest.java b/streampark-tests/streampark-testcontainer/src/test/java/org/apache/streampark/testcontainer/hadoop/HadoopContainerTest.java similarity index 100% rename from streampark-test-utils/streampark-testcontainer/src/test/java/org/apache/streampark/testcontainer/hadoop/HadoopContainerTest.java rename to streampark-tests/streampark-testcontainer/src/test/java/org/apache/streampark/testcontainer/hadoop/HadoopContainerTest.java
