This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/master by this push:
new 903996a9b issue-4819: fix illegal ec status and print error log (#4820)
903996a9b is described below
commit 903996a9b327edd6b8b5030d31d464b6d82f3c87
Author: aiceflower <[email protected]>
AuthorDate: Tue Jul 25 22:55:27 2023 +0800
issue-4819: fix illegal ec status and print error log (#4820)
* fix ec illegal status
* fix print error log
* update vertion to 1.4.0
* optimized code
---
.../apache/linkis/governance/common/conf/GovernanceCommonConf.scala | 3 +++
.../org/apache/linkis/governance/common/paser/CodeParser.scala | 4 +++-
.../persistence/impl/DefaultNodeMetricManagerPersistence.java | 2 +-
linkis-dist/deploy-config/linkis-env.sh | 2 +-
.../linkis/engineplugin/spark/config/SparkConfiguration.scala | 3 +++
.../apache/linkis/engineplugin/spark/mdq/MDQPostExecutionHook.scala | 6 +++++-
.../apache/linkis/engineplugin/spark/mdq/MDQPreExecutionHook.scala | 6 +++++-
linkis-web/.env | 2 +-
8 files changed, 22 insertions(+), 6 deletions(-)
diff --git
a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/conf/GovernanceCommonConf.scala
b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/conf/GovernanceCommonConf.scala
index 0029faa91..a4671eaa1 100644
---
a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/conf/GovernanceCommonConf.scala
+++
b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/conf/GovernanceCommonConf.scala
@@ -93,4 +93,7 @@ object GovernanceCommonConf {
val SCALA_PARSE_APPEND_CODE_ENABLED =
CommonVars("linkis.scala.parse.append.code.enable", true).getValue
+ val SCALA_PARSE_APPEND_CODE =
+ CommonVars("linkis.scala.parse.append.code", "val linkisVar=1").getValue
+
}
diff --git
a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/paser/CodeParser.scala
b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/paser/CodeParser.scala
index 16f4ce097..87576d5e4 100644
---
a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/paser/CodeParser.scala
+++
b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/paser/CodeParser.scala
@@ -111,7 +111,9 @@ class ScalaCodeParser extends SingleCodeParser with Logging
{
if (statementBuffer.nonEmpty)
codeBuffer.append(statementBuffer.mkString("\n"))
// Append code `val linkisVar=1` in ends to prevent bugs that do not exit
tasks for a long time
- if (GovernanceCommonConf.SCALA_PARSE_APPEND_CODE_ENABLED)
codeBuffer.append("val linkisVar=1")
+ if (GovernanceCommonConf.SCALA_PARSE_APPEND_CODE_ENABLED) {
+ codeBuffer.append(GovernanceCommonConf.SCALA_PARSE_APPEND_CODE)
+ }
codeBuffer.toArray
}
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultNodeMetricManagerPersistence.java
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultNodeMetricManagerPersistence.java
index 33c9e0263..fb0e56786 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultNodeMetricManagerPersistence.java
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultNodeMetricManagerPersistence.java
@@ -119,7 +119,7 @@ public class DefaultNodeMetricManagerPersistence implements
NodeMetricManagerPer
"ignore update ShuttingDown status node:{} to status:{}",
instance,
NodeStatus.values()[nodeMetrics.getStatus()].name());
- persistenceNodeMetrics.setStatus(null);
+ persistenceNodeMetrics.setStatus(oldMetrics.getStatus());
} else {
persistenceNodeMetrics.setStatus(nodeMetrics.getStatus());
}
diff --git a/linkis-dist/deploy-config/linkis-env.sh
b/linkis-dist/deploy-config/linkis-env.sh
index 2f160182c..a75a60f9a 100644
--- a/linkis-dist/deploy-config/linkis-env.sh
+++ b/linkis-dist/deploy-config/linkis-env.sh
@@ -160,7 +160,7 @@ export SERVER_HEAP_SIZE="512M"
##The extended lib such mysql-connector-java-*.jar
#LINKIS_EXTENDED_LIB=/appcom/common/linkisExtendedLib
-LINKIS_VERSION=1.3.2
+LINKIS_VERSION=1.4.0
# for install
LINKIS_PUBLIC_MODULE=lib/linkis-commons/public-module
diff --git
a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/config/SparkConfiguration.scala
b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/config/SparkConfiguration.scala
index eb4bbdaa1..d26685845 100644
---
a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/config/SparkConfiguration.scala
+++
b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/config/SparkConfiguration.scala
@@ -159,6 +159,9 @@ object SparkConfiguration extends Logging {
val LINKIS_SPARK_ETL_SUPPORT_HUDI =
CommonVars[Boolean]("linkis.spark.etl.support.hudi", false)
+ val SCALA_PARSE_APPEND_CODE =
+ CommonVars("linkis.scala.parse.append.code", "val linkisVar=1").getValue
+
private def getMainJarName(): String = {
val somePath = ClassUtils.jarOfClass(classOf[SparkEngineConnFactory])
if (somePath.isDefined) {
diff --git
a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/mdq/MDQPostExecutionHook.scala
b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/mdq/MDQPostExecutionHook.scala
index 60c1dc1ef..891aeb2d3 100644
---
a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/mdq/MDQPostExecutionHook.scala
+++
b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/mdq/MDQPostExecutionHook.scala
@@ -56,7 +56,11 @@ class MDQPostExecutionHook extends SparkPostExecutionHook
with Logging {
case l: CodeLanguageLabel => l.getCodeType
case _ => ""
}
- if (StringUtils.isEmpty(runType) ||
!SparkKind.FUNCTION_MDQ_TYPE.equalsIgnoreCase(runType)) {
+ if (
+ StringUtils.isEmpty(runType) ||
!SparkKind.FUNCTION_MDQ_TYPE.equalsIgnoreCase(
+ runType
+ ) || (code != null &&
code.contains(SparkConfiguration.SCALA_PARSE_APPEND_CODE))
+ ) {
return
}
val sender =
Sender.getSender(SparkConfiguration.MDQ_APPLICATION_NAME.getValue)
diff --git
a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/mdq/MDQPreExecutionHook.scala
b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/mdq/MDQPreExecutionHook.scala
index 836f74868..b067055eb 100644
---
a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/mdq/MDQPreExecutionHook.scala
+++
b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/mdq/MDQPreExecutionHook.scala
@@ -60,7 +60,11 @@ class MDQPreExecutionHook extends SparkPreExecutionHook with
Logging {
case _ =>
""
}
- if (StringUtils.isEmpty(runType) ||
!SparkKind.FUNCTION_MDQ_TYPE.equalsIgnoreCase(runType)) {
+ if (
+ StringUtils.isEmpty(runType) ||
!SparkKind.FUNCTION_MDQ_TYPE.equalsIgnoreCase(
+ runType
+ ) || (code != null &&
code.contains(SparkConfiguration.SCALA_PARSE_APPEND_CODE))
+ ) {
return code
}
val sender =
Sender.getSender(SparkConfiguration.MDQ_APPLICATION_NAME.getValue)
diff --git a/linkis-web/.env b/linkis-web/.env
index d9f101acc..371b8faf7 100644
--- a/linkis-web/.env
+++ b/linkis-web/.env
@@ -2,4 +2,4 @@ VUE_APP_HOST=
BACKEND_URL=http://127.0.0.1:9001
VUE_APP_MN_CONFIG_PREFIX=
VUE_APP_MN_CONFIG_SOCKET=/ws/api/entrance/connect
-VUE_APP_VERSION=1.3.2
+VUE_APP_VERSION=1.4.0
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
