Merge pull request #5 from apache/dev (35b6442f) · Commits · SUMMER2020 / students / proj-2002252

.github/workflows/ci_ut.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ jobs:
		restore-keys: \|
		${{ runner.os }}-maven-
		- name: Bootstrap database
		run: cd ${DOCKER_DIR} && docker-compose up -d db
		run: cd ${DOCKER_DIR} && docker-compose up -d
		- name: Set up JDK 1.8
		uses: actions/setup-java@v1
		with:

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/ExcelUtils.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@ import org.apache.poi.hssf.usermodel.HSSFCell;
		import org.apache.poi.hssf.usermodel.HSSFRow;
		import org.apache.poi.hssf.usermodel.HSSFSheet;
		import org.apache.poi.hssf.usermodel.HSSFWorkbook;
		import org.apache.poi.ss.usermodel.CellStyle;
		import org.apache.poi.ss.usermodel.HorizontalAlignment;
		import org.slf4j.Logger;
		import org.slf4j.LoggerFactory;

		@@ -71,10 +73,14 @@ public class ExcelUtils {
		//set the height of the first line
		row.setHeight((short)500);

		//set Horizontal right
		CellStyle cellStyle = wb.createCellStyle();
		cellStyle.setAlignment(HorizontalAlignment.RIGHT);

		//setting excel headers
		for (int i = 0; i < headerList.size(); i++) {
		HSSFCell cell = row.createCell(i);
		cell.setCellStyle(cellStyle);
		cell.setCellValue(headerList.get(i));
		}

		@@ -88,6 +94,7 @@ public class ExcelUtils {
		rowIndex++;
		for (int j = 0 ; j < values.length ; j++){
		HSSFCell cell1 = row.createCell(j);
		cell1.setCellStyle(cellStyle);
		cell1.setCellValue(String.valueOf(values[j]));
		}
		}

dolphinscheduler-alert/src/main/resources/mail_templates/alert_mail_template.ftl

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,4 +14,4 @@
		~ See the License for the specific language governing permissions and
		~ limitations under the License.
		-->
		<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'><html><head><title> dolphinscheduler</title><meta name='Keywords' content=''><meta name='Description' content=''><style type="text/css">table { margin-top:0px; padding-top:0px; border:1px solid; font-size: 14px; color: #333333; border-width: 1px; border-color: #666666; border-collapse: collapse; } table th { border-width: 1px; padding: 8px; border-style: solid; border-color: #666666; background-color: #dedede; } table td { border-width: 1px; padding: 8px; border-style: solid; border-color: #666666; background-color: #ffffff; }</style></head><body style="margin:0;padding:0"><table border="1px" cellpadding="5px" cellspacing="-10px"><thead><#if title??> ${title}</#if></thead><#if content??> ${content}</#if></table></body></html>
		No newline at end of file
		<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'><html><head><title> dolphinscheduler</title><meta name='Keywords' content=''><meta name='Description' content=''><style type="text/css">table { margin-top:0px; padding-top:0px; border:1px solid; font-size: 14px; color: #333333; border-width: 1px; border-color: #666666; border-collapse: collapse; } table th { border-width: 1px; padding: 8px; border-style: solid; border-color: #666666; background-color: #dedede; text-align: right;} table td { border-width: 1px; padding: 8px; border-style: solid; border-color: #666666; background-color: #ffffff; text-align: right;}</style></head><body style="margin:0;padding:0"><table border="1px" cellpadding="5px" cellspacing="-10px"><thead><#if title??> ${title}</#if></thead><#if content??> ${content}</#if></table></body></html>
		No newline at end of file

dolphinscheduler-dao/src/main/resources/application-dao.properties

+3 −3

Original line number	Diff line number	Diff line
		@@ -19,12 +19,12 @@
		spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
		# postgre
		spring.datasource.driver-class-name=org.postgresql.Driver
		spring.datasource.url=jdbc:postgresql://192.168.xx.xx:5432/dolphinscheduler
		spring.datasource.url=jdbc:postgresql://localhost:5432/dolphinscheduler
		# mysql
		#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
		#spring.datasource.url=jdbc:mysql://192.168.xx.xx:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8
		spring.datasource.username=xx
		spring.datasource.password=xx
		spring.datasource.username=test
		spring.datasource.password=test

		# connection configuration
		spring.datasource.initialSize=5

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/FlinkArgsUtils.java

+40 −35

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.server.utils;

		import org.apache.dolphinscheduler.common.Constants;
		import org.apache.dolphinscheduler.common.enums.ProgramType;
		import org.apache.dolphinscheduler.common.process.ResourceInfo;
		import org.apache.dolphinscheduler.common.task.flink.FlinkParameters;
		import org.apache.commons.lang.StringUtils;
		import org.slf4j.LoggerFactory;
		@@ -44,9 +45,11 @@ public class FlinkArgsUtils {
		*/
		public static List<String> buildArgs(FlinkParameters param) {
		List<String> args = new ArrayList<>();

		String deployMode = "cluster";
		if (StringUtils.isNotEmpty(param.getDeployMode())) {
		deployMode = param.getDeployMode();
		String tmpDeployMode = param.getDeployMode();
		if (StringUtils.isNotEmpty(tmpDeployMode)) {
		deployMode = tmpDeployMode;

		}
		if (!"local".equals(deployMode)) {
		@@ -54,68 +57,70 @@ public class FlinkArgsUtils {

		args.add(Constants.FLINK_YARN_CLUSTER); //yarn-cluster


		if (param.getSlot() != 0) {
		int slot = param.getSlot();
		if (slot != 0) {
		args.add(Constants.FLINK_YARN_SLOT);
		args.add(String.format("%d", param.getSlot())); //-ys
		args.add(String.format("%d", slot)); //-ys
		}

		if (StringUtils.isNotEmpty(param.getAppName())) { //-ynm
		String appName = param.getAppName();
		if (StringUtils.isNotEmpty(appName)) { //-ynm
		args.add(Constants.FLINK_APP_NAME);
		args.add(param.getAppName());
		args.add(appName);
		}

		if (param.getTaskManager() != 0) { //-yn
		int taskManager = param.getTaskManager();
		if (taskManager != 0) { //-yn
		args.add(Constants.FLINK_TASK_MANAGE);
		args.add(String.format("%d", param.getTaskManager()));
		args.add(String.format("%d", taskManager));
		}

		if (StringUtils.isNotEmpty(param.getJobManagerMemory())) {
		String jobManagerMemory = param.getJobManagerMemory();
		if (StringUtils.isNotEmpty(jobManagerMemory)) {
		args.add(Constants.FLINK_JOB_MANAGE_MEM);
		args.add(param.getJobManagerMemory()); //-yjm
		args.add(jobManagerMemory); //-yjm
		}

		if (StringUtils.isNotEmpty(param.getTaskManagerMemory())) { // -ytm
		String taskManagerMemory = param.getTaskManagerMemory();
		if (StringUtils.isNotEmpty(taskManagerMemory)) { // -ytm
		args.add(Constants.FLINK_TASK_MANAGE_MEM);
		args.add(param.getTaskManagerMemory());
		args.add(taskManagerMemory);
		}

		args.add(Constants.FLINK_detach); //-d


		}

		if (param.getProgramType() != null) {
		if (param.getProgramType() != ProgramType.PYTHON) {
		if (StringUtils.isNotEmpty(param.getMainClass())) {
		ProgramType programType = param.getProgramType();
		String mainClass = param.getMainClass();
		if (programType != null && programType != ProgramType.PYTHON && StringUtils.isNotEmpty(mainClass)) {
		args.add(Constants.FLINK_MAIN_CLASS); //-c
		args.add(param.getMainClass()); //main class
		}
		}
		}

		if (param.getMainJar() != null) {
		args.add(param.getMainJar().getRes());
		ResourceInfo mainJar = param.getMainJar();
		if (mainJar != null) {
		args.add(mainJar.getRes());
		}

		if (StringUtils.isNotEmpty(param.getMainArgs())) {
		args.add(param.getMainArgs());
		String mainArgs = param.getMainArgs();
		if (StringUtils.isNotEmpty(mainArgs)) {
		args.add(mainArgs);
		}

		// --files --conf --libjar ...
		if (StringUtils.isNotEmpty(param.getOthers())) {
		String others = param.getOthers();
		if (!others.contains("--qu")) {
		if (StringUtils.isNotEmpty(param.getQueue()) && !deployMode.equals("local")) {
		String queue = param.getQueue();
		if (StringUtils.isNotEmpty(others)) {

		if (!others.contains(Constants.FLINK_QUEUE) && StringUtils.isNotEmpty(queue) && !deployMode.equals("local")) {
		args.add(Constants.FLINK_QUEUE);
		args.add(param.getQueue());
		}
		}
		args.add(param.getOthers());
		} else if (StringUtils.isNotEmpty(param.getQueue()) && !deployMode.equals("local")) {
		args.add(others);
		} else if (StringUtils.isNotEmpty(queue) && !deployMode.equals("local")) {
		args.add(Constants.FLINK_QUEUE);
		args.add(param.getQueue());

		}

		return args;