fix: user interrupt not work well sometimes #1891

jamesgetx · 2025-01-16T12:50:14Z

移除 get_current_deployment 方法中释放部署锁的副作用。调整为中断部署时，释放部署锁
普通应用的 pre-release, app release, 云原生应用的 bkapp release，在它们的 start 入口增加中断逻辑，提升用户中断部署的有效性(还是看时机)
云原生增加 bkapp.paas.bk.tencent.com/last-deploy-status 注解，解决用户主动中断部署之后，再次部署应用时，由于 hook 仍处于progressing 直到现在的 15分钟设置，不能继续部署(调和)的问题

N

piglei · 2025-01-20T07:45:17Z

apiserver/paasng/paasng/platform/bkapp_model/manifest.py

+
+def _get_last_deploy_status(env: ModuleEnvironment, deployment: Deployment) -> str:
+    try:
+        latest_dp = Deployment.objects.exclude(pk=deployment.pk).filter_by_env(env=env).latest("created")


查询增加切片，限制数量。

如果 deployment 之后还有更新的查询的话，函数本身并没有严格限制查询结果是所给的 deployment 的“上一个”，不符合语义，需要添加 created 作为条件过滤

通过 created__lt 限制"上一个"的范围

apiserver/paasng/paasng/platform/bkapp_model/manifest.py

apiserver/paasng/paasng/platform/engine/deploy/interruptions.py

apiserver/paasng/paasng/platform/engine/workflow/flow.py

N

jamesgetx added 2 commits January 16, 2025 14:46

refactor: delete some unused func params

292118c

N

fix: user interrupt not work well sometimes

32fcf81

N

jamesgetx changed the title ~~WIP : user interrupt not work well sometimes~~ WIP: user interrupt not work well sometimes Jan 16, 2025

jamesgetx added 2 commits January 17, 2025 10:16

test: fix

76177b6

N

fix: minor

0167d3d

N

jamesgetx changed the title ~~WIP: user interrupt not work well sometimes~~ fix: user interrupt not work well sometimes Jan 17, 2025

jamesgetx requested review from piglei and narasux January 20, 2025 02:30

piglei reviewed Jan 20, 2025

View reviewed changes

refactor: resolve review comments

2a7bde0

N

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: user interrupt not work well sometimes #1891

fix: user interrupt not work well sometimes #1891

jamesgetx commented Jan 16, 2025 •

edited

Loading

piglei Jan 20, 2025

jamesgetx Jan 22, 2025

fix: user interrupt not work well sometimes #1891

Are you sure you want to change the base?

fix: user interrupt not work well sometimes #1891

Conversation

jamesgetx commented Jan 16, 2025 • edited Loading

piglei Jan 20, 2025

Choose a reason for hiding this comment

jamesgetx Jan 22, 2025

Choose a reason for hiding this comment

jamesgetx commented Jan 16, 2025 •

edited

Loading