This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev-2.1.5
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev-2.1.5 by this push:
new c9ecdd827 [Improve] remove unused dir
c9ecdd827 is described below
commit c9ecdd82771c1cc23f756ee4a3a59026dfaeb5dd
Author: benjobs <[email protected]>
AuthorDate: Tue Jul 23 22:11:33 2024 +0800
[Improve] remove unused dir
---
.../org/apache/streampark/console/core/runner/EnvInitializer.java | 6 ------
.../org/apache/streampark/flink/client/bean/DeployRequest.scala | 3 +--
.../org/apache/streampark/flink/client/bean/SubmitRequest.scala | 7 ++-----
.../flink/client/impl/KubernetesNativeApplicationClient.scala | 3 ---
.../streampark/flink/client/impl/YarnApplicationClient.scala | 6 ++----
.../org/apache/streampark/flink/client/impl/YarnPerJobClient.scala | 2 +-
.../apache/streampark/flink/client/impl/YarnSessionClient.scala | 2 +-
.../org/apache/streampark/flink/packer/pipeline/BuildRequest.scala | 2 +-
8 files changed, 8 insertions(+), 23 deletions(-)
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 a2777e544..88d345a06 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
@@ -168,12 +168,6 @@ public class EnvInitializer implements ApplicationRunner {
fsOperator.mkdirs(appJars);
}
- String appPlugins = workspace.APP_PLUGINS();
- if (!fsOperator.exists(appPlugins)) {
- log.info(mkdirLog, appPlugins);
- fsOperator.mkdirs(appPlugins);
- }
-
// 2. upload jar.
// 2.1) upload client jar
File client = WebUtils.getAppClientDir();
diff --git
a/streampark-flink/streampark-flink-client/streampark-flink-client-api/src/main/scala/org/apache/streampark/flink/client/bean/DeployRequest.scala
b/streampark-flink/streampark-flink-client/streampark-flink-client-api/src/main/scala/org/apache/streampark/flink/client/bean/DeployRequest.scala
index 936af108e..49ad5c8ed 100644
---
a/streampark-flink/streampark-flink-client/streampark-flink-client-api/src/main/scala/org/apache/streampark/flink/client/bean/DeployRequest.scala
+++
b/streampark-flink/streampark-flink-client/streampark-flink-client-api/src/main/scala/org/apache/streampark/flink/client/bean/DeployRequest.scala
@@ -55,8 +55,7 @@ case class DeployRequest(
flinkLib = s"$flinkHdfsHome/lib",
flinkPlugins = s"$flinkHdfsHome/plugins",
flinkDistJar = FlinkUtils.getFlinkDistJar(flinkHome),
- appJars = workspace.APP_JARS,
- appPlugins = workspace.APP_PLUGINS
+ appJars = workspace.APP_JARS
)
}
}
diff --git
a/streampark-flink/streampark-flink-client/streampark-flink-client-api/src/main/scala/org/apache/streampark/flink/client/bean/SubmitRequest.scala
b/streampark-flink/streampark-flink-client/streampark-flink-client-api/src/main/scala/org/apache/streampark/flink/client/bean/SubmitRequest.scala
index a74ba5119..86bc2bf8d 100644
---
a/streampark-flink/streampark-flink-client/streampark-flink-client-api/src/main/scala/org/apache/streampark/flink/client/bean/SubmitRequest.scala
+++
b/streampark-flink/streampark-flink-client/streampark-flink-client-api/src/main/scala/org/apache/streampark/flink/client/bean/SubmitRequest.scala
@@ -159,8 +159,7 @@ case class SubmitRequest(
flinkLib = s"$flinkHdfsHome/lib",
flinkPlugins = s"$flinkHdfsHome/plugins",
flinkDistJar = FlinkUtils.getFlinkDistJar(flinkHome),
- appJars = workspace.APP_JARS,
- appPlugins = workspace.APP_PLUGINS
+ appJars = workspace.APP_JARS
)
}
@@ -201,7 +200,6 @@ case class SubmitRequest(
* @param flinkLib
* @param flinkPlugins
* @param appJars
- * @param appPlugins
*/
case class HdfsWorkspace(
flinkName: String,
@@ -209,5 +207,4 @@ case class HdfsWorkspace(
flinkDistJar: String,
flinkLib: String,
flinkPlugins: String,
- appJars: String,
- appPlugins: String)
+ appJars: String)
diff --git
a/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/impl/KubernetesNativeApplicationClient.scala
b/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/impl/KubernetesNativeApplicationClient.scala
index f8606590a..a38d462c1 100644
---
a/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/impl/KubernetesNativeApplicationClient.scala
+++
b/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/impl/KubernetesNativeApplicationClient.scala
@@ -18,7 +18,6 @@
package org.apache.streampark.flink.client.impl
import org.apache.streampark.common.enums.ExecutionMode
-import org.apache.streampark.common.util.Utils
import org.apache.streampark.flink.client.`trait`.KubernetesNativeClientTrait
import org.apache.streampark.flink.client.bean._
import org.apache.streampark.flink.packer.pipeline.DockerImageBuildResponse
@@ -26,9 +25,7 @@ import
org.apache.streampark.flink.packer.pipeline.DockerImageBuildResponse
import com.google.common.collect.Lists
import org.apache.commons.lang3.StringUtils
import org.apache.flink.client.deployment.application.ApplicationConfiguration
-import org.apache.flink.client.program.ClusterClient
import org.apache.flink.configuration.{Configuration, DeploymentOptions,
PipelineOptions}
-import org.apache.flink.kubernetes.KubernetesClusterDescriptor
import org.apache.flink.kubernetes.configuration.KubernetesConfigOptions
/** kubernetes native application mode submit */
diff --git
a/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/impl/YarnApplicationClient.scala
b/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/impl/YarnApplicationClient.scala
index a3939b007..68571e9af 100644
---
a/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/impl/YarnApplicationClient.scala
+++
b/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/impl/YarnApplicationClient.scala
@@ -19,14 +19,13 @@ package org.apache.streampark.flink.client.impl
import org.apache.streampark.common.conf.Workspace
import org.apache.streampark.common.enums.DevelopmentMode
-import org.apache.streampark.common.util.{HdfsUtils, Utils}
+import org.apache.streampark.common.util.HdfsUtils
import org.apache.streampark.flink.client.`trait`.YarnClientTrait
import org.apache.streampark.flink.client.bean._
import org.apache.streampark.flink.packer.pipeline.ShadedBuildResponse
import org.apache.flink.client.deployment.DefaultClusterClientServiceLoader
import org.apache.flink.client.deployment.application.ApplicationConfiguration
-import org.apache.flink.client.program.ClusterClient
import org.apache.flink.configuration._
import org.apache.flink.runtime.security.{SecurityConfiguration, SecurityUtils}
import org.apache.flink.runtime.util.HadoopUtils
@@ -63,8 +62,7 @@ object YarnApplicationClient extends YarnClientTrait {
val providedLibs = {
val array = ListBuffer(
submitRequest.hdfsWorkspace.flinkLib,
- submitRequest.hdfsWorkspace.appJars,
- submitRequest.hdfsWorkspace.appPlugins
+ submitRequest.hdfsWorkspace.appJars
)
val jobLib = s"${workspace.APP_WORKSPACE}/${submitRequest.id}/lib"
if (HdfsUtils.exists(jobLib)) {
diff --git
a/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/impl/YarnPerJobClient.scala
b/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/impl/YarnPerJobClient.scala
index 469cccbf7..87123263f 100644
---
a/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/impl/YarnPerJobClient.scala
+++
b/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/impl/YarnPerJobClient.scala
@@ -22,7 +22,7 @@ import org.apache.streampark.flink.client.bean._
import org.apache.streampark.flink.util.FlinkUtils
import org.apache.flink.client.deployment.DefaultClusterClientServiceLoader
-import org.apache.flink.client.program.{ClusterClient, PackagedProgram}
+import org.apache.flink.client.program.PackagedProgram
import org.apache.flink.configuration.{Configuration, DeploymentOptions}
import org.apache.flink.yarn.{YarnClusterClientFactory, YarnClusterDescriptor}
import org.apache.flink.yarn.configuration.YarnDeploymentTarget
diff --git
a/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/impl/YarnSessionClient.scala
b/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/impl/YarnSessionClient.scala
index 97370a268..faaa6e87a 100644
---
a/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/impl/YarnSessionClient.scala
+++
b/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/impl/YarnSessionClient.scala
@@ -23,7 +23,7 @@ import org.apache.streampark.flink.client.bean._
import org.apache.commons.lang3.StringUtils
import org.apache.flink.client.deployment.DefaultClusterClientServiceLoader
-import org.apache.flink.client.program.{ClusterClient, PackagedProgram}
+import org.apache.flink.client.program.ClusterClient
import org.apache.flink.configuration._
import org.apache.flink.runtime.util.HadoopUtils
import org.apache.flink.yarn.YarnClusterDescriptor
diff --git
a/streampark-flink/streampark-flink-packer/src/main/scala/org/apache/streampark/flink/packer/pipeline/BuildRequest.scala
b/streampark-flink/streampark-flink-packer/src/main/scala/org/apache/streampark/flink/packer/pipeline/BuildRequest.scala
index 41c56aa6b..8cba4cfe0 100644
---
a/streampark-flink/streampark-flink-packer/src/main/scala/org/apache/streampark/flink/packer/pipeline/BuildRequest.scala
+++
b/streampark-flink/streampark-flink-packer/src/main/scala/org/apache/streampark/flink/packer/pipeline/BuildRequest.scala
@@ -50,7 +50,7 @@ sealed trait FlinkBuildParam extends BuildParam {
lazy val providedLibs: MavenArtifact = {
val providedLibs =
- ArrayBuffer(localWorkspace.APP_JARS, localWorkspace.APP_PLUGINS,
customFlinkUserJar)
+ ArrayBuffer(localWorkspace.APP_JARS, customFlinkUserJar)
if (developmentMode == DevelopmentMode.FLINK_SQL) {
providedLibs +=
s"${localWorkspace.APP_SHIMS}/flink-${flinkVersion.majorVersion}"
}
