You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2023/05/12 08:00:23 UTC
[linkis] branch dev-1.4.0 updated: ResponseTaskRunningInfo bug fix and remove useless code (#4533)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.4.0
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.4.0 by this push:
new 00a2975a6 ResponseTaskRunningInfo bug fix and remove useless code (#4533)
00a2975a6 is described below
commit 00a2975a6ad397f1a6f1617a052a9ddf37f51ab9
Author: ChengJie1053 <18...@163.com>
AuthorDate: Fri May 12 16:00:17 2023 +0800
ResponseTaskRunningInfo bug fix and remove useless code (#4533)
---
.../common/protocol/resource/ResponseTaskRunningInfo.java | 12 ++++++++++--
.../engineplugin/spark/client/context/SparkConfig.java | 13 +------------
.../deployment/YarnApplicationClusterDescriptorAdapter.java | 2 --
.../linkis/engineplugin/spark/SparkEngineConnPlugin.scala | 4 ----
4 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/protocol/resource/ResponseTaskRunningInfo.java b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/protocol/resource/ResponseTaskRunningInfo.java
index 31d7b4f68..4709dc74e 100644
--- a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/protocol/resource/ResponseTaskRunningInfo.java
+++ b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/protocol/resource/ResponseTaskRunningInfo.java
@@ -40,8 +40,16 @@ public class ResponseTaskRunningInfo extends AbstractRetryableProtocol implement
this.execId = execId;
this.progress = progress;
this.progressInfo = progressInfo;
- this.resourceMap = new HashMap<>(resourceMap);
- this.extraInfoMap = new HashMap<>(extraInfoMap);
+ if (resourceMap != null) {
+ this.resourceMap = new HashMap<>(resourceMap);
+ } else {
+ this.resourceMap = new HashMap<>();
+ }
+ if (extraInfoMap != null) {
+ this.extraInfoMap = new HashMap<>(extraInfoMap);
+ } else {
+ this.extraInfoMap = new HashMap<>();
+ }
}
public String getExecId() {
diff --git a/linkis-engineconn-plugins/spark/src/main/java/org/apache/linkis/engineplugin/spark/client/context/SparkConfig.java b/linkis-engineconn-plugins/spark/src/main/java/org/apache/linkis/engineplugin/spark/client/context/SparkConfig.java
index c8f784222..20b0749d8 100644
--- a/linkis-engineconn-plugins/spark/src/main/java/org/apache/linkis/engineplugin/spark/client/context/SparkConfig.java
+++ b/linkis-engineconn-plugins/spark/src/main/java/org/apache/linkis/engineplugin/spark/client/context/SparkConfig.java
@@ -27,7 +27,6 @@ public class SparkConfig {
private String master = "yarn"; // ("yarn")
private String deployMode = "client"; // ("client") // todo cluster
private String appResource; // ("")
- // private String mainClass; // ("")
private String appName; // ("")
private String jars; // ("--jars", "")
private String packages; // ("--packages", "")
@@ -92,14 +91,6 @@ public class SparkConfig {
this.appResource = appResource;
}
- // public String getMainClass() {
- // return mainClass;
- // }
- //
- // public void setMainClass(String mainClass) {
- // this.mainClass = mainClass;
- // }
-
public String getAppName() {
return appName;
}
@@ -299,9 +290,7 @@ public class SparkConfig {
+ ", deployMode='"
+ deployMode
+ '\''
- +
- // ", mainClass='" + mainClass + '\'' +
- ", appName='"
+ + ", appName='"
+ appName
+ '\''
+ ", jars='"
diff --git a/linkis-engineconn-plugins/spark/src/main/java/org/apache/linkis/engineplugin/spark/client/deployment/YarnApplicationClusterDescriptorAdapter.java b/linkis-engineconn-plugins/spark/src/main/java/org/apache/linkis/engineplugin/spark/client/deployment/YarnApplicationClusterDescriptorAdapter.java
index 21f2885b4..9c753d862 100644
--- a/linkis-engineconn-plugins/spark/src/main/java/org/apache/linkis/engineplugin/spark/client/deployment/YarnApplicationClusterDescriptorAdapter.java
+++ b/linkis-engineconn-plugins/spark/src/main/java/org/apache/linkis/engineplugin/spark/client/deployment/YarnApplicationClusterDescriptorAdapter.java
@@ -47,7 +47,6 @@ public class YarnApplicationClusterDescriptorAdapter extends ClusterDescriptorAd
.setMaster(sparkConfig.getMaster())
.setDeployMode(sparkConfig.getDeployMode())
.setAppName(sparkConfig.getAppName())
- // .setPropertiesFile("")
.setVerbose(true);
sparkLauncher.setConf("spark.app.name", sparkConfig.getAppName());
if (confMap != null) confMap.forEach((k, v) -> sparkLauncher.setConf(k, v));
@@ -75,7 +74,6 @@ public class YarnApplicationClusterDescriptorAdapter extends ClusterDescriptorAd
Arrays.stream(args.split("\\s+"))
.filter(StringUtils::isNotBlank)
.forEach(arg -> sparkLauncher.addAppArgs(arg));
- // sparkLauncher.addAppArgs(args);
sparkAppHandle =
sparkLauncher.startApplication(
new SparkAppHandle.Listener() {
diff --git a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/SparkEngineConnPlugin.scala b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/SparkEngineConnPlugin.scala
index ea8c61eed..c1cd0a479 100644
--- a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/SparkEngineConnPlugin.scala
+++ b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/SparkEngineConnPlugin.scala
@@ -38,14 +38,10 @@ class SparkEngineConnPlugin extends EngineConnPlugin {
private val resourceLocker = new Object()
- private val engineLaunchBuilderLocker = new Object()
-
private val engineFactoryLocker = new Object()
private var engineResourceFactory: EngineResourceFactory = _
- private var engineLaunchBuilder: EngineConnLaunchBuilder = _
-
private var engineFactory: EngineConnFactory = _
override def init(params: util.Map[String, AnyRef]): Unit = {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org