|
|
|
/*
|
|
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
|
|
* contributor license agreements. See the NOTICE file distributed with
|
|
|
|
* this work for additional information regarding copyright ownership.
|
|
|
|
* The ASF licenses this file to You under the Apache License, Version 2.0
|
|
|
|
* (the "License"); you may not use this file except in compliance with
|
|
|
|
* the License. You may obtain a copy of the License at
|
|
|
|
*
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
*
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
* limitations under the License.
|
|
|
|
*/
|
|
|
|
|
|
|
|
package org.apache.dolphinscheduler.plugin.task.spark;
|
|
|
|
|
|
|
|
import org.apache.dolphinscheduler.plugin.task.api.AbstractYarnTask;
|
[SPI][TASK]TaskPlugin (#6122)
* [Improvement][dao]When I search for the keyword description, the web UI shows empty (#5952)
* [Bug][WorkerServer] SqlTask NullPointerException #5549
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword description, the web UI shows empty #5428
* fix the readme typing issue (#5998)
* Fix unchecked type conversions
* Use indentation level reported by checkstyle
* Reorganize CI workflows to fasten the wasted time and resources (#6011)
* Add standalone server module to make it easier to develop (#6022)
* Task node of SWITCH (#5939)
* [Feature-#5273][server-master] Task node of SWITCH (#5922)
Co-authored-by: wangxj <wangxj31>
* remove description of bonecp (#6030)
Co-authored-by: shaojwu <shaojwu@ebay.com>
* [Improvement][Api Module]split alert group list-paging interface (#5941)
* [Improvement][Api Module]split alert group list-paging interface
* [FIX-#6007]Wrong complement date (#6026)
* [FIX-#6007]Wrong complement date
* [style]Wrong complement date
* [Improvement-6024][dist] Remove useless packaging commands (#6029)
·Remove useless packaging commands in dolphinscheduler-bin.xml
This closes #6024
Co-authored-by: mask <liuhu@zhiyoutec.com>
* [FIX-5908][MasterServer] When executing an compensation task, the execution thread would have a NPE (#5909)
* fix the npe in MasterExec
* fix the compile error
* Add `.asf.yaml` to easily set the GitHub metadata (#6035)
* fix dead server cannot stop (#6046)
* Enhancement Translation (#6042)
* replaced Loading... with i18n
* modified Edit zh_CN translation
* Delete zh_CN.js
Co-authored-by: David <dailidong66@gmail.com>
* fix bug #6053 zh_CN.js is lost
* [Fix-6038][ui] width of "SQL Statement" in Dag FormLineModal will be shrunk if sql line is too long (#6040)
This closes #6038
* [Improvement] Fix inefficient map iterator (#6004)
* Fix inefficient map iterator
* Use forEach and remove call to valueOf
* Modify AbstractParameters
* Enhance `StandaloneServer` so that we don't need to update the version number manually (#6074)
* Remove invalid character in `.asf.yaml` (#6075)
* Remove invalid character `\n` in `.asf.yaml` (#6077)
It turns out that the invalid character is `\n`
* Add alert server into standalone-server as well and some minor polish (#6087)
* Support starting standalone server in Docker image (#6102)
Also remove unused class
* [Feature-4355][Master-Worker-API] improvements of master and scheduler module (#6095)
* [Feature-4355][Master-Worker-API] improvements of master and scheduler module (#6085)
* master refactor:
1. spi for task submit and other actions(pause, kill)
2. remove threads for process instance and task instance.
3. add events for process instance and task instance
* ut npe
* add try catch
* code style
* fix critical bugs
* fix critical bugs
* fix critical bugs
* fix critical bugs
* Remove unused params in SwitchTaskTest (#6109)
* [Feature-5987][Server] Support to set multiple environment configs for a certain worker. (#6082)
* support multi environments
* add some test cases
* add an environment vue component
* improve environment form
* improve environment form
* add environment worker group relation
* add environment worker group relation
* add the environment choice for formModel
* set an environment for the task
* modify the modal form of starting process
* add the environment config to TaskExecutionContext
* add the environment config to the timing form
* fix conflicts
* fix issues of the code style
* fix some issues of the code style
* fix some issues of the code style
* fix some issues of the code style
* fix some issues of the code style
* fix some issues of the code style
* fix some bugs in the code review
* add the same table and columns to support H2
* fix some bugs
* [Plugin][Task]Task Spi
* [Plugin][Task]Task Spi
* [Plugin][Task]Task Spi
* [Plugin][Task]Task Spi
* [Plugin][Task]Task Spi
* [Plugin][Task]Task Spi
Co-authored-by: didiaode18 <563646039@qq.com>
Co-authored-by: Roy <yongjuncao1213@gmail.com>
Co-authored-by: lyxell <alyxell@kth.se>
Co-authored-by: Wenjun Ruan <wenjun@apache.org>
Co-authored-by: kezhenxu94 <kezhenxu94@apache.org>
Co-authored-by: myangle1120 <942542838@qq.com>
Co-authored-by: wangxj3 <857234426@qq.com>
Co-authored-by: gabry.wu <gabrywu@apache.org>
Co-authored-by: shaojwu <shaojwu@ebay.com>
Co-authored-by: Shukun Zhang <60541766+andream7@users.noreply.github.com>
Co-authored-by: linquan <1175687813@qq.com>
Co-authored-by: mask <39329477+Narcasserun@users.noreply.github.com>
Co-authored-by: mask <liuhu@zhiyoutec.com>
Co-authored-by: kyoty <echohlne@gmail.com>
Co-authored-by: RichardStark <49977764+RichardStark@users.noreply.github.com>
Co-authored-by: David <dailidong66@gmail.com>
Co-authored-by: lenboo <baoliang.leon@gmail.com>
Co-authored-by: lilyzhou <lj_zhou@outlook.com>
Co-authored-by: OS <29528966+lenboo@users.noreply.github.com>
Co-authored-by: junfan.zhang <zuston.shacha@gmail.com>
Co-authored-by: Hua Jiang <jianghuachinacom@163.com>
3 years ago
|
|
|
import org.apache.dolphinscheduler.plugin.task.util.MapUtils;
|
|
|
|
import org.apache.dolphinscheduler.spi.task.AbstractParameters;
|
|
|
|
import org.apache.dolphinscheduler.spi.task.Property;
|
|
|
|
import org.apache.dolphinscheduler.spi.task.ResourceInfo;
|
|
|
|
import org.apache.dolphinscheduler.spi.task.paramparser.ParamUtils;
|
|
|
|
import org.apache.dolphinscheduler.spi.task.paramparser.ParameterUtils;
|
|
|
|
import org.apache.dolphinscheduler.spi.task.request.TaskRequest;
|
|
|
|
import org.apache.dolphinscheduler.spi.utils.JSONUtils;
|
|
|
|
|
|
|
|
import java.util.ArrayList;
|
[SPI][TASK]TaskPlugin (#6122)
* [Improvement][dao]When I search for the keyword description, the web UI shows empty (#5952)
* [Bug][WorkerServer] SqlTask NullPointerException #5549
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword description, the web UI shows empty #5428
* fix the readme typing issue (#5998)
* Fix unchecked type conversions
* Use indentation level reported by checkstyle
* Reorganize CI workflows to fasten the wasted time and resources (#6011)
* Add standalone server module to make it easier to develop (#6022)
* Task node of SWITCH (#5939)
* [Feature-#5273][server-master] Task node of SWITCH (#5922)
Co-authored-by: wangxj <wangxj31>
* remove description of bonecp (#6030)
Co-authored-by: shaojwu <shaojwu@ebay.com>
* [Improvement][Api Module]split alert group list-paging interface (#5941)
* [Improvement][Api Module]split alert group list-paging interface
* [FIX-#6007]Wrong complement date (#6026)
* [FIX-#6007]Wrong complement date
* [style]Wrong complement date
* [Improvement-6024][dist] Remove useless packaging commands (#6029)
·Remove useless packaging commands in dolphinscheduler-bin.xml
This closes #6024
Co-authored-by: mask <liuhu@zhiyoutec.com>
* [FIX-5908][MasterServer] When executing an compensation task, the execution thread would have a NPE (#5909)
* fix the npe in MasterExec
* fix the compile error
* Add `.asf.yaml` to easily set the GitHub metadata (#6035)
* fix dead server cannot stop (#6046)
* Enhancement Translation (#6042)
* replaced Loading... with i18n
* modified Edit zh_CN translation
* Delete zh_CN.js
Co-authored-by: David <dailidong66@gmail.com>
* fix bug #6053 zh_CN.js is lost
* [Fix-6038][ui] width of "SQL Statement" in Dag FormLineModal will be shrunk if sql line is too long (#6040)
This closes #6038
* [Improvement] Fix inefficient map iterator (#6004)
* Fix inefficient map iterator
* Use forEach and remove call to valueOf
* Modify AbstractParameters
* Enhance `StandaloneServer` so that we don't need to update the version number manually (#6074)
* Remove invalid character in `.asf.yaml` (#6075)
* Remove invalid character `\n` in `.asf.yaml` (#6077)
It turns out that the invalid character is `\n`
* Add alert server into standalone-server as well and some minor polish (#6087)
* Support starting standalone server in Docker image (#6102)
Also remove unused class
* [Feature-4355][Master-Worker-API] improvements of master and scheduler module (#6095)
* [Feature-4355][Master-Worker-API] improvements of master and scheduler module (#6085)
* master refactor:
1. spi for task submit and other actions(pause, kill)
2. remove threads for process instance and task instance.
3. add events for process instance and task instance
* ut npe
* add try catch
* code style
* fix critical bugs
* fix critical bugs
* fix critical bugs
* fix critical bugs
* Remove unused params in SwitchTaskTest (#6109)
* [Feature-5987][Server] Support to set multiple environment configs for a certain worker. (#6082)
* support multi environments
* add some test cases
* add an environment vue component
* improve environment form
* improve environment form
* add environment worker group relation
* add environment worker group relation
* add the environment choice for formModel
* set an environment for the task
* modify the modal form of starting process
* add the environment config to TaskExecutionContext
* add the environment config to the timing form
* fix conflicts
* fix issues of the code style
* fix some issues of the code style
* fix some issues of the code style
* fix some issues of the code style
* fix some issues of the code style
* fix some issues of the code style
* fix some bugs in the code review
* add the same table and columns to support H2
* fix some bugs
* [Plugin][Task]Task Spi
* [Plugin][Task]Task Spi
* [Plugin][Task]Task Spi
* [Plugin][Task]Task Spi
* [Plugin][Task]Task Spi
* [Plugin][Task]Task Spi
Co-authored-by: didiaode18 <563646039@qq.com>
Co-authored-by: Roy <yongjuncao1213@gmail.com>
Co-authored-by: lyxell <alyxell@kth.se>
Co-authored-by: Wenjun Ruan <wenjun@apache.org>
Co-authored-by: kezhenxu94 <kezhenxu94@apache.org>
Co-authored-by: myangle1120 <942542838@qq.com>
Co-authored-by: wangxj3 <857234426@qq.com>
Co-authored-by: gabry.wu <gabrywu@apache.org>
Co-authored-by: shaojwu <shaojwu@ebay.com>
Co-authored-by: Shukun Zhang <60541766+andream7@users.noreply.github.com>
Co-authored-by: linquan <1175687813@qq.com>
Co-authored-by: mask <39329477+Narcasserun@users.noreply.github.com>
Co-authored-by: mask <liuhu@zhiyoutec.com>
Co-authored-by: kyoty <echohlne@gmail.com>
Co-authored-by: RichardStark <49977764+RichardStark@users.noreply.github.com>
Co-authored-by: David <dailidong66@gmail.com>
Co-authored-by: lenboo <baoliang.leon@gmail.com>
Co-authored-by: lilyzhou <lj_zhou@outlook.com>
Co-authored-by: OS <29528966+lenboo@users.noreply.github.com>
Co-authored-by: junfan.zhang <zuston.shacha@gmail.com>
Co-authored-by: Hua Jiang <jianghuachinacom@163.com>
3 years ago
|
|
|
import java.util.HashMap;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.Map;
|
|
|
|
|
|
|
|
public class SparkTask extends AbstractYarnTask {
|
|
|
|
|
|
|
|
/**
|
|
|
|
* spark parameters
|
|
|
|
*/
|
|
|
|
private SparkParameters sparkParameters;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* taskExecutionContext
|
|
|
|
*/
|
|
|
|
private TaskRequest taskExecutionContext;
|
|
|
|
|
|
|
|
public SparkTask(TaskRequest taskExecutionContext) {
|
|
|
|
super(taskExecutionContext);
|
|
|
|
this.taskExecutionContext = taskExecutionContext;
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public void init() {
|
|
|
|
|
|
|
|
logger.info("spark task params {}", taskExecutionContext.getTaskParams());
|
|
|
|
|
|
|
|
sparkParameters = JSONUtils.parseObject(taskExecutionContext.getTaskParams(), SparkParameters.class);
|
|
|
|
|
|
|
|
if (null == sparkParameters) {
|
|
|
|
logger.error("Spark params is null");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!sparkParameters.checkParameters()) {
|
|
|
|
throw new RuntimeException("spark task params is not valid");
|
|
|
|
}
|
|
|
|
sparkParameters.setQueue(taskExecutionContext.getQueue());
|
|
|
|
setMainJarName();
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* create command
|
|
|
|
* @return command
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
protected String buildCommand() {
|
|
|
|
// spark-submit [options] <app jar | python file> [app arguments]
|
|
|
|
List<String> args = new ArrayList<>();
|
|
|
|
|
|
|
|
// spark version
|
|
|
|
String sparkCommand = SparkVersion.SPARK2.getCommand();
|
|
|
|
|
|
|
|
if (SparkVersion.SPARK1.name().equals(sparkParameters.getSparkVersion())) {
|
|
|
|
sparkCommand = SparkVersion.SPARK1.getCommand();
|
|
|
|
}
|
|
|
|
|
|
|
|
args.add(sparkCommand);
|
|
|
|
|
|
|
|
// other parameters
|
|
|
|
args.addAll(SparkArgsUtils.buildArgs(sparkParameters));
|
|
|
|
|
|
|
|
// replace placeholder, and combining local and global parameters
|
|
|
|
Map<String, Property> paramsMap = ParamUtils.convert(taskExecutionContext,getParameters());
|
[SPI][TASK]TaskPlugin (#6122)
* [Improvement][dao]When I search for the keyword description, the web UI shows empty (#5952)
* [Bug][WorkerServer] SqlTask NullPointerException #5549
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword description, the web UI shows empty #5428
* fix the readme typing issue (#5998)
* Fix unchecked type conversions
* Use indentation level reported by checkstyle
* Reorganize CI workflows to fasten the wasted time and resources (#6011)
* Add standalone server module to make it easier to develop (#6022)
* Task node of SWITCH (#5939)
* [Feature-#5273][server-master] Task node of SWITCH (#5922)
Co-authored-by: wangxj <wangxj31>
* remove description of bonecp (#6030)
Co-authored-by: shaojwu <shaojwu@ebay.com>
* [Improvement][Api Module]split alert group list-paging interface (#5941)
* [Improvement][Api Module]split alert group list-paging interface
* [FIX-#6007]Wrong complement date (#6026)
* [FIX-#6007]Wrong complement date
* [style]Wrong complement date
* [Improvement-6024][dist] Remove useless packaging commands (#6029)
·Remove useless packaging commands in dolphinscheduler-bin.xml
This closes #6024
Co-authored-by: mask <liuhu@zhiyoutec.com>
* [FIX-5908][MasterServer] When executing an compensation task, the execution thread would have a NPE (#5909)
* fix the npe in MasterExec
* fix the compile error
* Add `.asf.yaml` to easily set the GitHub metadata (#6035)
* fix dead server cannot stop (#6046)
* Enhancement Translation (#6042)
* replaced Loading... with i18n
* modified Edit zh_CN translation
* Delete zh_CN.js
Co-authored-by: David <dailidong66@gmail.com>
* fix bug #6053 zh_CN.js is lost
* [Fix-6038][ui] width of "SQL Statement" in Dag FormLineModal will be shrunk if sql line is too long (#6040)
This closes #6038
* [Improvement] Fix inefficient map iterator (#6004)
* Fix inefficient map iterator
* Use forEach and remove call to valueOf
* Modify AbstractParameters
* Enhance `StandaloneServer` so that we don't need to update the version number manually (#6074)
* Remove invalid character in `.asf.yaml` (#6075)
* Remove invalid character `\n` in `.asf.yaml` (#6077)
It turns out that the invalid character is `\n`
* Add alert server into standalone-server as well and some minor polish (#6087)
* Support starting standalone server in Docker image (#6102)
Also remove unused class
* [Feature-4355][Master-Worker-API] improvements of master and scheduler module (#6095)
* [Feature-4355][Master-Worker-API] improvements of master and scheduler module (#6085)
* master refactor:
1. spi for task submit and other actions(pause, kill)
2. remove threads for process instance and task instance.
3. add events for process instance and task instance
* ut npe
* add try catch
* code style
* fix critical bugs
* fix critical bugs
* fix critical bugs
* fix critical bugs
* Remove unused params in SwitchTaskTest (#6109)
* [Feature-5987][Server] Support to set multiple environment configs for a certain worker. (#6082)
* support multi environments
* add some test cases
* add an environment vue component
* improve environment form
* improve environment form
* add environment worker group relation
* add environment worker group relation
* add the environment choice for formModel
* set an environment for the task
* modify the modal form of starting process
* add the environment config to TaskExecutionContext
* add the environment config to the timing form
* fix conflicts
* fix issues of the code style
* fix some issues of the code style
* fix some issues of the code style
* fix some issues of the code style
* fix some issues of the code style
* fix some issues of the code style
* fix some bugs in the code review
* add the same table and columns to support H2
* fix some bugs
* [Plugin][Task]Task Spi
* [Plugin][Task]Task Spi
* [Plugin][Task]Task Spi
* [Plugin][Task]Task Spi
* [Plugin][Task]Task Spi
* [Plugin][Task]Task Spi
Co-authored-by: didiaode18 <563646039@qq.com>
Co-authored-by: Roy <yongjuncao1213@gmail.com>
Co-authored-by: lyxell <alyxell@kth.se>
Co-authored-by: Wenjun Ruan <wenjun@apache.org>
Co-authored-by: kezhenxu94 <kezhenxu94@apache.org>
Co-authored-by: myangle1120 <942542838@qq.com>
Co-authored-by: wangxj3 <857234426@qq.com>
Co-authored-by: gabry.wu <gabrywu@apache.org>
Co-authored-by: shaojwu <shaojwu@ebay.com>
Co-authored-by: Shukun Zhang <60541766+andream7@users.noreply.github.com>
Co-authored-by: linquan <1175687813@qq.com>
Co-authored-by: mask <39329477+Narcasserun@users.noreply.github.com>
Co-authored-by: mask <liuhu@zhiyoutec.com>
Co-authored-by: kyoty <echohlne@gmail.com>
Co-authored-by: RichardStark <49977764+RichardStark@users.noreply.github.com>
Co-authored-by: David <dailidong66@gmail.com>
Co-authored-by: lenboo <baoliang.leon@gmail.com>
Co-authored-by: lilyzhou <lj_zhou@outlook.com>
Co-authored-by: OS <29528966+lenboo@users.noreply.github.com>
Co-authored-by: junfan.zhang <zuston.shacha@gmail.com>
Co-authored-by: Hua Jiang <jianghuachinacom@163.com>
3 years ago
|
|
|
if (MapUtils.isEmpty(paramsMap)) {
|
|
|
|
paramsMap = new HashMap<>();
|
|
|
|
}
|
[SPI][TASK]TaskPlugin (#6122)
* [Improvement][dao]When I search for the keyword description, the web UI shows empty (#5952)
* [Bug][WorkerServer] SqlTask NullPointerException #5549
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword description, the web UI shows empty #5428
* fix the readme typing issue (#5998)
* Fix unchecked type conversions
* Use indentation level reported by checkstyle
* Reorganize CI workflows to fasten the wasted time and resources (#6011)
* Add standalone server module to make it easier to develop (#6022)
* Task node of SWITCH (#5939)
* [Feature-#5273][server-master] Task node of SWITCH (#5922)
Co-authored-by: wangxj <wangxj31>
* remove description of bonecp (#6030)
Co-authored-by: shaojwu <shaojwu@ebay.com>
* [Improvement][Api Module]split alert group list-paging interface (#5941)
* [Improvement][Api Module]split alert group list-paging interface
* [FIX-#6007]Wrong complement date (#6026)
* [FIX-#6007]Wrong complement date
* [style]Wrong complement date
* [Improvement-6024][dist] Remove useless packaging commands (#6029)
·Remove useless packaging commands in dolphinscheduler-bin.xml
This closes #6024
Co-authored-by: mask <liuhu@zhiyoutec.com>
* [FIX-5908][MasterServer] When executing an compensation task, the execution thread would have a NPE (#5909)
* fix the npe in MasterExec
* fix the compile error
* Add `.asf.yaml` to easily set the GitHub metadata (#6035)
* fix dead server cannot stop (#6046)
* Enhancement Translation (#6042)
* replaced Loading... with i18n
* modified Edit zh_CN translation
* Delete zh_CN.js
Co-authored-by: David <dailidong66@gmail.com>
* fix bug #6053 zh_CN.js is lost
* [Fix-6038][ui] width of "SQL Statement" in Dag FormLineModal will be shrunk if sql line is too long (#6040)
This closes #6038
* [Improvement] Fix inefficient map iterator (#6004)
* Fix inefficient map iterator
* Use forEach and remove call to valueOf
* Modify AbstractParameters
* Enhance `StandaloneServer` so that we don't need to update the version number manually (#6074)
* Remove invalid character in `.asf.yaml` (#6075)
* Remove invalid character `\n` in `.asf.yaml` (#6077)
It turns out that the invalid character is `\n`
* Add alert server into standalone-server as well and some minor polish (#6087)
* Support starting standalone server in Docker image (#6102)
Also remove unused class
* [Feature-4355][Master-Worker-API] improvements of master and scheduler module (#6095)
* [Feature-4355][Master-Worker-API] improvements of master and scheduler module (#6085)
* master refactor:
1. spi for task submit and other actions(pause, kill)
2. remove threads for process instance and task instance.
3. add events for process instance and task instance
* ut npe
* add try catch
* code style
* fix critical bugs
* fix critical bugs
* fix critical bugs
* fix critical bugs
* Remove unused params in SwitchTaskTest (#6109)
* [Feature-5987][Server] Support to set multiple environment configs for a certain worker. (#6082)
* support multi environments
* add some test cases
* add an environment vue component
* improve environment form
* improve environment form
* add environment worker group relation
* add environment worker group relation
* add the environment choice for formModel
* set an environment for the task
* modify the modal form of starting process
* add the environment config to TaskExecutionContext
* add the environment config to the timing form
* fix conflicts
* fix issues of the code style
* fix some issues of the code style
* fix some issues of the code style
* fix some issues of the code style
* fix some issues of the code style
* fix some issues of the code style
* fix some bugs in the code review
* add the same table and columns to support H2
* fix some bugs
* [Plugin][Task]Task Spi
* [Plugin][Task]Task Spi
* [Plugin][Task]Task Spi
* [Plugin][Task]Task Spi
* [Plugin][Task]Task Spi
* [Plugin][Task]Task Spi
Co-authored-by: didiaode18 <563646039@qq.com>
Co-authored-by: Roy <yongjuncao1213@gmail.com>
Co-authored-by: lyxell <alyxell@kth.se>
Co-authored-by: Wenjun Ruan <wenjun@apache.org>
Co-authored-by: kezhenxu94 <kezhenxu94@apache.org>
Co-authored-by: myangle1120 <942542838@qq.com>
Co-authored-by: wangxj3 <857234426@qq.com>
Co-authored-by: gabry.wu <gabrywu@apache.org>
Co-authored-by: shaojwu <shaojwu@ebay.com>
Co-authored-by: Shukun Zhang <60541766+andream7@users.noreply.github.com>
Co-authored-by: linquan <1175687813@qq.com>
Co-authored-by: mask <39329477+Narcasserun@users.noreply.github.com>
Co-authored-by: mask <liuhu@zhiyoutec.com>
Co-authored-by: kyoty <echohlne@gmail.com>
Co-authored-by: RichardStark <49977764+RichardStark@users.noreply.github.com>
Co-authored-by: David <dailidong66@gmail.com>
Co-authored-by: lenboo <baoliang.leon@gmail.com>
Co-authored-by: lilyzhou <lj_zhou@outlook.com>
Co-authored-by: OS <29528966+lenboo@users.noreply.github.com>
Co-authored-by: junfan.zhang <zuston.shacha@gmail.com>
Co-authored-by: Hua Jiang <jianghuachinacom@163.com>
3 years ago
|
|
|
if (MapUtils.isNotEmpty(taskExecutionContext.getParamsMap())) {
|
|
|
|
paramsMap.putAll(taskExecutionContext.getParamsMap());
|
|
|
|
}
|
|
|
|
|
|
|
|
String command = ParameterUtils.convertParameterPlaceholders(String.join(" ", args), ParamUtils.convert(paramsMap));
|
|
|
|
|
|
|
|
logger.info("spark task command: {}", command);
|
|
|
|
|
|
|
|
return command;
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
protected void setMainJarName() {
|
|
|
|
// main jar
|
|
|
|
ResourceInfo mainJar = sparkParameters.getMainJar();
|
|
|
|
String resourceName = getResourceNameOfMainJar(mainJar);
|
|
|
|
mainJar.setRes(resourceName);
|
|
|
|
sparkParameters.setMainJar(mainJar);
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public AbstractParameters getParameters() {
|
|
|
|
return sparkParameters;
|
|
|
|
}
|
|
|
|
}
|