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 9058c9e63 [Improve] YarnClusterDescriptorWrapper minor improvement
9058c9e63 is described below
commit 9058c9e63fe3d86e367af0df2337a8173a78bc91
Author: benjobs <[email protected]>
AuthorDate: Fri Aug 30 01:18:37 2024 +0800
[Improve] YarnClusterDescriptorWrapper minor improvement
---
.../streampark/flink/client/impl/YarnApplicationClient.scala | 3 ---
.../apache/streampark/flink/client/impl/YarnPerJobClient.scala | 2 +-
.../apache/streampark/flink/client/impl/YarnSessionClient.scala | 2 --
.../streampark/flink/core/YarnClusterDescriptorWrapper.scala | 2 +-
.../streampark/flink/core/YarnClusterDescriptorWrapper.scala | 2 +-
.../streampark/flink/core/YarnClusterDescriptorWrapper.scala | 2 +-
.../streampark/flink/core/YarnClusterDescriptorWrapper.scala | 2 +-
.../streampark/flink/core/YarnClusterDescriptorWrapper.scala | 2 +-
.../streampark/flink/core/YarnClusterDescriptorWrapper.scala | 2 +-
.../streampark/flink/core/YarnClusterDescriptorWrapper.scala | 2 +-
.../streampark/flink/core/YarnClusterDescriptorWrapper.scala | 8 ++++----
.../streampark/flink/core/YarnClusterDescriptorWrapper.scala | 8 ++++----
12 files changed, 16 insertions(+), 21 deletions(-)
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 cc05b1e25..b9132d0a9 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
@@ -27,11 +27,8 @@ import
org.apache.streampark.flink.packer.pipeline.ShadedBuildResponse
import org.apache.flink.client.deployment.application.ApplicationConfiguration
import org.apache.flink.configuration._
import org.apache.flink.runtime.security.{SecurityConfiguration, SecurityUtils}
-import org.apache.flink.runtime.util.HadoopUtils
import org.apache.flink.yarn.YarnClusterDescriptor
import org.apache.flink.yarn.configuration.{YarnConfigOptions,
YarnDeploymentTarget}
-import org.apache.hadoop.security.UserGroupInformation
-import org.apache.hadoop.yarn.api.records.ApplicationId
import java.util.Collections
import java.util.concurrent.Callable
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 e2bcc0a33..ff18c739c 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
@@ -24,7 +24,7 @@ import org.apache.streampark.flink.util.FlinkUtils
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.YarnClusterDescriptor
import org.apache.flink.yarn.configuration.YarnDeploymentTarget
import org.apache.flink.yarn.entrypoint.YarnJobClusterEntrypoint
import org.apache.hadoop.fs.{Path => HadoopPath}
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 e9afbf1d6..db0c3db71 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
@@ -25,10 +25,8 @@ import org.apache.commons.lang3.StringUtils
import org.apache.flink.client.deployment.ClusterSpecification
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
import org.apache.flink.yarn.configuration.{YarnConfigOptions,
YarnDeploymentTarget}
-import org.apache.hadoop.security.UserGroupInformation
import org.apache.hadoop.yarn.api.records.{ApplicationId,
FinalApplicationStatus}
import org.apache.hadoop.yarn.util.ConverterUtils
diff --git
a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.12/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.12/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
index 0d8860e5b..a8b0ba5c6 100644
---
a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.12/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
+++
b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.12/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
@@ -19,4 +19,4 @@ package org.apache.streampark.flink.core
import org.apache.flink.yarn.YarnClusterDescriptor
class YarnClusterDescriptorWrapper(yarnClusterDescriptor:
YarnClusterDescriptor)
- extends YarnClusterDescriptorTrait(yarnClusterDescriptor) {}
+ extends YarnClusterDescriptorTrait(yarnClusterDescriptor)
diff --git
a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.13/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.13/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
index 0d8860e5b..a8b0ba5c6 100644
---
a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.13/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
+++
b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.13/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
@@ -19,4 +19,4 @@ package org.apache.streampark.flink.core
import org.apache.flink.yarn.YarnClusterDescriptor
class YarnClusterDescriptorWrapper(yarnClusterDescriptor:
YarnClusterDescriptor)
- extends YarnClusterDescriptorTrait(yarnClusterDescriptor) {}
+ extends YarnClusterDescriptorTrait(yarnClusterDescriptor)
diff --git
a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.14/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.14/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
index 0d8860e5b..a8b0ba5c6 100644
---
a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.14/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
+++
b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.14/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
@@ -19,4 +19,4 @@ package org.apache.streampark.flink.core
import org.apache.flink.yarn.YarnClusterDescriptor
class YarnClusterDescriptorWrapper(yarnClusterDescriptor:
YarnClusterDescriptor)
- extends YarnClusterDescriptorTrait(yarnClusterDescriptor) {}
+ extends YarnClusterDescriptorTrait(yarnClusterDescriptor)
diff --git
a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.15/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.15/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
index b820c04d7..9d3393ec7 100644
---
a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.15/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
+++
b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.15/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
@@ -20,4 +20,4 @@ package org.apache.streampark.flink.core
import org.apache.flink.yarn.YarnClusterDescriptor
class YarnClusterDescriptorWrapper(yarnClusterDescriptor:
YarnClusterDescriptor)
- extends YarnClusterDescriptorTrait(yarnClusterDescriptor) {}
+ extends YarnClusterDescriptorTrait(yarnClusterDescriptor)
diff --git
a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.16/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.16/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
index b820c04d7..9d3393ec7 100644
---
a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.16/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
+++
b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.16/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
@@ -20,4 +20,4 @@ package org.apache.streampark.flink.core
import org.apache.flink.yarn.YarnClusterDescriptor
class YarnClusterDescriptorWrapper(yarnClusterDescriptor:
YarnClusterDescriptor)
- extends YarnClusterDescriptorTrait(yarnClusterDescriptor) {}
+ extends YarnClusterDescriptorTrait(yarnClusterDescriptor)
diff --git
a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.17/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.17/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
index b820c04d7..9d3393ec7 100644
---
a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.17/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
+++
b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.17/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
@@ -20,4 +20,4 @@ package org.apache.streampark.flink.core
import org.apache.flink.yarn.YarnClusterDescriptor
class YarnClusterDescriptorWrapper(yarnClusterDescriptor:
YarnClusterDescriptor)
- extends YarnClusterDescriptorTrait(yarnClusterDescriptor) {}
+ extends YarnClusterDescriptorTrait(yarnClusterDescriptor)
diff --git
a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.18/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.18/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
index b820c04d7..9d3393ec7 100644
---
a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.18/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
+++
b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.18/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
@@ -20,4 +20,4 @@ package org.apache.streampark.flink.core
import org.apache.flink.yarn.YarnClusterDescriptor
class YarnClusterDescriptorWrapper(yarnClusterDescriptor:
YarnClusterDescriptor)
- extends YarnClusterDescriptorTrait(yarnClusterDescriptor) {}
+ extends YarnClusterDescriptorTrait(yarnClusterDescriptor)
diff --git
a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.19/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.19/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
index a15296a0e..a09b86844 100644
---
a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.19/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
+++
b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.19/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
@@ -18,7 +18,6 @@
package org.apache.streampark.flink.core
import collection.JavaConversions._
-import com.google.common.collect.Lists
import org.apache.flink.yarn.YarnClusterDescriptor
import org.apache.hadoop.fs.Path
@@ -28,8 +27,9 @@ import java.util
class YarnClusterDescriptorWrapper(yarnClusterDescriptor:
YarnClusterDescriptor)
extends YarnClusterDescriptorTrait(yarnClusterDescriptor) {
- override def addShipFiles(input: util.List[File]) = {
- val f = input.map(c => new Path(c.toURI))
- yarnClusterDescriptor.addShipFiles(Lists.newArrayList(f: _*))
+ override def addShipFiles(input: util.List[File]): Unit = {
+ val list = new util.ArrayList[Path]()
+ input.foreach(x => list.add(new Path(x.toURI)))
+ yarnClusterDescriptor.addShipFiles(list)
}
}
diff --git
a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.20/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.20/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
index a15296a0e..a09b86844 100644
---
a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.20/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
+++
b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.20/src/main/scala/org/apache/streampark/flink/core/YarnClusterDescriptorWrapper.scala
@@ -18,7 +18,6 @@
package org.apache.streampark.flink.core
import collection.JavaConversions._
-import com.google.common.collect.Lists
import org.apache.flink.yarn.YarnClusterDescriptor
import org.apache.hadoop.fs.Path
@@ -28,8 +27,9 @@ import java.util
class YarnClusterDescriptorWrapper(yarnClusterDescriptor:
YarnClusterDescriptor)
extends YarnClusterDescriptorTrait(yarnClusterDescriptor) {
- override def addShipFiles(input: util.List[File]) = {
- val f = input.map(c => new Path(c.toURI))
- yarnClusterDescriptor.addShipFiles(Lists.newArrayList(f: _*))
+ override def addShipFiles(input: util.List[File]): Unit = {
+ val list = new util.ArrayList[Path]()
+ input.foreach(x => list.add(new Path(x.toURI)))
+ yarnClusterDescriptor.addShipFiles(list)
}
}
