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.

Sign up for GitHub

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

Jump to bottom

[Feature-#6422] [api-server] task group queue #7491

Merged
merged 53 commits into from
Dec 24, 2021
Merged

[Feature-#6422] [api-server] task group queue #7491

merged 53 commits into from
Dec 24, 2021

Commits on Nov 4, 2021

  1. add task group

    wangxj committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    967b140 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of github.com:apache/incubator-dolphinscheduler in… 

    …to taskGroup
    wangxj committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    e8e54ea View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2021

  1. Merge branch 'dev' of github.com:apache/incubator-dolphinscheduler in… 

    …to taskGroup
    wangxj committed Nov 5, 2021
    Configuration menu
    Copy the full SHA
    d5f7e5b View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2021

  1. modify task group

    wangxj committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    e3319cf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of github.com:apache/incubator-dolphinscheduler in… 

    …to taskGroup

# Conflicts:
#	dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
#	dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java
    wangxj committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    f31cc5f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of github.com:apache/incubator-dolphinscheduler in… 

    …to taskGroup
    wangxj committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    f6468b3 View commit details
    Browse the repository at this point in the history

  4. pull dev

    wangxj committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    ddfa889 View commit details
    Browse the repository at this point in the history

  5. add license header

    wangxj committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    7e01f08 View commit details
    Browse the repository at this point in the history

  6. modify code style

    wangxj committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    10970fb View commit details
    Browse the repository at this point in the history

  7. Merge branch 'dev' of github.com:apache/incubator-dolphinscheduler in… 

    …to taskGroup
    wangxj committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    0582544 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2021

  1. fix code style

    wangxj committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    6528ce9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of github.com:apache/incubator-dolphinscheduler in… 

    …to taskGroup

# Conflicts:
#	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java
#	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
    wangxj committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    30ad405 View commit details
    Browse the repository at this point in the history

  3. fix sql error

    wangxj committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    25d97f7 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2021

  1. Merge branch 'dev' of github.com:apache/incubator-dolphinscheduler in… 

    …to taskGroup
    wangxj committed Nov 13, 2021
    Configuration menu
    Copy the full SHA
    37ebd90 View commit details
    Browse the repository at this point in the history

  2. fix error

    wangxj committed Nov 13, 2021
    Configuration menu
    Copy the full SHA
    554a813 View commit details
    Browse the repository at this point in the history

  3. fix test

    wangxj committed Nov 13, 2021
    Configuration menu
    Copy the full SHA
    509b6a7 View commit details
    Browse the repository at this point in the history

  4. fix test

    wangxj committed Nov 13, 2021
    Configuration menu
    Copy the full SHA
    c97903e View commit details
    Browse the repository at this point in the history

  5. fix test

    wangxj committed Nov 13, 2021
    Configuration menu
    Copy the full SHA
    3162950 View commit details
    Browse the repository at this point in the history

  6. fix test

    wangxj committed Nov 13, 2021
    Configuration menu
    Copy the full SHA
    399c1dc View commit details
    Browse the repository at this point in the history

  7. fix code style

    wangxj committed Nov 13, 2021
    Configuration menu
    Copy the full SHA
    6e190eb View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2021

  1. fix ut

    wangxj committed Nov 22, 2021
    Configuration menu
    Copy the full SHA
    71a75e9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of github.com:apache/incubator-dolphinscheduler in… 

    …to taskGroup

# Conflicts:
#	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/processor/queue/TaskResponseService.java
#	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/EventExecuteService.java
#	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
#	dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java
    wangxj committed Nov 22, 2021
    Configuration menu
    Copy the full SHA
    5e984b8 View commit details
    Browse the repository at this point in the history

  3. code style

    wangxj committed Nov 22, 2021
    Configuration menu
    Copy the full SHA
    af58284 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2021

  1. Merge branch 'dev' of github.com:apache/incubator-dolphinscheduler in… 

    …to taskGroup
    wangxj committed Nov 25, 2021
    Configuration menu
    Copy the full SHA
    fc18c61 View commit details
    Browse the repository at this point in the history

  2. fix unit test

    wangxj committed Nov 25, 2021
    Configuration menu
    Copy the full SHA
    ca03141 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2021

  1. test ut

    wangxj committed Nov 26, 2021
    Configuration menu
    Copy the full SHA
    0f8b962 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of github.com:apache/incubator-dolphinscheduler in… 

    …to taskGroup
    wangxj committed Nov 26, 2021
    Configuration menu
    Copy the full SHA
    77008ed View commit details
    Browse the repository at this point in the history

  3. ut

    wangxj committed Nov 26, 2021
    Configuration menu
    Copy the full SHA
    a113b3b View commit details
    Browse the repository at this point in the history

  4. add unittest

    wangxj committed Nov 26, 2021
    Configuration menu
    Copy the full SHA
    e8f8219 View commit details
    Browse the repository at this point in the history

  5. test ut

    wangxj committed Nov 26, 2021
    Configuration menu
    Copy the full SHA
    e0a3064 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2021

  1. Merge branch 'dev' of github.com:apache/incubator-dolphinscheduler in… 

    …to taskGroup
    wangxj committed Nov 28, 2021
    Configuration menu
    Copy the full SHA
    b30e06b View commit details
    Browse the repository at this point in the history

  2. modify back ut

    wangxj committed Nov 28, 2021
    Configuration menu
    Copy the full SHA
    b8a222e View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2021

  1. majorization code

    wangxj committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    80a3488 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/dev' into taskGroup 

    # Conflicts:
#	dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/CommandType.java
#	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
#	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/CommonTaskProcessor.java
    wangxj committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    d3b454f View commit details
    Browse the repository at this point in the history

  3. fix conflict

    wangxj committed Nov 30, 2021
    Configuration menu
    Copy the full SHA
    d9ba9b6 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2021

  1. Merge branch 'dev' of github.com:apache/incubator-dolphinscheduler in… 

    …to taskGroup
    wangxj committed Dec 1, 2021
    Configuration menu
    Copy the full SHA
    a4c7a6b View commit details
    Browse the repository at this point in the history

  2. fix ut

    wangxj committed Dec 1, 2021
    Configuration menu
    Copy the full SHA
    00fe466 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2021

  1. add task group api

    wangxj committed Dec 19, 2021
    Configuration menu
    Copy the full SHA
    e799f67 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of github.com:apache/incubator-dolphinscheduler in… 

    …to taskGroup

# Conflicts:
#	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskGroupController.java
#	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskGroupQueueService.java
#	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskGroupService.java
#	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupQueueServiceImpl.java
#	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupServiceImpl.java
#	dolphinscheduler-api/src/main/resources/i18n/messages_en_US.properties
#	dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TaskGroupServiceTest.java
#	dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
#	dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskGroup.java
#	dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskGroupQueue.java
#	dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TaskGroupMapper.java
#	dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TaskGroupQueueMapper.java
#	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskGroupMapper.xml
#	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskGroupQueueMapper.xml
#	dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql
#	dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql
#	dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgre.sql
#	dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
#	dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/processor/TaskEventProcessor.java
#	dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/processor/queue/StateEventResponseService.java
#	dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
#	dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/CommonTaskProcessor.java
#	dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java
    wangxj committed Dec 19, 2021
    Configuration menu
    Copy the full SHA
    b6047d7 View commit details
    Browse the repository at this point in the history

  3. reset file

    wangxj committed Dec 19, 2021
    Configuration menu
    Copy the full SHA
    b693f21 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2021

  1. fix ut

    wangxj committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    f806848 View commit details
    Browse the repository at this point in the history

  2. fix lost column

    wangxj committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    ffe3813 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2021

  1. fix ut

    wangxj committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    b85ae47 View commit details
    Browse the repository at this point in the history

  2. fix ut

    wangxj committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    197d1bd View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of github.com:apache/incubator-dolphinscheduler in… 

    …to taskGroupApi
    wangxj committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    1cf89c4 View commit details
    Browse the repository at this point in the history

  4. fix ut

    wangxj committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    16b5a75 View commit details
    Browse the repository at this point in the history

  5. fix ut

    wangxj committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    81233c2 View commit details
    Browse the repository at this point in the history

  6. delete duplicate code

    wangxj committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    4961fe3 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2021

  1. fix code style 、name

    wangxj committed Dec 22, 2021
    Configuration menu
    Copy the full SHA
    bdb5d33 View commit details
    Browse the repository at this point in the history

  2. fix ut

    wangxj committed Dec 22, 2021
    Configuration menu
    Copy the full SHA
    9eb2bbe View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of github.com:apache/incubator-dolphinscheduler in… 

    …to taskGroupApi
    wangxj committed Dec 22, 2021
    Configuration menu
    Copy the full SHA
    c482072 View commit details
    Browse the repository at this point in the history

  4. fix mapper

    wangxj committed Dec 22, 2021
    Configuration menu
    Copy the full SHA
    086a6ef View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2021

  1. Merge branch 'dev' of github.com:apache/incubator-dolphinscheduler in… 

    …to taskGroupApi
    wangxj committed Dec 24, 2021
    Configuration menu
    Copy the full SHA
    c9da913 View commit details
    Browse the repository at this point in the history