feature: Job对接GSE1.0/2.0支持灰度 #1602 #1621
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 14, 2022
wangyu096
commented
- 按照与GSE讨论的灰度方案结果，简化调用GSE场景。第一种，如果走GSE1.0, 全部使用云区域+ipv4的方式，调用thrift；第二种，如果走GSE 2.0, 那么统一使用GSE 2.0 HTTP API, 传入真实的从cmdb拿到的bk_agent_id。
- Job支持按照业务灰度对接GSE1.0/2.0(按任务权重对接影响范围较大，咱不提供）
- 考虑到agent状态查询、任务下发、结果查询之间的关联性，对于同一个任务来说，需要调用同一个GSE。处理如下: 在TaskExecuteServiceImpl中就根据特性开关确定使用GSE1.0/2.0。如果用GSE1.0,那么设置agentId为{云区域ID:IPv4}这种兼容模式；如果用GSE2.0，那么设置agentId为真实的从cmdb获取到的bk_agent_id属性。后续的Agent状态查询/任务下发，根据agentId的版本选择下发的GSE.
- 查询GSE任务结果使用GSE_TASK_ID判定版本（跟GSE预定，他们2.0的TASK_ID以GSE:V2:开头）
- 重构特性开关能力，并支持通过/actuator/refresh endpoint 动态刷新配置并处理配置刷新事件（EnvironmentChangeEvent)
- 支持动态刷新配置的能力，见 perf: Job 支持配置实时刷新 #1620 ，开发中
jsonwan
reviewed
Dec 14, 2022
| /** | ||
| * 特性开关配置 | ||
| */ | ||
| @ConfigurationProperties(prefix = "job") |
jsonwan
reviewed
Dec 14, 2022
| @@ -57,14 +57,19 @@ public static ResourceScopeTypeEnum from(String type) { | |||
| return scopeType; | |||
| } | |||
| } | |||
| return null; | |||
| throw new IllegalArgumentException("No ResourceScopeTypeEnum constant: " + type); | |||
There was a problem hiding this comment.
会破坏判断==null的代码，务必仔细检查调用该方法的逻辑
There was a problem hiding this comment.
已排查，之前代码也没有对 == null 这种返回进行处理，反而会出现空指针。后续咱们这种枚举，如果值不合法可以统下，抛出IllegalArgumentException
jsonwan
reviewed
Dec 14, 2022
| # 是否兼容bk_biz_id参数 | ||
| enabled: true | ||
| features: | ||
| file_manage: |
jsonwan
reviewed
Dec 14, 2022
| enabled: {{ .Values.job.feature.toggle.esbApiParamBkBizId.enabled }} | ||
| features: | ||
| - id: file_manage | ||
| enabled: {{ .Values.job.features.file_manage.enabled }} |
There was a problem hiding this comment.
values字段不符合蓝鲸Chart规范，请修改为驼峰命名
|
请补充容器化values变更日志：support-files\kubernetes\charts\bk-job\VALUES_LOG.md |
|
修复CodeReview问题
jsonwan
reviewed
Dec 15, 2022
| id: ResourceScopeToggleStrategy | ||
| # 特性策略初始化参数，kv结构，具体传入参数根据不同的StrategyId变化 | ||
| params: {} | ||
| ``` |
There was a problem hiding this comment.
建议把去除的配置也声明下，否则会导致一直往配置文件中加项但不删除旧的项，日积月累后分不清哪些是有用的哪些是未用到的
jsonwan
reviewed
Dec 15, 2022
| feature: | ||
| file-manage: | ||
| features: | ||
| file_manage: |
There was a problem hiding this comment.
spring的配置项风格一直都是用的中划线/驼峰形式，建议参考其他配置项/文件统一下标准
jsonwan
approved these changes
Dec 19, 2022
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.