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] Entrance support ha and failover task #4282

Merged
merged 66 commits into from
Nov 19, 2023
Merged

[Feature] Entrance support ha and failover task #4282

merged 66 commits into from
Nov 19, 2023

Commits on Feb 28, 2023

  1. ServiceInstance add registryTime

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    4217a3f View commit details
    Browse the repository at this point in the history

  2. gateway edit and entrance api edit

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    08fc461 View commit details
    Browse the repository at this point in the history

  3. add method of queryFailoverJobs

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    17a5931 View commit details
    Browse the repository at this point in the history

  4. entrance ha and failover

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    7706a60 View commit details
    Browse the repository at this point in the history

  5. Interface development of status,log,progress,kill

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    00777c6 View commit details
    Browse the repository at this point in the history

  6. failover and kill ec

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    8c5774c View commit details
    Browse the repository at this point in the history

  7. failover

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    497f8b6 View commit details
    Browse the repository at this point in the history

  8. add log

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    da5b2b7 View commit details
    Browse the repository at this point in the history

  9. entrance taskID

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    b624a04 View commit details
    Browse the repository at this point in the history

  10. update status limit for failover

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    cbfbdff View commit details
    Browse the repository at this point in the history

  11. [bug-fix] failover logic

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    d7eb302 View commit details
    Browse the repository at this point in the history

  12. add failover log

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    88017f3 View commit details
    Browse the repository at this point in the history

  13. push log to entrance

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    e321189 View commit details
    Browse the repository at this point in the history

  14. add entrance log

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    2dc0c72 View commit details
    Browse the repository at this point in the history

  15. update failover scan interval

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    fe501c6 View commit details
    Browse the repository at this point in the history

  16. [Bug-fix] gateway choose instance

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    170c0c9 View commit details
    Browse the repository at this point in the history

  17. batch update instance

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    c91a6e8 View commit details
    Browse the repository at this point in the history

  18. failover status changed from Running to Cancelled

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    8c55b18 View commit details
    Browse the repository at this point in the history

  19. entrance refactor failoverExecute

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    7971904 View commit details
    Browse the repository at this point in the history

  20. change updateOrderFlag

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    ae9a172 View commit details
    Browse the repository at this point in the history

  21. edit failoverJobServer

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    a4a41d6 View commit details
    Browse the repository at this point in the history

  22. 1.修改获取failover实例列表，不能去除offline lable实例 

    2.移除retry任务时，要更新数据库instance为空
    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    f075537 View commit details
    Browse the repository at this point in the history

  23. 1.日志信息增加中文描述

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    db2f0ed View commit details
    Browse the repository at this point in the history

  24. failover时，任务主动刷日志hdfs

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    dfb531a View commit details
    Browse the repository at this point in the history

  25. 迁移刷新maxAllowRunningJobs服务，放到consumeManager里，刷新consumer里的group,而不是刷新gr… 

    …oupFactory里的
    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    8ab841c View commit details
    Browse the repository at this point in the history

  26. update name

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    1cf6321 View commit details
    Browse the repository at this point in the history

  27. add header

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    789404f View commit details
    Browse the repository at this point in the history

  28. bug - print failover ids size

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    2a39fa3 View commit details
    Browse the repository at this point in the history

  29. update failover log

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    a33ad78 View commit details
    Browse the repository at this point in the history

  30. update log

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    c172f32 View commit details
    Browse the repository at this point in the history

  31. code format

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    5e1712d View commit details
    Browse the repository at this point in the history

  32. set default value

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    9e27aec View commit details
    Browse the repository at this point in the history

  33. add config to properties

    @guoshupei
    guoshupei authored and guoshupei committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    3dda863 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. change HashMap to Map

    @guoshupei
    guoshupei authored and guoshupei committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    ff28719 View commit details
    Browse the repository at this point in the history

  2. update default value

    @guoshupei
    guoshupei authored and guoshupei committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    39d45d3 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2023

  1. Optimal refresh consumer group maxAllowRunningJobs logic

    @guoshupei
    guoshupei committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    fdc54d4 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2023

  1. rename config key

    @guoshupei
    guoshupei committed Mar 5, 2023
    Configuration menu
    Copy the full SHA
    0b0ef79 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2023

  1. rename metric config key

    @guoshupei
    guoshupei committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    75eddde View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2023

  1. - failover server close 

    - use logger template
    @guoshupei
    guoshupei committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    6fee59f View commit details
    Browse the repository at this point in the history

  2. Remove useless references

    @guoshupei
    guoshupei committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    37567a8 View commit details
    Browse the repository at this point in the history

  3. cast string when use logger template

    @guoshupei
    guoshupei committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    71d3e08 View commit details
    Browse the repository at this point in the history

  4. use logger template

    @guoshupei
    guoshupei committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    8ae8a3d View commit details
    Browse the repository at this point in the history

  5. use logger template

    @guoshupei
    guoshupei committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    cb04853 View commit details
    Browse the repository at this point in the history

  6. use logger template

    @guoshupei
    guoshupei committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    800074e View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2023

  1. Update the maximum concurrency of orchestrator from 200 to 1000

    @guoshupei
    guoshupei committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    2d4f784 View commit details
    Browse the repository at this point in the history

  2. - moved JobInstance from linkis-common to linkis-protocol 

    - add isInitedStr,isRunningStr method and remove uncompleteStatusArray method in SchedulerEventState
    @guoshupei
    guoshupei committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    8dafb2c View commit details
    Browse the repository at this point in the history

  3. Add description

    @guoshupei
    guoshupei committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    e624b37 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2023

  1. Merge branch 'dev-1.4.0' of https://github.com/apache/linkis into dev… 

    …-1.3.3-feature-ha-4181

