This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/linkis.git
from b6af5f0c3 [WIP]fix issues #4972 #4973 (#4972)
add 4217a3f7e ServiceInstance add registryTime
add 08fc461ed gateway edit and entrance api edit
add 17a59318d add method of queryFailoverJobs
add 7706a6027 entrance ha and failover
add 00777c630 Interface development of status,log,progress,kill
add 8c5774c02 failover and kill ec
add 497f8b62e failover
add da5b2b727 add log
add b624a04f0 entrance taskID
add cbfbdff07 update status limit for failover
add d7eb30227 [bug-fix] failover logic
add 88017f36d add failover log
add e32118958 push log to entrance
add 2dc0c7297 add entrance log
add fe501c65e update failover scan interval
add 170c0c984 [Bug-fix] gateway choose instance
add c91a6e865 batch update instance
add 8c55b1808 failover status changed from Running to Cancelled
add 797190400 entrance refactor failoverExecute
add ae9a17201 change updateOrderFlag
add a4a41d6d6 edit failoverJobServer
add f0755376d 1.修改获取failover实例列表，不能去除offline lable实例
2.移除retry任务时，要更新数据库instance为空
add db2f0eda5 1.日志信息增加中文描述
add dfb531afc failover时，任务主动刷日志hdfs
add 8ab841c8b
迁移刷新maxAllowRunningJobs服务，放到consumeManager里，刷新consumer里的group,而不是刷新groupFactory里的
add 1cf6321ef update name
add 789404fa2 add header
add 2a39fa380 bug - print failover ids size
add a33ad78b0 update failover log
add c172f326a update log
add 5e1712d0f code format
add 9e27aec83 set default value
add 3dda863d3 add config to properties
add ff2871919 change HashMap to Map
add 39d45d3b4 update default value
add fdc54d45c Optimal refresh consumer group maxAllowRunningJobs logic
add 0b0ef7917 rename config key
add 75eddde75 rename metric config key
add 6fee59f67 - failover server close - use logger template
add 37567a86b Remove useless references
add 71d3e089d cast string when use logger template
add 8ae8a3de4 use logger template
add cb048534a use logger template
add 800074e40 use logger template
add 2d4f78487 Update the maximum concurrency of orchestrator from 200 to
1000
add 8dafb2cdc - moved JobInstance from linkis-common to linkis-protocol -
add isInitedStr,isRunningStr method and remove uncompleteStatusArray method in
SchedulerEventState
add e624b3733 Add description
add a23b73b60 Merge branch 'dev-1.4.0' of https://github.com/apache/linkis
into dev-1.3.3-feature-ha-4181
add 94f3ec15a replace constant
add acc91db7d replace Option.apply to null
add caeeab9fc sql optimize and bug fix
add 4571c4c9e Merge branch 'master' of https://github.com/apache/linkis
into dev-1.3.3-feature-ha-4181
add 3d681fb8a merge master
add bdc3e0eb7 add comment
add 5fa73f257 add mybatis config
add c2f9d824c Optimized code
add 7a473e5e6 Merge branch 'master' of https://github.com/apache/linkis
into dev-1.3.3-feature-ha-4181
add 3db8b4afc Keyword uppercase
add eb26d59bd Remove redundant configuration
add 43531aa27 Remove `linkis.entrance.auto.clean.dirty.data.enable`
configuration
add 8da0f80e3 add config
add c97eacbec bugfix `head of empty list`
add fe9c0b2e0 rollback bugfix `head of empty list`
add 21df2de8a bugfix `head of empty list` again
add 5a5e5b37b bugfix NPE
add 9f4a9c881 bugfix `refresh maxAllowRunningJobs`
new 0453b072d [Feature] Entrance support ha and failover task
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/linkis/common/ServiceInstance.scala | 18 +-
.../linkis/common/utils/CodeAndRunTypeUtils.scala | 11 +-
.../linkis/server/conf/ServerConfiguration.scala | 3 +
.../linkis/protocol/constants/TaskConstant.java | 1 +
.../{JobProgressInfo.scala => JobInstance.scala} | 12 +-
.../linkis/protocol/utils/ZuulEntranceUtils.scala | 2 +-
.../linkis/scheduler/queue/AbstractGroup.scala | 7 +
.../scheduler/queue/SchedulerEventState.scala | 4 +
.../queue/fifoqueue/FIFOUserConsumer.scala | 21 +-
.../governance/common/entity/job/JobRequest.java | 11 +
.../common/protocol/job/JobReqProcotol.scala | 7 +
.../service/TaskExecutionServiceImpl.scala | 2 +-
.../linkis-entrance/pom.xml | 6 +
.../entrance/conf/EntranceSpringConfiguration.java | 4 +-
.../entrance/constant/ServiceNameConsts.java | 2 +
.../errorcode/EntranceErrorCodeSummary.java | 6 +-
.../entrance/restful/EntranceLabelRestfulApi.java | 20 +
.../entrance/restful/EntranceRestfulApi.java | 461 +++++++++++++++-----
.../entrance/server/DefaultEntranceServer.java | 16 +-
.../entrance/server/EntranceFailoverJobServer.java | 180 ++++++++
.../apache/linkis/entrance/EntranceServer.scala | 480 +++++++++++++++++++--
.../entrance/conf/EntranceConfiguration.scala | 40 ++
.../interceptor/impl/CustomVariableUtils.scala | 2 +-
.../interceptor/impl/UserCreatorIPCheckUtils.scala | 2 +-
.../scheduler/EntranceFIFOUserConsumer.scala | 70 +++
.../entrance/scheduler/EntranceGroupFactory.scala | 39 +-
.../EntranceParallelConsumerManager.scala | 101 +++++
.../scheduler/EntranceSchedulerContext.scala | 5 +
.../linkis/entrance/utils/JobHistoryHelper.scala | 152 ++++++-
.../linkis/templates/configmap-linkis-config.yaml | 9 +-
.../package/conf/linkis-cg-entrance.properties | 4 +-
.../package/conf/linkis-mg-gateway.properties | 4 +-
.../conf/OrchestratorConfiguration.scala | 2 +-
.../linkis/jobhistory/dao/JobHistoryMapper.java | 24 ++
.../resources/mapper/mysql/JobHistoryMapper.xml | 23 +
.../mapper/postgresql/JobHistoryMapper.xml | 22 +
.../jobhistory/service/JobHistoryQueryService.java | 2 +
.../service/impl/JobHistoryQueryServiceImpl.scala | 28 +-
.../linkis-gateway-server-support/pom.xml | 7 +
.../ujes/parser/EntranceRequestGatewayParser.scala | 59 ++-
.../http/SpringCloudGatewayHttpRequest.scala | 4 +-
41 files changed, 1652 insertions(+), 221 deletions(-)
copy
linkis-commons/linkis-protocol/src/main/scala/org/apache/linkis/protocol/engine/{JobProgressInfo.scala
=> JobInstance.scala} (84%)
create mode 100644
linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/server/EntranceFailoverJobServer.java
create mode 100644
linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/scheduler/EntranceFIFOUserConsumer.scala
create mode 100644
linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/scheduler/EntranceParallelConsumerManager.scala
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
