Browse Source

[Improvement-11394][Task Plugin] Remove Passed Parameter --queue in Seatunnel Task Plugin (#11395)

3.1.0-release
Assert 2 years ago committed by GitHub
parent
commit
b3919d30e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/spark/SeatunnelSparkParameters.java
  2. 4
      dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/spark/SeatunnelSparkTask.java
  3. 14
      dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-sea-tunnel.ts
  4. 1
      dolphinscheduler-ui/src/views/projects/task/components/node/format-data.ts
  5. 1
      dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sea-tunnel.ts

9
dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/spark/SeatunnelSparkParameters.java

@ -29,7 +29,6 @@ public class SeatunnelSparkParameters extends SeatunnelParameters {
private DeployModeEnum deployMode; private DeployModeEnum deployMode;
private MasterTypeEnum master; private MasterTypeEnum master;
private String masterUrl; private String masterUrl;
private String queue;
@Override @Override
public boolean checkParameters() { public boolean checkParameters() {
@ -83,12 +82,4 @@ public class SeatunnelSparkParameters extends SeatunnelParameters {
public void setMasterUrl(String masterUrl) { public void setMasterUrl(String masterUrl) {
this.masterUrl = masterUrl; this.masterUrl = masterUrl;
} }
public String getQueue() {
return queue;
}
public void setQueue(String queue) {
this.queue = queue;
}
} }

4
dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/spark/SeatunnelSparkTask.java

@ -64,10 +64,6 @@ public class SeatunnelSparkTask extends SeatunnelTask {
args.add(seatunnelParameters.getMasterUrl()); args.add(seatunnelParameters.getMasterUrl());
} }
if (StringUtils.isNotBlank(seatunnelParameters.getQueue())) {
args.add(QUEUE_OPTIONS);
args.add(seatunnelParameters.getQueue());
}
return args; return args;
} }
} }

14
dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-sea-tunnel.ts

@ -36,13 +36,6 @@ export function useSeaTunnel(model: { [field: string]: any }): IJsonItem[] {
? 12 ? 12
: 0 : 0
) )
const queueSpan = computed(() =>
model.engine === 'SPARK' &&
model.deployMode != 'local' &&
model.master === 'YARN'
? 24
: 0
)
return [ return [
{ {
@ -107,13 +100,6 @@ export function useSeaTunnel(model: { [field: string]: any }): IJsonItem[] {
} }
} }
}, },
{
type: 'input',
field: 'queue',
name: t('project.node.sea_tunnel_queue'),
value: model.queue,
span: queueSpan
},
// SeaTunnel config parameter // SeaTunnel config parameter
{ {

1
dolphinscheduler-ui/src/views/projects/task/components/node/format-data.ts

@ -212,7 +212,6 @@ export function formatParams(data: INodeData): {
taskParams.deployMode = data.deployMode taskParams.deployMode = data.deployMode
taskParams.master = data.master taskParams.master = data.master
taskParams.masterUrl = data.masterUrl taskParams.masterUrl = data.masterUrl
taskParams.queue = data.queue
break break
default: default:
break break

1
dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sea-tunnel.ts

@ -50,7 +50,6 @@ export function useSeaTunnel({
runMode: 'RUN', runMode: 'RUN',
useCustom: true, useCustom: true,
deployMode: 'client', deployMode: 'client',
queue: 'default',
master: 'YARN', master: 'YARN',
masterUrl: '', masterUrl: '',
resourceFiles: [], resourceFiles: [],

Loading…
Cancel
Save