Skip to content

Commit

Permalink
Merge pull request #3372 from wangyu096/issue_3371
Browse files Browse the repository at this point in the history
feat: 优化分库分表日志输出 #3371
  • Loading branch information
wangyu096 authored Jan 8, 2025
2 parents cbb392e + 2b02004 commit 3c29bb9
Showing 1 changed file with 0 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ public static Condition build(Long taskInstanceId,
ToggleEvaluateContext toggleEvaluateContext;
JobExecuteContext jobExecuteContext = JobExecuteContextThreadLocalRepo.get();
if (jobExecuteContext == null) {
log.info("TaskInstanceIdDynamicCondition : EmptyJobExecuteContext!");
// JobExecuteContext 正常应该不会为 null 。为了不影响请求正常处理,忽略错误,直接返回 TRUE Condition
// (不会影响 DAO 查询,task_instance_id 仅作为分片功能实用,实际业务数据关系并不强依赖 task_instance_id)
toggleEvaluateContext = ToggleEvaluateContext.EMPTY;
Expand All @@ -63,7 +62,6 @@ public static Condition build(Long taskInstanceId,
toggleEvaluateContext = ToggleEvaluateContext.builder()
.addContextParam(ToggleStrategyContextParams.CTX_PARAM_RESOURCE_SCOPE, resourceScope);
} else {
log.info("TaskInstanceIdDynamicCondition : EmptyResourceScope!");
toggleEvaluateContext = ToggleEvaluateContext.EMPTY;
}
}
Expand All @@ -76,13 +74,9 @@ public static Condition build(Long taskInstanceId,
// 为了不影响兼容性,忽略错误
return DSL.trueCondition();
} else {
// 为了便于观察和排查,暂时设定为 INFO 级别,等后续正式交付再改成 DEBUG
log.info("TaskInstanceIdDynamicCondition: UseTaskInstanceIdCondition");
return taskInstanceIdConditionBuilder.apply(taskInstanceId);
}
} else {
// 为了便于观察和排查,暂时设定为 INFO 级别,等后续正式交付再改成 DEBUG
log.info("TaskInstanceIdDynamicCondition: IgnoreTaskInstanceIdCondition");
return DSL.trueCondition();
}
}
Expand Down

0 comments on commit 3c29bb9

Please sign in to comment.