Commit 7800e7b1 authored by wenmo's avatar wenmo

修复作业非remote作业进行remote语法校验的问题

parent 1a6a535e
...@@ -87,6 +87,9 @@ public class StudioServiceImpl implements StudioService { ...@@ -87,6 +87,9 @@ public class StudioServiceImpl implements StudioService {
JobConfig config = studioExecuteDTO.getJobConfig(); JobConfig config = studioExecuteDTO.getJobConfig();
// If you are using a shared session, configure the current jobmanager address // If you are using a shared session, configure the current jobmanager address
if(!config.isUseSession()) { if(!config.isUseSession()) {
if(GatewayType.LOCAL.equalsValue(config.getType())){
config.setUseRemote(false);
}
config.setAddress(clusterService.buildEnvironmentAddress(config.isUseRemote(), studioExecuteDTO.getClusterId())); config.setAddress(clusterService.buildEnvironmentAddress(config.isUseRemote(), studioExecuteDTO.getClusterId()));
} }
initUDF(config,studioExecuteDTO.getStatement()); initUDF(config,studioExecuteDTO.getStatement());
...@@ -132,6 +135,9 @@ public class StudioServiceImpl implements StudioService { ...@@ -132,6 +135,9 @@ public class StudioServiceImpl implements StudioService {
public IResult executeDDL(StudioDDLDTO studioDDLDTO) { public IResult executeDDL(StudioDDLDTO studioDDLDTO) {
JobConfig config = studioDDLDTO.getJobConfig(); JobConfig config = studioDDLDTO.getJobConfig();
if(!config.isUseSession()) { if(!config.isUseSession()) {
if(GatewayType.LOCAL.equalsValue(config.getType())){
config.setUseRemote(false);
}
config.setAddress(clusterService.buildEnvironmentAddress(config.isUseRemote(), studioDDLDTO.getClusterId())); config.setAddress(clusterService.buildEnvironmentAddress(config.isUseRemote(), studioDDLDTO.getClusterId()));
} }
JobManager jobManager = JobManager.build(config); JobManager jobManager = JobManager.build(config);
...@@ -151,6 +157,9 @@ public class StudioServiceImpl implements StudioService { ...@@ -151,6 +157,9 @@ public class StudioServiceImpl implements StudioService {
addFlinkSQLEnv(studioExecuteDTO); addFlinkSQLEnv(studioExecuteDTO);
JobConfig config = studioExecuteDTO.getJobConfig(); JobConfig config = studioExecuteDTO.getJobConfig();
if(!config.isUseSession()) { if(!config.isUseSession()) {
if(GatewayType.LOCAL.equalsValue(config.getType())){
config.setUseRemote(false);
}
config.setAddress(clusterService.buildEnvironmentAddress(config.isUseRemote(), studioExecuteDTO.getClusterId())); config.setAddress(clusterService.buildEnvironmentAddress(config.isUseRemote(), studioExecuteDTO.getClusterId()));
} }
initUDF(config,studioExecuteDTO.getStatement()); initUDF(config,studioExecuteDTO.getStatement());
...@@ -183,6 +192,9 @@ public class StudioServiceImpl implements StudioService { ...@@ -183,6 +192,9 @@ public class StudioServiceImpl implements StudioService {
JobConfig config = studioExecuteDTO.getJobConfig(); JobConfig config = studioExecuteDTO.getJobConfig();
config.setType(GatewayType.LOCAL.getLongValue()); config.setType(GatewayType.LOCAL.getLongValue());
if(!config.isUseSession()) { if(!config.isUseSession()) {
if(GatewayType.LOCAL.equalsValue(config.getType())){
config.setUseRemote(false);
}
config.setAddress(clusterService.buildEnvironmentAddress(config.isUseRemote(), studioExecuteDTO.getClusterId())); config.setAddress(clusterService.buildEnvironmentAddress(config.isUseRemote(), studioExecuteDTO.getClusterId()));
} }
JobManager jobManager = JobManager.buildPlanMode(config); JobManager jobManager = JobManager.buildPlanMode(config);
...@@ -195,6 +207,9 @@ public class StudioServiceImpl implements StudioService { ...@@ -195,6 +207,9 @@ public class StudioServiceImpl implements StudioService {
JobConfig config = studioExecuteDTO.getJobConfig(); JobConfig config = studioExecuteDTO.getJobConfig();
config.setType(GatewayType.LOCAL.getLongValue()); config.setType(GatewayType.LOCAL.getLongValue());
if(!config.isUseSession()) { if(!config.isUseSession()) {
if(GatewayType.LOCAL.equalsValue(config.getType())){
config.setUseRemote(false);
}
config.setAddress(clusterService.buildEnvironmentAddress(config.isUseRemote(), studioExecuteDTO.getClusterId())); config.setAddress(clusterService.buildEnvironmentAddress(config.isUseRemote(), studioExecuteDTO.getClusterId()));
} }
JobManager jobManager = JobManager.buildPlanMode(config); JobManager jobManager = JobManager.buildPlanMode(config);
......
...@@ -176,6 +176,9 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen ...@@ -176,6 +176,9 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
JobConfig config = task.buildSubmitConfig(); JobConfig config = task.buildSubmitConfig();
config.setJarTask(isJarTask); config.setJarTask(isJarTask);
if (!JobManager.useGateway(config.getType())) { if (!JobManager.useGateway(config.getType())) {
if(GatewayType.LOCAL.equalsValue(config.getType())){
config.setUseRemote(false);
}
config.setAddress(clusterService.buildEnvironmentAddress(config.isUseRemote(), task.getClusterId())); config.setAddress(clusterService.buildEnvironmentAddress(config.isUseRemote(), task.getClusterId()));
} else { } else {
Map<String, Object> gatewayConfig = clusterConfigurationService.getGatewayConfig(task.getClusterConfigurationId()); Map<String, Object> gatewayConfig = clusterConfigurationService.getGatewayConfig(task.getClusterConfigurationId());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment