Commit f643981f authored by simon824's avatar simon824
Browse files

1. change windows new line 'CR' to linux new line 'LF' 

2. Format code
parent 7d45e116

dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteAckCommand.java

+133 −1
Original line number Diff line number Diff line 
/*
 * 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.remote.command;
import com.fasterxml.jackson.annotation.JsonFormat;import org.apache.dolphinscheduler.remote.utils.JsonSerializer;
import java.io.Serializable;import java.util.Date;
/**
 *  execute task request command
 */public class TaskExecuteAckCommand implements Serializable {

    /**
     * taskInstanceId
     */
    private int taskInstanceId;

    /**
     * startTime
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
    private Date startTime;

    /**
     * host
     */
    private String host;

    /**
     * status
     */
    private int status;

    /**
     * logPath
     */
    private String logPath;

    /**
     * executePath
     */
    private String executePath;

    public Date getStartTime() {
        return startTime;
    }

    public void setStartTime(Date startTime) {
        this.startTime = startTime;
    }

    public String getHost() {
        return host;
    }

    public void setHost(String host) {
        this.host = host;
    }

    public int getStatus() {
        return status;
    }

    public void setStatus(int status) {
        this.status = status;
    }

    public int getTaskInstanceId() {
        return taskInstanceId;
    }

    public void setTaskInstanceId(int taskInstanceId) {
        this.taskInstanceId = taskInstanceId;
    }

    public String getLogPath() {
        return logPath;
    }

    public void setLogPath(String logPath) {
        this.logPath = logPath;
    }

    public String getExecutePath() {
        return executePath;
    }

    public void setExecutePath(String executePath) {
        this.executePath = executePath;
    }

    /**
     *  package request command
     *
     * @return command
     */
    public Command convert2Command(){
        Command command = new Command();
        command.setType(CommandType.TASK_EXECUTE_ACK);
        byte[] body = JsonSerializer.serialize(this);
        command.setBody(body);
        return command;
    }

    @Override
    public String toString() {
        return "TaskExecuteAckCommand{" +
                "taskInstanceId=" + taskInstanceId +
                ", startTime=" + startTime +
                ", host='" + host + '\'' +
                ", status=" + status +
                ", logPath='" + logPath + '\'' +
                ", executePath='" + executePath + '\'' +
                '}';
    }}
 
 No newline at end of file
 
/*

 * 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.remote.command;



import com.fasterxml.jackson.annotation.JsonFormat;

import org.apache.dolphinscheduler.remote.utils.JsonSerializer;



import java.io.Serializable;

import java.util.Date;



/**

 *  execute task request command

 */

public class TaskExecuteAckCommand implements Serializable {



    /**

     * taskInstanceId

     */

    private int taskInstanceId;



    /**

     * startTime

     */

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")

    private Date startTime;



    /**

     * host

     */

    private String host;



    /**

     * status

     */

    private int status;



    /**

     * logPath

     */

    private String logPath;



    /**

     * executePath

     */

    private String executePath;



    public Date getStartTime() {

        return startTime;

    }



    public void setStartTime(Date startTime) {

        this.startTime = startTime;

    }



    public String getHost() {

        return host;

    }



    public void setHost(String host) {

        this.host = host;

    }



    public int getStatus() {

        return status;

    }



    public void setStatus(int status) {

        this.status = status;

    }



    public int getTaskInstanceId() {

        return taskInstanceId;

    }



    public void setTaskInstanceId(int taskInstanceId) {

        this.taskInstanceId = taskInstanceId;

    }



    public String getLogPath() {

        return logPath;

    }



    public void setLogPath(String logPath) {

        this.logPath = logPath;

    }



    public String getExecutePath() {

        return executePath;

    }



    public void setExecutePath(String executePath) {

        this.executePath = executePath;

    }



    /**

     *  package request command

     *

     * @return command

     */

    public Command convert2Command(){

        Command command = new Command();

        command.setType(CommandType.TASK_EXECUTE_ACK);

        byte[] body = JsonSerializer.serialize(this);

        command.setBody(body);

        return command;

    }



    @Override

    public String toString() {

        return "TaskExecuteAckCommand{" +

                "taskInstanceId=" + taskInstanceId +

                ", startTime=" + startTime +

                ", host='" + host + '\'' +

                ", status=" + status +

                ", logPath='" + logPath + '\'' +

                ", executePath='" + executePath + '\'' +

                '}';

    }

}

dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteRequestCommand.java

+67 −1
Original line number Diff line number Diff line 
/*
 * 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.remote.command;
import org.apache.dolphinscheduler.remote.utils.JsonSerializer;
import java.io.Serializable;
/**
 *  execute task request command
 */public class TaskExecuteRequestCommand implements Serializable {

    /**
     *  task execution context
     */
    private String taskExecutionContext;

    public String getTaskExecutionContext() {
        return taskExecutionContext;
    }

    public void setTaskExecutionContext(String taskExecutionContext) {
        this.taskExecutionContext = taskExecutionContext;
    }

    public TaskExecuteRequestCommand() {
    }

    public TaskExecuteRequestCommand(String taskExecutionContext) {
        this.taskExecutionContext = taskExecutionContext;
    }

    /**
     *  package request command
     *
     * @return command
     */
    public Command convert2Command(){
        Command command = new Command();
        command.setType(CommandType.TASK_EXECUTE_REQUEST);
        byte[] body = JsonSerializer.serialize(this);
        command.setBody(body);
        return command;
    }

    @Override
    public String toString() {
        return "TaskExecuteRequestCommand{" +
                "taskExecutionContext='" + taskExecutionContext + '\'' +
                '}';
    }}
 
 No newline at end of file
 
/*

 * 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.remote.command;



import org.apache.dolphinscheduler.remote.utils.JsonSerializer;



import java.io.Serializable;



/**

 *  execute task request command

 */

public class TaskExecuteRequestCommand implements Serializable {



    /**

     *  task execution context

     */

    private String taskExecutionContext;



    public String getTaskExecutionContext() {

        return taskExecutionContext;

    }



    public void setTaskExecutionContext(String taskExecutionContext) {

        this.taskExecutionContext = taskExecutionContext;

    }



    public TaskExecuteRequestCommand() {

    }



    public TaskExecuteRequestCommand(String taskExecutionContext) {

        this.taskExecutionContext = taskExecutionContext;

    }



    /**

     *  package request command

     *

     * @return command

     */

    public Command convert2Command(){

        Command command = new Command();

        command.setType(CommandType.TASK_EXECUTE_REQUEST);

        byte[] body = JsonSerializer.serialize(this);

        command.setBody(body);

        return command;

    }



    @Override

    public String toString() {

        return "TaskExecuteRequestCommand{" +

                "taskExecutionContext='" + taskExecutionContext + '\'' +

                '}';

    }

}

dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteResponseCommand.java

+129 −1
Original line number Diff line number Diff line 
/*
 * 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.remote.command;
import com.fasterxml.jackson.annotation.JsonFormat;import org.apache.dolphinscheduler.remote.utils.JsonSerializer;
import java.io.Serializable;import java.util.Date;
/**
 *  execute task response command
 */public class TaskExecuteResponseCommand implements Serializable {


    public TaskExecuteResponseCommand() {
    }

    public TaskExecuteResponseCommand(int taskInstanceId) {
        this.taskInstanceId = taskInstanceId;
    }

    /**
     *  task instance id
     */
    private int taskInstanceId;

    /**
     *  status
     */
    private int status;


    /**
     *  end time
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
    private Date endTime;


    /**
     * processId
     */
    private int processId;

    /**
     * appIds
     */
    private String appIds;


    public int getTaskInstanceId() {
        return taskInstanceId;
    }

    public void setTaskInstanceId(int taskInstanceId) {
        this.taskInstanceId = taskInstanceId;
    }

    public int getStatus() {
        return status;
    }

    public void setStatus(int status) {
        this.status = status;
    }

    public Date getEndTime() {
        return endTime;
    }

    public void setEndTime(Date endTime) {
        this.endTime = endTime;
    }

    public int getProcessId() {
        return processId;
    }

    public void setProcessId(int processId) {
        this.processId = processId;
    }

    public String getAppIds() {
        return appIds;
    }

    public void setAppIds(String appIds) {
        this.appIds = appIds;
    }

    /**
     * package response command
     * @return command
     */
    public Command convert2Command(){
        Command command = new Command();
        command.setType(CommandType.TASK_EXECUTE_RESPONSE);
        byte[] body = JsonSerializer.serialize(this);
        command.setBody(body);
        return command;
    }

    @Override
    public String toString() {
        return "TaskExecuteResponseCommand{" +
                "taskInstanceId=" + taskInstanceId +
                ", status=" + status +
                ", endTime=" + endTime +
                ", processId=" + processId +
                ", appIds='" + appIds + '\'' +
                '}';
    }}
 
 No newline at end of file
 
/*

 * 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.remote.command;



import com.fasterxml.jackson.annotation.JsonFormat;

import org.apache.dolphinscheduler.remote.utils.JsonSerializer;



import java.io.Serializable;

import java.util.Date;



/**

 *  execute task response command

 */

public class TaskExecuteResponseCommand implements Serializable {





    public TaskExecuteResponseCommand() {

    }



    public TaskExecuteResponseCommand(int taskInstanceId) {

        this.taskInstanceId = taskInstanceId;

    }



    /**

     *  task instance id

     */

    private int taskInstanceId;



    /**

     *  status

     */

    private int status;





    /**

     *  end time

     */

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")

    private Date endTime;





    /**

     * processId

     */

    private int processId;



    /**

     * appIds

     */

    private String appIds;





    public int getTaskInstanceId() {

        return taskInstanceId;

    }



    public void setTaskInstanceId(int taskInstanceId) {

        this.taskInstanceId = taskInstanceId;

    }



    public int getStatus() {

        return status;

    }



    public void setStatus(int status) {

        this.status = status;

    }



    public Date getEndTime() {

        return endTime;

    }



    public void setEndTime(Date endTime) {

        this.endTime = endTime;

    }



    public int getProcessId() {

        return processId;

    }



    public void setProcessId(int processId) {

        this.processId = processId;

    }



    public String getAppIds() {

        return appIds;

    }



    public void setAppIds(String appIds) {

        this.appIds = appIds;

    }



    /**

     * package response command

     * @return command

     */

    public Command convert2Command(){

        Command command = new Command();

        command.setType(CommandType.TASK_EXECUTE_RESPONSE);

        byte[] body = JsonSerializer.serialize(this);

        command.setBody(body);

        return command;

    }



    @Override

    public String toString() {

        return "TaskExecuteResponseCommand{" +

                "taskInstanceId=" + taskInstanceId +

                ", status=" + status +

                ", endTime=" + endTime +

                ", processId=" + processId +

                ", appIds='" + appIds + '\'' +

                '}';

    }

}

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskExecuteThread.java

+1 −2
Original line number Diff line number Diff line
@@ -153,8 +153,7 @@ public class TaskExecuteThread implements Runnable { 
        // global params string

        String globalParamsStr = taskExecutionContext.getGlobalParams();

        if (globalParamsStr != null) {

            List<Property> globalParamsList = new ArrayList<>();

            globalParamsList = JSONUtils.toList(globalParamsStr, Property.class);

            List<Property> globalParamsList = JSONUtils.toList(globalParamsStr, Property.class);

            globalParamsMap.putAll(globalParamsList.stream().collect(Collectors.toMap(Property::getProp, Property::getValue)));

        }

        return globalParamsMap;

dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java

+1 −2
Original line number Diff line number Diff line
@@ -207,14 +207,13 @@ public class ProcessService { 


        if(cmdTypeMap.containsKey(commandType)){

            ObjectNode cmdParamObj = JSONUtils.parseObject(command.getCommandParam());

            ObjectNode tempObj;

            int processInstanceId = cmdParamObj.path(CMDPARAM_RECOVER_PROCESS_ID_STRING).asInt();



            List<Command> commands = commandMapper.selectList(null);

            // for all commands

            for (Command tmpCommand:commands){

                if(cmdTypeMap.containsKey(tmpCommand.getCommandType())){

                    tempObj = JSONUtils.parseObject(tmpCommand.getCommandParam());

                    ObjectNode tempObj = JSONUtils.parseObject(tmpCommand.getCommandParam());

                    if(tempObj != null && processInstanceId == tempObj.path(CMDPARAM_RECOVER_PROCESS_ID_STRING).asInt()){

                        isNeedCreate = false;

                        break;