merge master

guoshupei · Aug 14, 2023 · 3d681fb · 3d681fb
1 parent 4571c4c
commit 3d681fb
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 4 deletions.
diff --git a/...inkis-entrance/src/main/java/org/apache/linkis/entrance/server/DefaultEntranceServer.java b/...inkis-entrance/src/main/java/org/apache/linkis/entrance/server/DefaultEntranceServer.java
@@ -108,7 +108,8 @@ private void shutdownEntrance(ContextClosedEvent event) {
       if (null != allUndoneTask) {
         for (EntranceJob job : allUndoneTask) {
           job.onFailure(
-              "Your job will be marked as canceled because the Entrance service restarted(因为Entrance服务重启，您的任务将被标记为取消)", null);
+              "Your job will be marked as canceled because the Entrance service restarted(因为Entrance服务重启，您的任务将被标记为取消)",
+              null);
           IOUtils.closeQuietly(((EntranceExecutionJob) job).getLogWriter().get());
         }
       }

diff --git a/...governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceServer.scala b/...governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceServer.scala
@@ -36,9 +36,9 @@ import org.apache.linkis.entrance.utils.JobHistoryHelper
 import org.apache.linkis.governance.common.conf.GovernanceCommonConf
 import org.apache.linkis.governance.common.entity.job.JobRequest
 import org.apache.linkis.governance.common.protocol.task.RequestTaskKill
+import org.apache.linkis.governance.common.utils.LoggerUtils
 import org.apache.linkis.manager.common.protocol.engine.EngineStopRequest
 import org.apache.linkis.manager.label.entity.entrance.ExecuteOnceLabel
-import org.apache.linkis.governance.common.utils.LoggerUtils
 import org.apache.linkis.protocol.constants.TaskConstant
 import org.apache.linkis.rpc.Sender
 import org.apache.linkis.rpc.conf.RPCConfiguration

diff --git a/linkis-dist/package/conf/linkis-cg-entrance.properties b/linkis-dist/package/conf/linkis-cg-entrance.properties
@@ -39,6 +39,5 @@ spring.eureka.instance.metadata-map.linkis.conf.version=v1
 linkis.entrance.auto.clean.dirty.data.enable=true
 
 
-wds.linkis.server.mybatis.mapperLocations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
 wds.linkis.server.mybatis.BasePackage=org.apache.linkis.publicservice.common.lock.dao
 wds.linkis.server.mybatis.typeAliasesPackage=org.apache.linkis.publicservice.common.lock.entity
diff --git a/linkis-dist/package/conf/linkis-mg-gateway.properties b/linkis-dist/package/conf/linkis-mg-gateway.properties
@@ -20,7 +20,6 @@ wds.linkis.gateway.conf.enable.proxy.user=false
 wds.linkis.gateway.conf.url.pass.auth=/dss/
 wds.linkis.gateway.conf.enable.token.auth=true
 wds.linkis.is.gateway=true
-wds.linkis.server.mybatis.mapperLocations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
 wds.linkis.server.mybatis.typeAliasesPackage=org.apache.linkis.instance.label.entity,org.apache.linkis.jobhistory.entity
 wds.linkis.server.mybatis.BasePackage=org.apache.linkis.instance.label.dao,org.apache.linkis.gateway.authentication.dao,org.apache.linkis.jobhistory.dao
 wds.linkis.label.entity.packages=org.apache.linkis.gateway.ujes.route.label

diff --git a/...-enhancements/linkis-jobhistory/src/main/resources/mapper/postgresql/JobHistoryMapper.xml b/...-enhancements/linkis-jobhistory/src/main/resources/mapper/postgresql/JobHistoryMapper.xml
@@ -229,4 +229,26 @@
             #{id}
         </foreach>
     </update>
+    <select id="selectFailoverJobHistory" resultMap="jobHistoryMap" >
+        SELECT a.* FROM linkis_ps_job_history_group_history a
+        where (
+            a.instances = ''
+            or a.instances is null
+            or a.instances not in <foreach collection="instancesMap.keys" open="(" separator="," close=")" item="key">#{key}</foreach>
+            or EXISTS (
+                select 1 from
+                (
+                    <foreach collection="instancesMap.entrySet()" separator="union all" index="key" item="val">
+                        select #{key} as instances, #{val} as registryTime
+                    </foreach>
+                ) b
+                where a.instances = b.instances and a.created_time <![CDATA[<]]> FROM_UNIXTIME(b.registryTime/1000)
+            )
+        )
+        and
+        status in <foreach collection="statusList" open="(" separator="," close=")" item="status">#{status}</foreach>
+        <if test="startTimestamp != null and startTimestamp > 0">and a.created_time >= FROM_UNIXTIME(#{startTimestamp}/1000)</if>
+        <if test="limit != null and limit > 0">limit #{limit}</if>
+
+    </select>
 </mapper>