This is an automated email from the ASF dual-hosted git repository.

jackxu2011 pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/linkis.git


The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
     new c74b811b3 add metaspace config (#4379)
c74b811b3 is described below

commit c74b811b3da747c3bfd5358035d0ee4ab0e4a6fe
Author: Alexyang <[email protected]>
AuthorDate: Mon Mar 20 20:33:18 2023 +0800

    add metaspace config (#4379)
    
    * engineconn-plugin-core - add config for MaxMetaspaceSize
    
    * Merge branch 'dev-1.3.2-part2-fix-metaspace-oom-not-exit' into 
dev-1.1.8-webank
    
    * remove jdk8 judge
    
    ---------
    
    Co-authored-by: peacewong <[email protected]>
---
 .../manager/engineplugin/common/conf/EnvConfiguration.scala   | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

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 290c6211e..f3235ffa3 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
@@ -41,13 +41,12 @@ 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 MAX_METASPACE_SIZE = CommonVars("linkis.engineconn.metaspace.size.max", 
"256m")
 
-  val ENGINE_CONN_DEFAULT_JAVA_OPTS = CommonVars[String](
+  lazy val metaspaceSize =
+    s"-XX:MaxMetaspaceSize=${MAX_METASPACE_SIZE.getValue} 
-XX:MetaspaceSize=128m"
+
+  lazy val ENGINE_CONN_DEFAULT_JAVA_OPTS = CommonVars[String](
     "wds.linkis.engineConn.javaOpts.default",
     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]

Reply via email to