Unverified Commit c49626b8 authored by muzhongjiang's avatar muzhongjiang Committed by GitHub
Browse files

Word spelling modification,Comment modification,Log level modification (#3180) 



* add state

* fixed bug "jackson enum conversion  : InvalidFormatException"

* Word spelling modification
Comment modification
Word spelling modification,Comment modification,Log level modification

* Update EmailManager.java

* Update FlinkParameters.java

* Update SqlTask.java

Co-authored-by: default avatarmzjnumber1@163.com <mzjnumber1@163.com>
Co-authored-by: default avatardailidong <dailidong66@gmail.com>
parent 6fa37013

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/EmailManager.java

+8 −7
Original line number Diff line number Diff line
@@ -27,28 +27,29 @@ import java.util.Map; 
public class EmailManager {

    /**

     * email send

     * @param receviersList the receiver list

     * @param receviersCcList the cc List

     * @param receiversList the receiver list

     * @param receiversCcList the cc List

     * @param title the title

     * @param content the content

     * @param showType the showType

     * @return the send result

     */

    public Map<String,Object> send(List<String> receviersList,List<String> receviersCcList,String title,String content,String showType){

    public Map<String,Object> send(List<String> receiversList,List<String> receiversCcList,String title,String content,String showType){



        return MailUtils.sendMails(receviersList, receviersCcList, title, content, showType);

        return MailUtils.sendMails(receiversList, receiversCcList, title, content, showType);

    }



    /**

     * msg send

     * @param receviersList the receiver list

     * @param receiversList the receiver list

     * @param title the title

     * @param content the content

     * @param showType the showType

     * @return the send result

     */

    public Map<String,Object> send(List<String> receviersList,String title,String content,String showType){

    public Map<String,Object> send(List<String> receiversList,String title,String content,String showType){



        return MailUtils.sendMails(receviersList,title, content, showType);

        return MailUtils.sendMails(receiversList,title, content, showType);

    }

    

}

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPlugin.java

+7 −7
Original line number Diff line number Diff line
@@ -71,32 +71,32 @@ public class EmailAlertPlugin implements AlertPlugin { 


        AlertData alert = info.getAlertData();



        List<String> receviersList = (List<String>) info.getProp(Constants.PLUGIN_DEFAULT_EMAIL_RECEIVERS);

        List<String> receiversList = (List<String>) info.getProp(Constants.PLUGIN_DEFAULT_EMAIL_RECEIVERS);



        // receiving group list

        // custom receiver

        String receivers = alert.getReceivers();

        if (StringUtils.isNotEmpty(receivers)) {

            String[] splits = receivers.split(",");

            receviersList.addAll(Arrays.asList(splits));

            receiversList.addAll(Arrays.asList(splits));

        }



        List<String> receviersCcList = new ArrayList<>();

        List<String> receiversCcList = new ArrayList<>();

        // Custom Copier

        String receiversCc = alert.getReceiversCc();

        if (StringUtils.isNotEmpty(receiversCc)) {

            String[] splits = receiversCc.split(",");

            receviersCcList.addAll(Arrays.asList(splits));

            receiversCcList.addAll(Arrays.asList(splits));

        }



        if (CollectionUtils.isEmpty(receviersList) && CollectionUtils.isEmpty(receviersCcList)) {

        if (CollectionUtils.isEmpty(receiversList) && CollectionUtils.isEmpty(receiversCcList)) {

            logger.warn("alert send error : At least one receiver address required");

            retMaps.put(Constants.STATUS, "false");

            retMaps.put(Constants.MESSAGE, "execution failure,At least one receiver address required.");

            return retMaps;

        }



        retMaps = emailManager.send(receviersList, receviersCcList, alert.getTitle(), alert.getContent(),

        retMaps = emailManager.send(receiversList, receiversCcList, alert.getTitle(), alert.getContent(),

                alert.getShowType());



        //send flag

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java

+5 −5
Original line number Diff line number Diff line
@@ -60,9 +60,9 @@ public class AlertSender { 
            users = alertDao.listUserByAlertgroupId(alert.getAlertGroupId());



            // receiving group list

            List<String> receviersList = new ArrayList<>();

            List<String> receiversList = new ArrayList<>();

            for (User user : users) {

                receviersList.add(user.getEmail());

                receiversList.add(user.getEmail());

            }



            AlertData alertData = new AlertData();
@@ -78,17 +78,17 @@ public class AlertSender { 
            AlertInfo alertInfo = new AlertInfo();

            alertInfo.setAlertData(alertData);



            alertInfo.addProp("receivers", receviersList);

            alertInfo.addProp("receivers", receiversList);



            AlertPlugin emailPlugin = pluginManager.findOne(Constants.PLUGIN_DEFAULT_EMAIL_ID);

            retMaps = emailPlugin.process(alertInfo);



            if (retMaps == null) {

                alertDao.updateAlert(AlertStatus.EXECUTION_FAILURE, "alert send error", alert.getId());

                logger.info("alert send error : return value is null");

                logger.error("alert send error : return value is null");

            } else if (!Boolean.parseBoolean(String.valueOf(retMaps.get(Constants.STATUS)))) {

                alertDao.updateAlert(AlertStatus.EXECUTION_FAILURE, String.valueOf(retMaps.get(Constants.MESSAGE)), alert.getId());

                logger.info("alert send error : {}", retMaps.get(Constants.MESSAGE));

                logger.error("alert send error : {}", retMaps.get(Constants.MESSAGE));

            } else {

                alertDao.updateAlert(AlertStatus.EXECUTION_SUCCESS, (String) retMaps.get(Constants.MESSAGE), alert.getId());

                logger.info("alert send success");

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/flink/FlinkParameters.java

+1 −4
Original line number Diff line number Diff line
@@ -19,13 +19,12 @@ package org.apache.dolphinscheduler.common.task.flink; 
import org.apache.dolphinscheduler.common.enums.ProgramType;

import org.apache.dolphinscheduler.common.process.ResourceInfo;

import org.apache.dolphinscheduler.common.task.AbstractParameters;

import org.apache.dolphinscheduler.common.utils.CollectionUtils;



import java.util.ArrayList;

import java.util.List;



/**

 * spark parameters

 * flink parameters

 */

public class FlinkParameters extends AbstractParameters {
@@ -226,6 +225,4 @@ public class FlinkParameters extends AbstractParameters { 
    }

    return resourceList;

  }





}

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java

+9 −7
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ public class SqlTask extends AbstractTask { 
            logger.info("SQL title : {}",title);

            sqlParameters.setTitle(title);

        }

        

        //new

        //replace variable TIME with $[YYYYmmddd...] in sql when history run job and batch complement job

        sql = ParameterUtils.replaceScheduleTime(sql, taskExecutionContext.getScheduleTime());
@@ -324,6 +325,7 @@ public class SqlTask extends AbstractTask { 
            }

        }

    }

    

    /**

     * create connection

     *
@@ -423,34 +425,34 @@ public class SqlTask extends AbstractTask { 
        List<User> users = alertDao.queryUserByAlertGroupId(taskExecutionContext.getSqlTaskExecutionContext().getWarningGroupId());



        // receiving group list

        List<String> receviersList = new ArrayList<>();

        List<String> receiversList = new ArrayList<>();

        for(User user:users){

            receviersList.add(user.getEmail().trim());

            receiversList.add(user.getEmail().trim());

        }

        // custom receiver

        String receivers = sqlParameters.getReceivers();

        if (StringUtils.isNotEmpty(receivers)){

            String[] splits = receivers.split(COMMA);

            for (String receiver : splits){

                receviersList.add(receiver.trim());

                receiversList.add(receiver.trim());

            }

        }



        // copy list

        List<String> receviersCcList = new ArrayList<>();

        List<String> receiversCcList = new ArrayList<>();

        // Custom Copier

        String receiversCc = sqlParameters.getReceiversCc();

        if (StringUtils.isNotEmpty(receiversCc)){

            String[] splits = receiversCc.split(COMMA);

            for (String receiverCc : splits){

                receviersCcList.add(receiverCc.trim());

                receiversCcList.add(receiverCc.trim());

            }

        }



        String showTypeName = sqlParameters.getShowType().replace(COMMA,"").trim();

        if(EnumUtils.isValidEnum(ShowType.class,showTypeName)){

            Map<String, Object> mailResult = MailUtils.sendMails(receviersList,

                    receviersCcList, title, content, ShowType.valueOf(showTypeName).getDescp());

            Map<String, Object> mailResult = MailUtils.sendMails(receiversList,

                    receiversCcList, title, content, ShowType.valueOf(showTypeName).getDescp());

            if(!(boolean) mailResult.get(STATUS)){

                throw new RuntimeException("send mail failed!");

            }