This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new 34794c486 fix: the EngineConnExecutorErrorCode is used by dss, change
the package (#3604)
34794c486 is described below
commit 34794c4869a194f59b9212ceaa20604efc791cc3
Author: Jack Xu <[email protected]>
AuthorDate: Mon Oct 10 18:02:35 2022 +0800
fix: the EngineConnExecutorErrorCode is used by dss, change the package
(#3604)
change the package to
org.apache.linkis.governance.common.exception.engineconn
---
.../exception/engineconn/EngineConnExecutorErrorCode.java | 2 +-
.../exception/engineconn/EngineConnExecutorErrorException.java | 2 +-
.../computation/executor/execute/EngineExecutionContext.scala | 2 +-
.../executor/service/TaskExecutionServiceImpl.scala | 6 +++---
.../org/apache/linkis/engineconn/launch/EngineConnServer.scala | 4 ++--
.../executor/service/EngineConnTimedLockService.scala | 2 +-
.../manager/engineplugin/common/conf/EnvConfiguration.scala | 10 +++++++++-
7 files changed, 18 insertions(+), 10 deletions(-)
diff --git
a/linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/exception/engineconn/EngineConnExecutorErrorCode.java
b/linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/common/exception/engineconn/EngineConnExecutorErrorCode.java
similarity index 95%
rename from
linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/exception/engineconn/EngineConnExecutorErrorCode.java
rename to
linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/common/exception/engineconn/EngineConnExecutorErrorCode.java
index 8e53c46e2..c51945396 100644
---
a/linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/exception/engineconn/EngineConnExecutorErrorCode.java
+++
b/linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/common/exception/engineconn/EngineConnExecutorErrorCode.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.governance.exception.engineconn;
+package org.apache.linkis.governance.common.exception.engineconn;
/**
* ErrorCode of Engine start with 40000
diff --git
a/linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/exception/engineconn/EngineConnExecutorErrorException.java
b/linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/common/exception/engineconn/EngineConnExecutorErrorException.java
similarity index 95%
rename from
linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/exception/engineconn/EngineConnExecutorErrorException.java
rename to
linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/common/exception/engineconn/EngineConnExecutorErrorException.java
index 2f0983df7..9eea943fa 100644
---
a/linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/exception/engineconn/EngineConnExecutorErrorException.java
+++
b/linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/common/exception/engineconn/EngineConnExecutorErrorException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.governance.exception.engineconn;
+package org.apache.linkis.governance.common.exception.engineconn;
import org.apache.linkis.common.exception.ErrorException;
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala
index 56d3b1fed..08124f222 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala
@@ -36,7 +36,7 @@ import org.apache.linkis.engineconn.executor.listener.{
EngineConnSyncListenerBus,
ExecutorListenerBusContext
}
-import
org.apache.linkis.governance.exception.engineconn.EngineConnExecutorErrorException
+import
org.apache.linkis.governance.common.exception.engineconn.EngineConnExecutorErrorException
import org.apache.linkis.protocol.engine.JobProgressInfo
import org.apache.linkis.scheduler.executer.{AliasOutputExecuteResponse,
OutputExecuteResponse}
import org.apache.linkis.storage.{LineMetaData, LineRecord}
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/service/TaskExecutionServiceImpl.scala
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/service/TaskExecutionServiceImpl.scala
index 981d12d91..608c2da2a 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/service/TaskExecutionServiceImpl.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/service/TaskExecutionServiceImpl.scala
@@ -50,12 +50,12 @@ import
org.apache.linkis.engineconn.executor.entity.ResourceFetchExecutor
import
org.apache.linkis.engineconn.executor.listener.ExecutorListenerBusContext
import org.apache.linkis.engineconn.executor.listener.event.EngineConnSyncEvent
import org.apache.linkis.governance.common.entity.ExecutionNodeStatus
-import org.apache.linkis.governance.common.protocol.task._
-import org.apache.linkis.governance.common.utils.JobUtils
-import org.apache.linkis.governance.exception.engineconn.{
+import org.apache.linkis.governance.common.exception.engineconn.{
EngineConnExecutorErrorCode,
EngineConnExecutorErrorException
}
+import org.apache.linkis.governance.common.protocol.task._
+import org.apache.linkis.governance.common.utils.JobUtils
import org.apache.linkis.manager.common.entity.enumeration.NodeStatus
import org.apache.linkis.manager.common.protocol.resource.{
ResponseTaskRunningInfo,
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-core/src/main/scala/org/apache/linkis/engineconn/launch/EngineConnServer.scala
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-core/src/main/scala/org/apache/linkis/engineconn/launch/EngineConnServer.scala
index d72ec939d..88f9112b3 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-core/src/main/scala/org/apache/linkis/engineconn/launch/EngineConnServer.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-core/src/main/scala/org/apache/linkis/engineconn/launch/EngineConnServer.scala
@@ -35,11 +35,11 @@ import org.apache.linkis.engineconn.core.execution.{
import org.apache.linkis.engineconn.core.hook.ShutdownHook
import org.apache.linkis.engineconn.core.util.EngineConnUtils
import org.apache.linkis.governance.common.conf.GovernanceCommonConf
-import org.apache.linkis.governance.common.utils.EngineConnArgumentsParser
-import org.apache.linkis.governance.exception.engineconn.{
+import org.apache.linkis.governance.common.exception.engineconn.{
EngineConnExecutorErrorCode,
EngineConnExecutorErrorException
}
+import org.apache.linkis.governance.common.utils.EngineConnArgumentsParser
import org.apache.linkis.manager.engineplugin.common.launch.process.Environment
import org.apache.linkis.manager.label.builder.factory.{
LabelBuilderFactory,
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/service/EngineConnTimedLockService.scala
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/service/EngineConnTimedLockService.scala
index 8823053fd..4d85fab48 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/service/EngineConnTimedLockService.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/service/EngineConnTimedLockService.scala
@@ -27,7 +27,7 @@ import
org.apache.linkis.engineconn.acessible.executor.listener.event.{
import org.apache.linkis.engineconn.acessible.executor.lock.EngineConnTimedLock
import org.apache.linkis.engineconn.core.executor.ExecutorManager
import
org.apache.linkis.engineconn.executor.listener.ExecutorListenerBusContext
-import org.apache.linkis.governance.exception.engineconn.{
+import org.apache.linkis.governance.common.exception.engineconn.{
EngineConnExecutorErrorCode,
EngineConnExecutorErrorException
}
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/conf/EnvConfiguration.scala
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/conf/EnvConfiguration.scala
index e41504187..290c6211e 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/conf/EnvConfiguration.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/conf/EnvConfiguration.scala
@@ -19,6 +19,8 @@ package org.apache.linkis.manager.engineplugin.common.conf
import org.apache.linkis.common.conf.{ByteType, CommonVars, Configuration}
+import org.apache.commons.lang3.{JavaVersion, SystemUtils}
+
object EnvConfiguration {
val HIVE_CONF_DIR = CommonVars[String](
@@ -39,9 +41,15 @@ object EnvConfiguration {
val ENGINE_CONN_CLASSPATH_FILES =
CommonVars("wds.linkis.engineConn.files", "", "engineConn额外的配置文件")
+ val metaspaceSize = if
(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_8)) {
+ "-XX:MaxMetaspaceSize=256m -XX:MetaspaceSize=128m"
+ } else {
+ "-XX:MaxPermSize=256m -XX:PermSize=128m"
+ }
+
val ENGINE_CONN_DEFAULT_JAVA_OPTS = CommonVars[String](
"wds.linkis.engineConn.javaOpts.default",
- s"-XX:+UseG1GC -XX:MaxPermSize=250m -XX:PermSize=128m " +
+ s"-XX:+UseG1GC ${metaspaceSize} " +
s"-Xloggc:%s -XX:+PrintGCDetails -XX:+PrintGCTimeStamps
-XX:+PrintGCDateStamps -Dwds.linkis.server.conf=linkis-engineconn.properties
-Dwds.linkis.gateway.url=${Configuration.getGateWayURL()}"
)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
