fix: 执行历史归档，备份冷数据不正确 #3349 #3350
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
wangyu096
commented
Dec 23, 2024
•
wangyu096
commented
- 修复 AbstractJobInstanceRecordResultSet 中 next() 返回不正确的问题。 原先的逻辑会导致最后一次查询的数据(数量 < readRowLimit)，next() 返回 false，导致实际读取的数据漏了
- 修复 backupCost 耗时不正确的问题
- 日志优化
- 解决异步线程池导致调用链丢失的问题
- 修复 gse_file_execute_obj_task 由于排序不正确，导致归档失败的问题
- 新增备份/删除数据行数比较功能，及时发现归档 bug
- 修复从表中分批读取数据，偏移条件设置不正确的问题（全部整改为按照 id单一字段排序)。经过亿级大表的测试，查询 1000 行数据的响应在 20ms 以内，能命中索引，符合预期
jsonwan
reviewed
Dec 24, 2024
| if (CollectionUtils.isNotEmpty(records)) { | ||
| jobInstanceColdDAO.batchInsert(records, | ||
| archiveTablePropsStorage.getBatchInsertRowSize(tableName)); | ||
| backupRows += records.size(); | ||
| } | ||
| offset = offsetEnd; |
There was a problem hiding this comment.
这里的逻辑可能不太对，每次步进增长应该是rowSize，但是这里多减了1，前面减1应该只是打印需要？
jsonwan
reviewed
Dec 24, 2024
...mons/common-service/src/main/java/com/tencent/bk/job/common/service/async/TraceCallable.java
Outdated
Show resolved
Hide resolved
|
测试过程中发现了一些新的问题，代码已更新。需要重新 review 下 |
jsonwan
reviewed
Dec 24, 2024
| List<Long> jobInstanceIds = | ||
| jobInstanceRecords.stream().map(this::extractJobInstanceId).collect(Collectors.toList()); | ||
| // 备份主表数据 | ||
| backupPrimaryTableRecord(jobInstanceRecords); | ||
| backupPrimaryTableRecord(jobInstanceRecords, tablesBackupResult); |
There was a problem hiding this comment.
建议让方法返回BackupResult，tablesBackupResult在外层进行add，采用和子表一样的处理方式，可读性更好。
jsonwan
reviewed
Dec 24, 2024
| }); | ||
| // 删除主表数据 | ||
| deletePrimaryTableRecord(jobInstanceIds); | ||
| deletePrimaryTableRecord(jobInstanceIds, tablesDeleteResult); |
There was a problem hiding this comment.
建议让方法返回DeleteResult，tablesDeleteResult在外层进行add，采用和子表一样的处理方式，可读性更好。
jsonwan
approved these changes
Dec 24, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.