Skip to content

Commit a6cf02e

Browse files
committed
Fix the problem that the appconn engine is not reused.
1 parent 1c4c6f2 commit a6cf02e

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

dss-appconn/linkis-appconn-engineplugin/src/main/resources/linkis-engineconn.properties

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,7 @@ wds.linkis.mysql.is.encrypt=false
4747
wds.linkis.reflect.scan.package=org.apache.linkis,com.webank.wedatasphere.dss
4848
spring.spring.mvc.servlet.path=/api/rest_j/v1
4949
spring.spring.servlet.multipart.max-file-size=200MB
50-
spring.spring.servlet.multipart.max-request-size=200MB
50+
spring.spring.servlet.multipart.max-request-size=200MB
51+
52+
wds.linkis.engineconn.support.parallelism=true
53+
wds.linkis.engineconn.max.free.time=0

dss-appconn/linkis-appconn-engineplugin/src/main/scala/org/apache/linkis/manager/engineplugin/appconn/conf/AppConnEngineConnConfiguration.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,6 @@ object AppConnEngineConnConfiguration {
2323

2424
val GATEWAY_SPRING_APPLICATION = CommonVars("wds.linkis.gateway.spring.name", "dataworkcloud-gateway")
2525

26+
val CONCURRENT_LIMIT = CommonVars("wds.linkis.engineconn.appconn.conncurrent.limit", 100)
27+
2628
}

dss-appconn/linkis-appconn-engineplugin/src/main/scala/org/apache/linkis/manager/engineplugin/appconn/executor/AppConnEngineConnExecutor.scala

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package org.apache.linkis.manager.engineplugin.appconn.executor
1818

1919
import java.util
2020
import java.util.Map
21-
2221
import com.webank.wedatasphere.dss.appconn.core.AppConn
2322
import com.webank.wedatasphere.dss.appconn.core.ext.OnlyDevelopmentAppConn
2423
import com.webank.wedatasphere.dss.appconn.manager.AppConnManager
@@ -30,7 +29,7 @@ import com.webank.wedatasphere.dss.standard.app.sso.Workspace
3029
import com.webank.wedatasphere.dss.standard.common.desc.AppInstance
3130
import com.webank.wedatasphere.dss.standard.common.entity.ref.{AsyncResponseRef, DefaultRefFactory, ResponseRef}
3231
import org.apache.linkis.common.utils.{OverloadUtils, Utils}
33-
import org.apache.linkis.engineconn.computation.executor.execute.{ComputationExecutor, EngineExecutionContext}
32+
import org.apache.linkis.engineconn.computation.executor.execute.{ComputationExecutor, ConcurrentComputationExecutor, EngineExecutionContext}
3433
import org.apache.linkis.engineconn.launch.EngineConnServer
3534
import org.apache.linkis.governance.common.utils.GovernanceConstant
3635
import org.apache.linkis.manager.common.entity.resource.{CommonNodeResource, LoadResource, NodeResource}
@@ -45,10 +44,11 @@ import org.apache.linkis.protocol.engine.JobProgressInfo
4544
import org.apache.linkis.scheduler.executer.{ErrorExecuteResponse, ExecuteResponse, SuccessExecuteResponse}
4645
import org.apache.linkis.server.BDPJettyServerHelper
4746
import org.apache.commons.lang.StringUtils
47+
import org.apache.linkis.manager.engineplugin.appconn.conf.AppConnEngineConnConfiguration
4848

4949
import scala.beans.BeanProperty
5050

51-
class AppConnEngineConnExecutor(val id: Int) extends ComputationExecutor {
51+
class AppConnEngineConnExecutor(val id: Int) extends ConcurrentComputationExecutor {
5252

5353
@BeanProperty
5454
var userWithCreator: UserWithCreator = _
@@ -172,6 +172,14 @@ class AppConnEngineConnExecutor(val id: Int) extends ComputationExecutor {
172172

173173
override def getId(): String = "AppConnEngineExecutor_" + id
174174

175+
override def getConcurrentLimit: Int = {
176+
AppConnEngineConnConfiguration.CONCURRENT_LIMIT.getValue
177+
}
178+
179+
override def killAll(): Unit = {
180+
}
181+
182+
175183
}
176184
object AppConnEngineConnExecutor {
177185

0 commit comments

Comments
 (0)