[bug fix] some bugs from 1.2.0 to 1.3.0 (#2676)
* fix bug: some bugs about worker group from 1.2.0 to 1.3.0 * fix bug: scheduler from 1.2.0 to 1.3.0 do not work * fix bug: scheduler from 1.2.0 to 1.3.0 do not work * fix ut bug Co-authored-by: baoliang <baoliang@analysys.com.cn>
This commit is contained in:
bao liang
GitHub
parent
3c014c5a57
commit
d99471806e
|
|
@ -35,6 +35,7 @@ public class DefaultHTMLTemplate implements AlertTemplate {
|
|||
|
||||
public static final Logger logger = LoggerFactory.getLogger(DefaultHTMLTemplate.class);
|
||||
|
||||
|
||||
@Override
|
||||
public String getMessageFromTemplate(String content, ShowType showType,boolean showAll) {
|
||||
|
||||
|
|
@ -140,7 +141,7 @@ public class DefaultHTMLTemplate implements AlertTemplate {
|
|||
checkNotNull(content);
|
||||
String htmlTableThead = StringUtils.isEmpty(title) ? "" : String.format("<thead>%s</thead>\n",title);
|
||||
|
||||
return "<!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: left;}table td {border-width: 1px;padding: 8px;border-style: solid;border-color: #666666;background-color: #ffffff;text-align: left;}</style></head><body style=\"margin:0;padding:0\"><table border=\"1px\" cellpadding=\"5px\" cellspacing=\"-10px\"> " +htmlTableThead + content +"</table></body></html>";
|
||||
return Constants.HTML_HEADER_PREFIX +htmlTableThead + content + Constants.TABLE_BODY_HTML_TAIL;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -157,6 +157,10 @@ public class Constants {
|
|||
|
||||
public static final String ENTERPRISE_WECHAT_USERS = "enterprise.wechat.users";
|
||||
|
||||
public static final String HTML_HEADER_PREFIX = "<!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: left;}table td {border-width: 1px;padding: 8px;border-style: solid;border-color: #666666;background-color: #ffffff;text-align: left;}</style></head><body style=\"margin:0;padding:0\"><table border=\"1px\" cellpadding=\"5px\" cellspacing=\"-10px\"> ";
|
||||
|
||||
public static final String TABLE_BODY_HTML_TAIL = "</table></body></html>";
|
||||
|
||||
/**
|
||||
* plugin config
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
*/
|
||||
package org.apache.dolphinscheduler.alert.template.impl;
|
||||
|
||||
import org.apache.dolphinscheduler.alert.utils.Constants;
|
||||
import org.apache.dolphinscheduler.alert.utils.JSONUtils;
|
||||
import org.apache.dolphinscheduler.common.enums.ShowType;
|
||||
import org.junit.Test;
|
||||
|
|
@ -82,42 +83,14 @@ public class DefaultHTMLTemplateTest{
|
|||
|
||||
private String generateMockTableTypeResultByHand(){
|
||||
|
||||
return "<html>\n" +
|
||||
" <head>\n" +
|
||||
" <title>dolphinscheduler</title>\n" +
|
||||
" <meta name='Keywords' content=''>\n" +
|
||||
" <meta name='Description' content=''>\n" +
|
||||
" <style type=\"text/css\">\n" +
|
||||
" table {margin-top:0px;padding-top:0px;border:1px solid;font-size: 14px;color: #333333;border-width: 1px;border-color: #666666;border-collapse: collapse;}\n" +
|
||||
" table th {border-width: 1px;padding: 8px;border-style: solid;border-color: #666666;background-color: #dedede;text-align: right;}\n" +
|
||||
" table td {border-width: 1px;padding: 8px;border-style: solid;border-color: #666666;background-color: #ffffff;text-align: right;}\n" +
|
||||
" </style>\n" +
|
||||
" </head>\n" +
|
||||
" <body style=\"margin:0;padding:0\">\n" +
|
||||
" <table border=\"1px\" cellpadding=\"5px\" cellspacing=\"-10px\">\n" +
|
||||
return Constants.HTML_HEADER_PREFIX +
|
||||
"<thead><tr><th>mysql service name</th><th>mysql address</th><th>port</th><th>no index of number</th><th>database client connections</th></tr></thead>\n" +
|
||||
"<tr><td>mysql200</td><td>192.168.xx.xx</td><td>3306</td><td>80</td><td>190</td></tr><tr><td>mysql210</td><td>192.168.xx.xx</td><td>3306</td><td>10</td><td>90</td></tr> </table>\n" +
|
||||
" </body>\n" +
|
||||
"</html>";
|
||||
"<tr><td>mysql200</td><td>192.168.xx.xx</td><td>3306</td><td>80</td><td>190</td></tr><tr><td>mysql210</td><td>192.168.xx.xx</td><td>3306</td><td>10</td><td>90</td></tr>" + Constants.TABLE_BODY_HTML_TAIL;
|
||||
|
||||
}
|
||||
|
||||
private String generateMockTextTypeResultByHand(){
|
||||
|
||||
return "<html>\n" +
|
||||
" <head>\n" +
|
||||
" <title>dolphinscheduler</title>\n" +
|
||||
" <meta name='Keywords' content=''>\n" +
|
||||
" <meta name='Description' content=''>\n" +
|
||||
" <style type=\"text/css\">\n" +
|
||||
" table {margin-top:0px;padding-top:0px;border:1px solid;font-size: 14px;color: #333333;border-width: 1px;border-color: #666666;border-collapse: collapse;}\n" +
|
||||
" table th {border-width: 1px;padding: 8px;border-style: solid;border-color: #666666;background-color: #dedede;text-align: right;}\n" +
|
||||
" table td {border-width: 1px;padding: 8px;border-style: solid;border-color: #666666;background-color: #ffffff;text-align: right;}\n" +
|
||||
" </style>\n" +
|
||||
" </head>\n" +
|
||||
" <body style=\"margin:0;padding:0\">\n" +
|
||||
" <table border=\"1px\" cellpadding=\"5px\" cellspacing=\"-10px\">\n" +
|
||||
"<tr><td>{\"mysql service name\":\"mysql200\",\"mysql address\":\"192.168.xx.xx\",\"database client connections\":\"190\",\"port\":\"3306\",\"no index of number\":\"80\"}</td></tr><tr><td>{\"mysql service name\":\"mysql210\",\"mysql address\":\"192.168.xx.xx\",\"database client connections\":\"90\",\"port\":\"3306\",\"no index of number\":\"10\"}</td></tr> </table>\n" +
|
||||
" </body>\n" +
|
||||
"</html>";
|
||||
return Constants.HTML_HEADER_PREFIX + "<tr><td>{\"mysql service name\":\"mysql200\",\"mysql address\":\"192.168.xx.xx\",\"database client connections\":\"190\",\"port\":\"3306\",\"no index of number\":\"80\"}</td></tr><tr><td>{\"mysql service name\":\"mysql210\",\"mysql address\":\"192.168.xx.xx\",\"database client connections\":\"90\",\"port\":\"3306\",\"no index of number\":\"10\"}</td></tr>" + Constants.TABLE_BODY_HTML_TAIL;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -496,6 +496,7 @@ public class MasterExecThread implements Runnable {
|
|||
}
|
||||
|
||||
String processWorkerGroup = processInstance.getWorkerGroup();
|
||||
processWorkerGroup = StringUtils.isBlank(processWorkerGroup) ? DEFAULT_WORKER_GROUP : processWorkerGroup;
|
||||
String taskWorkerGroup = StringUtils.isBlank(taskNode.getWorkerGroup()) ? processWorkerGroup : taskNode.getWorkerGroup();
|
||||
if (!processWorkerGroup.equals(DEFAULT_WORKER_GROUP) && taskWorkerGroup.equals(DEFAULT_WORKER_GROUP)) {
|
||||
taskInstance.setWorkerGroup(processWorkerGroup);
|
||||
|
|
|
|||
|
|
@ -926,6 +926,7 @@ public class ProcessService {
|
|||
command.setCommandParam(processMapStr);
|
||||
command.setCommandType(commandType);
|
||||
command.setProcessInstancePriority(parentProcessInstance.getProcessInstancePriority());
|
||||
command.setWorkerGroup(parentProcessInstance.getWorkerGroup());
|
||||
createCommand(command);
|
||||
logger.info("sub process command created: {} ", command.toString());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ import org.quartz.JobExecutionException;
|
|||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.util.Assert;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
|
|
@ -98,7 +99,8 @@ public class ProcessScheduleJob implements Job {
|
|||
command.setScheduleTime(scheduledFireTime);
|
||||
command.setStartTime(fireTime);
|
||||
command.setWarningGroupId(schedule.getWarningGroupId());
|
||||
command.setWorkerGroup(schedule.getWorkerGroup());
|
||||
String workerGroup = StringUtils.isEmpty(schedule.getWorkerGroup()) ? Constants.DEFAULT_WORKER_GROUP : schedule.getWorkerGroup();
|
||||
command.setWorkerGroup(workerGroup);
|
||||
command.setWarningType(schedule.getWarningType());
|
||||
command.setProcessInstancePriority(schedule.getProcessInstancePriority());
|
||||
|
||||
|
|
|
|||
|
|
@ -17,4 +17,5 @@
|
|||
SET sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''));
|
||||
SET FOREIGN_KEY_CHECKS=0;
|
||||
UPDATE t_ds_resources SET pid=-1,is_directory=false WHERE pid IS NULL;
|
||||
UPDATE t_ds_resources SET full_name = concat('/',alias) WHERE pid=-1 and full_name IS NULL;
|
||||
UPDATE t_ds_resources SET full_name = concat('/',alias) WHERE pid=-1 and full_name IS NULL;
|
||||
UPDATE QRTZ_JOB_DETAILS SET JOB_CLASS_NAME='org.apache.dolphinscheduler.service.quartz.ProcessScheduleJob' WHERE JOB_CLASS_NAME='org.apache.dolphinscheduler.server.quartz.ProcessScheduleJob';
|
||||
|
|
|
|||
|
|
@ -15,4 +15,5 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
UPDATE t_ds_resources SET pid=-1,is_directory=false WHERE pid IS NULL;
|
||||
UPDATE t_ds_resources SET full_name = concat('/',alias) WHERE pid=-1 and full_name IS NULL;
|
||||
UPDATE t_ds_resources SET full_name = concat('/',alias) WHERE pid=-1 and full_name IS NULL;
|
||||
UPDATE QRTZ_JOB_DETAILS SET JOB_CLASS_NAME='org.apache.dolphinscheduler.service.quartz.ProcessScheduleJob' WHERE JOB_CLASS_NAME='org.apache.dolphinscheduler.server.quartz.ProcessScheduleJob';
|
||||
Loading…
Reference in New Issue