ai-coding/deploy-ease-platform
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.30 k8s pods查询

Browse Source
This commit is contained in:
dengqichen 2025-12-14 00:51:20 +08:00
parent 2a9b896f3f
commit 06d4be5e8a
1 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/K8sPodServiceImpl.java
View File

@ -152,7 +152,7 @@ public class K8sPodServiceImpl implements IK8sPodService {
// 4. 调用K8s API获取原始日志（获取足够多的日志以支持切片）
// 使用较大的tail值和缓冲区确保能够覆盖请求的范围
Integer effectiveTail = Math.max(2000, Math.abs(offsetFrom) + Math.abs(offsetTo) + 500);
Integer effectiveTail = Math.max(5000, Math.abs(offsetFrom) + Math.abs(offsetTo) + 1000);
String rawLogs = k8sServiceIntegration.getPodLogs(
externalSystem,
namespace.getNamespaceName(),
@ -167,6 +167,8 @@ public class K8sPodServiceImpl implements IK8sPodService {
List<com.qqchen.deploy.backend.deploy.dto.K8sLogLine> logLines =
com.qqchen.deploy.backend.deploy.utils.K8sLogParser.parseLogLines(rawLogs);
log.debug("解析到 {} 行日志", logLines.size());
// 6. 创建选择器
com.qqchen.deploy.backend.deploy.dto.K8sLogSelection selection =
new com.qqchen.deploy.backend.deploy.dto.K8sLogSelection(
@ -176,7 +178,55 @@ public class K8sPodServiceImpl implements IK8sPodService {
com.qqchen.deploy.backend.deploy.utils.K8sLogParser.LogSliceResult result =
com.qqchen.deploy.backend.deploy.utils.K8sLogParser.selectLogs(logLines, selection);
// 8. 构建响应
// 8. 验证引用点是否有效（仅对非newest/oldest模式）
if (!result.getLogs().isEmpty() &&
!referenceTimestamp.equals("newest") &&
!referenceTimestamp.equals("oldest")) {
// 获取返回日志的第一行和最后一行时间戳
String firstTimestamp = result.getLogs().get(0).getTimestamp();
String lastTimestamp = result.getLogs().get(result.getLogs().size() - 1).getTimestamp();
log.debug("引用点: {}, 返回日志范围: {} 到 {}", referenceTimestamp, firstTimestamp, lastTimestamp);
// 验证：如果是向后查询（offsetFrom > 0），返回的日志应该在引用点之后
if (offsetFrom > 0) {
// 检查第一行时间戳是否在引用点之后
if (firstTimestamp.compareTo(referenceTimestamp) <= 0) {
log.warn("引用点验证失败：返回的日志在引用点之前或等于引用点。referenceTimestamp: {}, firstTimestamp: {}, 回退到newest模式",
referenceTimestamp, firstTimestamp);
// 回退到newest模式
selection = new com.qqchen.deploy.backend.deploy.dto.K8sLogSelection("newest", -100, 0);
result = com.qqchen.deploy.backend.deploy.utils.K8sLogParser.selectLogs(logLines, selection);
}
}
// 验证：如果是向前查询（offsetTo <= 0），返回的日志应该在引用点之前
else if (offsetTo <= 0) {
// 检查最后一行时间戳是否在引用点之前
if (lastTimestamp.compareTo(referenceTimestamp) >= 0) {
log.warn("引用点验证失败：返回的日志在引用点之后或等于引用点。referenceTimestamp: {}, lastTimestamp: {}, 回退到newest模式",
referenceTimestamp, lastTimestamp);
// 回退到newest模式
selection = new com.qqchen.deploy.backend.deploy.dto.K8sLogSelection("newest", -100, 0);
result = com.qqchen.deploy.backend.deploy.utils.K8sLogParser.selectLogs(logLines, selection);
}
}
}
// 9. 如果返回空日志且不是newest/oldest模式，回退到newest模式
if (result.getLogs().isEmpty() &&
!referenceTimestamp.equals("newest") &&
!referenceTimestamp.equals("oldest")) {
log.warn("引用点定位失败，返回空日志。referenceTimestamp: {}, 回退到newest模式", referenceTimestamp);
// 回退到newest模式
selection = new com.qqchen.deploy.backend.deploy.dto.K8sLogSelection("newest", -100, 0);
result = com.qqchen.deploy.backend.deploy.utils.K8sLogParser.selectLogs(logLines, selection);
}
// 10. 构建响应
return new com.qqchen.deploy.backend.deploy.dto.K8sPodLogsResponse(
podName,
container != null ? container : "default",