[Bugfix] 修复mysql死锁报错 (didi#728)

RenChauncy · Nov 22, 2022 · abf488e · abf488e
1 parent b5e5ab1
commit abf488e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/.../know/streaming/km/core/service/health/checkresult/impl/HealthCheckResultServiceImpl.java b/.../know/streaming/km/core/service/health/checkresult/impl/HealthCheckResultServiceImpl.java
@@ -96,8 +96,11 @@ public void batchReplace(Long clusterPhyId, List<HealthCheckResult> healthCheckR
         Map<String, HealthCheckResult> presentHealthPoMap = healthCheckResults.stream().collect(Collectors.toMap(o -> o.getClusterPhyId() + o.getDimension() + o.getConfigName() + o.getResName(), Function.identity()));
         List<HealthCheckResultPO> dbHealthsPoList = getHealthsFromDB(healthCheckResults);
         for (HealthCheckResultPO healthCheckResultPO : dbHealthsPoList) {
-            HealthCheckResult toUpdate = presentHealthPoMap.remove(healthCheckResultPO.getClusterPhyId() + healthCheckResultPO.getDimension() + healthCheckResultPO.getConfigName() + healthCheckResultPO.getResName());
-            healthCheckResultDAO.updateByKey(this.convert2HealthCheckPo(toUpdate));
+            String key = healthCheckResultPO.getClusterPhyId() + healthCheckResultPO.getDimension() + healthCheckResultPO.getConfigName() + healthCheckResultPO.getResName();
+            if (presentHealthPoMap.containsKey(key)){
+                presentHealthPoMap.remove(key);
+                healthCheckResultDAO.updateById(healthCheckResultPO);
+            }
         }
         for (HealthCheckResult healthCheckResult : presentHealthPoMap.values()) {
             try {

diff --git a/.../java/com/xiaojukeji/know/streaming/km/persistence/mysql/health/HealthCheckResultDAO.java b/.../java/com/xiaojukeji/know/streaming/km/persistence/mysql/health/HealthCheckResultDAO.java
@@ -12,5 +12,4 @@ public interface HealthCheckResultDAO extends BaseMapper<HealthCheckResultPO> {
 
     int batchReplace(List<HealthCheckResultPO> healthCheckResultPos);
 
-    void updateByKey(HealthCheckResultPO healthCheckResultPO);
 }
diff --git a/km-persistence/src/main/resources/mybatis/HealthCheckResultMapper.xml b/km-persistence/src/main/resources/mybatis/HealthCheckResultMapper.xml
@@ -31,10 +31,5 @@
     dimension = dimension, config_name = config_name, cluster_phy_id = cluster_phy_id,
     res_name = res_name, passed = passed
   </insert>
-  <update id="updateByKey" parameterType="com.xiaojukeji.know.streaming.km.common.bean.po.health.HealthCheckResultPO">
-    UPDATE ks_km_health_check_result SET passed = #{passed}
-    WHERE cluster_phy_id = #{clusterPhyId} AND dimension = #{dimension}
-            and config_name = #{configName} AND res_name = #{resName}
-  </update>
 
 </mapper>