From 90d3469b040a5b2f55ea62612bccff0c9d8b59f1 Mon Sep 17 00:00:00 2001 From: shiyiyue1102 Date: Fri, 17 Jan 2025 16:18:27 +0800 Subject: [PATCH] fix config query notify delay (#13050) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix type search on mysql model * 灰度模型迁移程序并发&迁移不落历史表 * fix notify delay --- .../nacos/config/server/controller/ConfigServletInner.java | 2 +- .../nacos/config/server/remote/ConfigQueryRequestHandler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigServletInner.java b/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigServletInner.java index b4284c957d7..b498c465869 100755 --- a/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigServletInner.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigServletInner.java @@ -291,7 +291,7 @@ private void logPullEvent(String dataId, String group, String tenant, String req ConfigTraceService.logPullEvent(dataId, group, tenant, requestIpApp, -1, pullEvent, ConfigTraceService.PULL_TYPE_NOTFOUND, -1, clientIp, notify, "http"); } else { - long delayed = notify ? -1 : System.currentTimeMillis() - chainResponse.getLastModified(); + long delayed = System.currentTimeMillis() - chainResponse.getLastModified(); ConfigTraceService.logPullEvent(dataId, group, tenant, requestIpApp, chainResponse.getLastModified(), pullEvent, ConfigTraceService.PULL_TYPE_OK, delayed, clientIp, notify, "http"); } diff --git a/config/src/main/java/com/alibaba/nacos/config/server/remote/ConfigQueryRequestHandler.java b/config/src/main/java/com/alibaba/nacos/config/server/remote/ConfigQueryRequestHandler.java index f803df9ed47..74d56dcb10e 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/remote/ConfigQueryRequestHandler.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/remote/ConfigQueryRequestHandler.java @@ -127,7 +127,7 @@ public ConfigQueryResponse handle(ConfigQueryRequest request, RequestMeta meta) String pullEvent = resolvePullEventType(chainResponse, request.getTag()); LogUtil.PULL_CHECK_LOG.warn("{}|{}|{}|{}", groupKey, clientIp, response.getMd5(), TimeUtils.getCurrentTimeStr()); - final long delayed = notify ? -1 : System.currentTimeMillis() - response.getLastModified(); + final long delayed = System.currentTimeMillis() - response.getLastModified(); ConfigTraceService.logPullEvent(dataId, group, tenant, requestIpApp, response.getLastModified(), pullEvent, pullType, delayed, clientIp, notify, "grpc");