Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 作业使用 GSE V2 管道,当agent_id 不存在的时候,会调用 GSE V1 的 queryAgentStatus API #3013 #3016

Merged
merged 3 commits into from
Jun 3, 2024

Conversation

wangyu096
Copy link
Collaborator

@wangyu096 wangyu096 commented May 31, 2024

缺陷分析见 #3013

  • 修改点
  1. 修复缺陷
  2. 解决 agent状态查询慢的问题。(由于values.yml 中默认没有设置job.features.agentStatusGseV2.enabled=true,当页面通过主机选择器添加主机的时候,如果这个主机所在业务已经切换到 GSE V2 通道,并且这个主机没有agent_id, 会通过 gse v1 查询 agent 状态,会查询 15s直到超时)

@wangyu096 wangyu096 requested a review from jsonwan May 31, 2024 03:02
@@ -614,6 +614,9 @@ job:
gseV2:
# 是否对接GSE2.0。 如果需要对接GSE1.0,设置job.features.gseV2.enabled=false
enabled: true
# 是否支持 GSE V2 Agent状态查询。如果需要对接GSE1.0,设置job.features.agentStatusGseV2.enabled=false
agentStatusGseV2:
enabled: true
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

此处是刻意没有加该默认值的,加上此默认值后,默认全部使用GSE 2.0,是否对GSE有版本依赖?即使版本依赖满足,如何保证用户的环境已经全量切换到GSE 2.0,只能优先使用2.0吧

Copy link
Collaborator Author

@wangyu096 wangyu096 Jun 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://bk.tencent.com/docs/markdown/ZH/VersionLog/7.1/v71.md

从 job 3.6 版本开始,对应的蓝鲸社区版/企业版都是默认对接 GSE V2,默认的切换方案是"停机升级,全量安装GSE V2",”双 agent 双通道灰度切换方案“只是作为备选方案。所以这里 agentStatusGseV2.enabled 默认应该为 true

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK

Copy link
Collaborator

@jsonwan jsonwan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1个问题需处理。

@wangyu096 wangyu096 merged commit dd44172 into TencentBlueKing:master Jun 3, 2024
3 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants