Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge from branch 1.3.3-release #4308

Merged
merged 1,376 commits into from
Dec 25, 2020
Merged

Conversation

lgcareer
Copy link
Contributor

What is the purpose of the pull request

Merge from branch 1.3.3-release

Brief change log

Merge from branch 1.3.3-release

break60 and others added 30 commits July 23, 2020 09:32
…d of the master and worker processes (apache#3280)

* Click Cancel, the node data is restored to the original data

* Delete the pid of the master and worker processes
…if the DAG is not saved, it cannot be formatted (apache#3282)

* Click Cancel, the node data is restored to the original data

* Delete the pid of the master and worker processes

* When modifying the dag, if the DAG is not saved, it cannot be formatted
…label of DAG creation task is not displayed, the workflow cannot be formatted after saving, and the drawer style is global (apache#3284)

* Click Cancel, the node data is restored to the original data

* Delete the pid of the master and worker processes

* When modifying the dag, if the DAG is not saved, it cannot be formatted

* Fix the problem that the label of DAG creation task is not displayed, the workflow cannot be formatted after saving, and the drawer style is global
…ete condition judgment node (apache#3286)

* Click Cancel, the node data is restored to the original data

* Delete the pid of the master and worker processes

* When modifying the dag, if the DAG is not saved, it cannot be formatted

* Fix the problem that the label of DAG creation task is not displayed, the workflow cannot be formatted after saving, and the drawer style is global

* Default assignment of delete condition judgment node
…es (apache#3317)

Co-authored-by: lenboo <baoliang@analysys.com.cn>
[FIX-1336] [master] serial complement data can have multiple process instances
…l edit box (apache#3358)

* [bugFix][ui] Cannot select connection

* fix
apache#3367)

* resolve apache#3096 fixbug ambari plugin the config options which has unit doesnt write unit into config file (apache#3209)

Co-authored-by: zhangchunyang <zhangchunyang@analysys.com.cn>

* remove 1.2.1 directory and cherry pick pr 3096

* change 1.3.0 to 1.3.2 of the ambari plugin

Co-authored-by: zhangchunyang <zhangchunyang0123@gmail.com>
Co-authored-by: zhangchunyang <zhangchunyang@analysys.com.cn>
Remove the new label label function
lgcareer and others added 26 commits October 17, 2020 18:14
…sk has not been submitted, stop the master
[FIX-3615] master exit  gracefully
[fixBug-3964][ui]Switch back and forth over timeout alarm, the selected value is empty
…tance ending. (apache#3972)

Co-authored-by: baoliang <baoliang@analysys.com.cn>
…ase the file handle (apache#3975)

* [Fix-apache#3618][server] resolve task executed finished but not release the file handle

* [Fix-apache#3618][server] resolve task executed finished but not release the file handle
[Fix-apache#3958][api] files should not be created successfully in the directory of the authorized file
…pache#3982)

* fix apache#3966 sub process doesnot send alert mail after process instance ending.

* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.

* fix code smell

* fix code smell

* fix code smell

* update worker group inherit from parent

Co-authored-by: baoliang <baoliang@analysys.com.cn>
[Fix-apache#3994 ][sql-script] Pull Request fix import dolphinscheduler_mysql.sql insert admin user data
…he#3999)

* fix apache#3966 sub process doesnot send alert mail after process instance ending.

* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.

* fix code smell

* fix code smell

* fix code smell

* update worker group inherit from parent

* remove stdout in logback configuration

* fix bug apache#3929 condition task would post error when failover.

* remove unused test

* add comments

* add skip node judge

Co-authored-by: baoliang <baoliang@analysys.com.cn>
…ame tasks. (apache#4004)

* fix apache#3966 sub process doesnot send alert mail after process instance ending.

* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.

* fix code smell

* fix code smell

* fix code smell

* update worker group inherit from parent

* remove stdout in logback configuration

* fix bug apache#3929 condition task would post error when failover.

* remove unused test

* add comments

* add skip node judge

* fix bug 3929: because of no lock, start up failover would dispatch two same tasks.

Co-authored-by: baoliang <baoliang@analysys.com.cn>
@sonarcloud
Copy link

sonarcloud bot commented Dec 25, 2020

Copy link
Contributor

@davidzollo davidzollo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

@davidzollo davidzollo merged commit d8f5047 into apache:master Dec 25, 2020
lijufeng2016 added a commit to lijufeng2016/incubator-dolphinscheduler that referenced this pull request Jan 7, 2021
Merge from branch 1.3.3-release (apache#4308)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.