� Conflicts:
�	linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/restful/EntranceRestfulApi.java
�	linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/server/DefaultEntranceServer.java
�	linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala
�	linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/JobHistoryHelper.scala
�	linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/JobHistoryMapper.java
    @guoshupei
    guoshupei committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    a23b73b View commit details
    Browse the repository at this point in the history

  2. replace constant

    @guoshupei
    guoshupei committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    94f3ec1 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2023

  1. replace Option.apply to null

    @guoshupei
    guoshupei committed Apr 10, 2023
    Configuration menu
    Copy the full SHA
    acc91db View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2023

  1. sql optimize and bug fix

    @guoshupei
    guoshupei committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    caeeab9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/apache/linkis into dev-1.… 

    …3.3-feature-ha-4181

� Conflicts:
�	linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/service/TaskExecutionServiceImpl.scala
�	linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/restful/EntranceRestfulApi.java
�	linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/server/DefaultEntranceServer.java
�	linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceServer.scala
�	linkis-dist/package/conf/linkis-cg-entrance.properties
�	linkis-dist/package/conf/linkis-mg-gateway.properties
    @guoshupei
    guoshupei committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    4571c4c View commit details
    Browse the repository at this point in the history

  3. merge master

    @guoshupei
    guoshupei committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    3d681fb View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. add comment

    @guoshupei
    guoshupei committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    bdc3e0e View commit details
    Browse the repository at this point in the history

  2. add mybatis config

    @guoshupei
    guoshupei committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    5fa73f2 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. Optimized code

    @guoshupei
    guoshupei committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    c2f9d82 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2023

  1. Merge branch 'master' of https://github.com/apache/linkis into dev-1.… 

    …3.3-feature-ha-4181

� Conflicts:
�	linkis-commons/linkis-protocol/src/main/java/org/apache/linkis/protocol/constants/TaskConstant.java
�	linkis-commons/linkis-scheduler/src/main/scala/org/apache/linkis/scheduler/queue/fifoqueue/FIFOUserConsumer.scala
    @guoshupei
    guoshupei committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    7a473e5 View commit details
    Browse the repository at this point in the history

  2. Keyword uppercase

    @guoshupei
    guoshupei committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    3db8b4a View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2023

  1. Remove redundant configuration

    @guoshupei
    guoshupei committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    eb26d59 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2023

  1. Remove linkis.entrance.auto.clean.dirty.data.enable configuration

    @guoshupei
    guoshupei committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    43531aa View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2023

  1. add config

    @guoshupei
    guoshupei committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    8da0f80 View commit details
    Browse the repository at this point in the history

  2. bugfix head of empty list

    @guoshupei
    guoshupei committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    c97eacb View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2023

  1. rollback bugfix head of empty list

    @guoshupei
    guoshupei committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    fe9c0b2 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2023

  1. bugfix head of empty list again

    @guoshupei
    guoshupei committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    21df2de View commit details
    Browse the repository at this point in the history

  2. bugfix NPE

    @guoshupei
    guoshupei committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    5a5e5b3 View commit details
    Browse the repository at this point in the history

  3. bugfix refresh maxAllowRunningJobs

    @guoshupei
    guoshupei committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    9f4a9c8 View commit details
    Browse the repository at this point in the history