Skip to content

Fix complication problems #499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
liuyou2 merged 4 commits into from
Feb 15, 2022
Merged

Fix complication problems #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c3ca8d
fix compile problem
JackChen0810 Jan 28, 2022
01df363
add mysql-connector-java to dss-common
JackChen0810 Jan 28, 2022
1b89789
Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1
JackChen0810 Jan 28, 2022
b99c03a
Fix the problem that the appconn engine is not reused.
JackChen0810 Feb 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions assembly/dss-package/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,12 @@
<version>2.21</version>
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
</dependency>

</dependencies>

<build>
Expand Down
5 changes: 4 additions & 1 deletion dss-appconn/linkis-appconn-engineplugin/src/main/resources/linkis-engineconn.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,7 @@ wds.linkis.mysql.is.encrypt=false
wds.linkis.reflect.scan.package=org.apache.linkis,com.webank.wedatasphere.dss
spring.spring.mvc.servlet.path=/api/rest_j/v1
spring.spring.servlet.multipart.max-file-size=200MB
spring.spring.servlet.multipart.max-request-size=200MB
spring.spring.servlet.multipart.max-request-size=200MB

wds.linkis.engineconn.support.parallelism=true
wds.linkis.engineconn.max.free.time=0
2 changes: 2 additions & 0 deletions .../org/apache/linkis/manager/engineplugin/appconn/conf/AppConnEngineConnConfiguration.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,6 @@ object AppConnEngineConnConfiguration {

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

val CONCURRENT_LIMIT = CommonVars("wds.linkis.engineconn.appconn.conncurrent.limit", 100)

}
14 changes: 11 additions & 3 deletions ...a/org/apache/linkis/manager/engineplugin/appconn/executor/AppConnEngineConnExecutor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package org.apache.linkis.manager.engineplugin.appconn.executor

import java.util
import java.util.Map

import com.webank.wedatasphere.dss.appconn.core.AppConn
import com.webank.wedatasphere.dss.appconn.core.ext.OnlyDevelopmentAppConn
import com.webank.wedatasphere.dss.appconn.manager.AppConnManager
Expand All @@ -30,7 +29,7 @@ import com.webank.wedatasphere.dss.standard.app.sso.Workspace
import com.webank.wedatasphere.dss.standard.common.desc.AppInstance
import com.webank.wedatasphere.dss.standard.common.entity.ref.{AsyncResponseRef, DefaultRefFactory, ResponseRef}
import org.apache.linkis.common.utils.{OverloadUtils, Utils}
import org.apache.linkis.engineconn.computation.executor.execute.{ComputationExecutor, EngineExecutionContext}
import org.apache.linkis.engineconn.computation.executor.execute.{ComputationExecutor, ConcurrentComputationExecutor, EngineExecutionContext}
import org.apache.linkis.engineconn.launch.EngineConnServer
import org.apache.linkis.governance.common.utils.GovernanceConstant
import org.apache.linkis.manager.common.entity.resource.{CommonNodeResource, LoadResource, NodeResource}
Expand All @@ -45,10 +44,11 @@ import org.apache.linkis.protocol.engine.JobProgressInfo
import org.apache.linkis.scheduler.executer.{ErrorExecuteResponse, ExecuteResponse, SuccessExecuteResponse}
import org.apache.linkis.server.BDPJettyServerHelper
import org.apache.commons.lang.StringUtils
import org.apache.linkis.manager.engineplugin.appconn.conf.AppConnEngineConnConfiguration

import scala.beans.BeanProperty

class AppConnEngineConnExecutor(val id: Int) extends ComputationExecutor {
class AppConnEngineConnExecutor(val id: Int) extends ConcurrentComputationExecutor {

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

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

override def getConcurrentLimit: Int = {
AppConnEngineConnConfiguration.CONCURRENT_LIMIT.getValue
}

override def killAll(): Unit = {
}


}
object AppConnEngineConnExecutor {

Expand Down
8 changes: 4 additions & 4 deletions .../src/test/java/com/webank/wedatasphere/dss/apiservice/test/TestApiServiceDBOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@



@RunWith(SpringJUnit4ClassRunner.class)
//@RunWith(SpringJUnit4ClassRunner.class)
//@MapperScan(annotationClass = Repository.class, basePackages = "com.webank.wedatasphere.dss.apiservice.dao" )
@SpringBootTest(classes = {DataWorkCloudApplication.class})
//@SpringBootTest(classes = {DataWorkCloudApplication.class})
public class TestApiServiceDBOperation {
private static DbSetupTracker dbSetupTracker = new DbSetupTracker();
/*private static DbSetupTracker dbSetupTracker = new DbSetupTracker();
@Autowired
ApiService apiService;
@Autowired
Expand Down Expand Up @@ -153,5 +153,5 @@ public void testApiServiceAccessInfo() {

);

}
}*/
}
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
<xstream.version>1.4.15</xstream.version>
<jersey.version>2.16</jersey.version>
<junit.version>4.13.1</junit.version>
<mysql.version>5.1.49</mysql.version>
</properties>

<dependencyManagement>
Expand Down