chore: support timeoutSeconds in action execution #9955

leon-inf · 2025-12-24T09:03:38Z

apecloud-bot · 2025-12-24T09:03:50Z

Auto Cherry-pick Instructions

Usage:
  - /nopick: Not auto cherry-pick when PR merged.
  - /pick: release-x.x [release-x.x]: Auto cherry-pick to the specified branch when PR merged.

Example:
  - /nopick
  - /pick release-1.0

leon-inf · 2025-12-24T09:04:03Z

/pick release-1.0

codecov · 2025-12-24T09:11:12Z

Codecov Report

❌ Patch coverage is 50.00000% with 8 lines in your changes missing coverage. Please review.
✅ Project coverage is 51.69%. Comparing base (1cd2f9c) to head (3580e66).
⚠️ Report is 8 commits behind head on main.

Files with missing lines	Patch %	Lines
pkg/kbagent/service/task_new_replica.go	0.00%	4 Missing ⚠️
pkg/kbagent/service/action_utils.go	77.77%	2 Missing ⚠️
pkg/kbagent/service/action.go	50.00%	1 Missing ⚠️
pkg/kbagent/service/streaming.go	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #9955      +/-   ##
==========================================
+ Coverage   51.06%   51.69%   +0.62%     
==========================================
  Files         541      541              
  Lines       58340    58831     +491     
==========================================
+ Hits        29793    30410     +617     
+ Misses      25611    25489     -122     
+ Partials     2936     2932       -4

Flag	Coverage Δ
unittests	`51.69% <50.00%> (+0.62%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

cjc7373 · 2025-12-25T08:31:26Z

pkg/kbagent/service/action_utils.go

-	} else if *timeout > 0 {
-		ctx, cancel = context.WithTimeout(ctx, min(time.Duration(*timeout)*time.Second, maxActionCallTimeout))
-	}
+	ctx, cancel = actionCallTimeout(ctx, action.TimeoutSeconds, timeout)


Why there are two timeout settings? Should the timeout defined in cmpd types be enough?

Disable the request timeout for now.

wangyelei · 2025-12-26T07:41:33Z

pkg/kbagent/service/action_utils.go

 	defaultMaxIdleConnectionsPerHost = 20

-	defaultActionCallTimeout = 30 * time.Second
+	defaultActionCallTimeout = 15 * time.Second


Perhaps 30 seconds would be more appropriate for adopted add-ons.

leon-inf · 2025-12-29T01:59:08Z

/approve

leon-inf · 2025-12-29T02:04:23Z

/approve

apecloud-bot · 2025-12-29T02:15:50Z

/cherry-pick release-1.0

apecloud-bot · 2025-12-29T02:16:16Z

🤖 says: Error cherry-picking.

Auto-merging apis/apps/v1/componentdefinition_types.go
Auto-merging config/crd/bases/apps.kubeblocks.io_clusters.yaml
Auto-merging config/crd/bases/apps.kubeblocks.io_componentdefinitions.yaml
Auto-merging config/crd/bases/apps.kubeblocks.io_components.yaml
CONFLICT (modify/delete): config/crd/bases/apps.kubeblocks.io_rollouts.yaml deleted in HEAD and modified in a250555 (chore: support timeoutSeconds in action execution (#9955)). Version a250555 (chore: support timeoutSeconds in action execution (#9955)) of config/crd/bases/apps.kubeblocks.io_rollouts.yaml left in tree.
CONFLICT (modify/delete): config/crd/bases/workloads.kubeblocks.io_instances.yaml deleted in HEAD and modified in a250555 (chore: support timeoutSeconds in action execution (#9955)). Version a250555 (chore: support timeoutSeconds in action execution (#9955)) of config/crd/bases/workloads.kubeblocks.io_instances.yaml left in tree.
Auto-merging config/crd/bases/workloads.kubeblocks.io_instancesets.yaml
CONFLICT (content): Merge conflict in config/crd/bases/workloads.kubeblocks.io_instancesets.yaml
Auto-merging deploy/helm/crds/apps.kubeblocks.io_clusters.yaml
Auto-merging deploy/helm/crds/apps.kubeblocks.io_componentdefinitions.yaml
Auto-merging deploy/helm/crds/apps.kubeblocks.io_components.yaml
CONFLICT (modify/delete): deploy/helm/crds/apps.kubeblocks.io_rollouts.yaml deleted in HEAD and modified in a250555 (chore: support timeoutSeconds in action execution (#9955)). Version a250555 (chore: support timeoutSeconds in action execution (#9955)) of deploy/helm/crds/apps.kubeblocks.io_rollouts.yaml left in tree.
CONFLICT (modify/delete): deploy/helm/crds/workloads.kubeblocks.io_instances.yaml deleted in HEAD and modified in a250555 (chore: support timeoutSeconds in action execution (#9955)). Version a250555 (chore: support timeoutSeconds in action execution (#9955)) of deploy/helm/crds/workloads.kubeblocks.io_instances.yaml left in tree.
Auto-merging deploy/helm/crds/workloads.kubeblocks.io_instancesets.yaml
CONFLICT (content): Merge conflict in deploy/helm/crds/workloads.kubeblocks.io_instancesets.yaml
Auto-merging docs/developer_docs/api-reference/cluster.md
Auto-merging pkg/kbagent/service/task_new_replica.go
CONFLICT (content): Merge conflict in pkg/kbagent/service/task_new_replica.go
error: could not apply a250555... chore: support timeoutSeconds in action execution (#9955)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

apecloud-bot · 2025-12-29T02:16:17Z

🤖 says: ‼️ cherry pick action failed.
See: https://github.com/apecloud/kubeblocks/actions/runs/20563101718

leon-inf added this to the Release 1.1.0 milestone Dec 24, 2025

leon-inf requested a review from a team as a code owner December 24, 2025 09:03

github-actions bot added the size/L Denotes a PR that changes 100-499 lines. label Dec 24, 2025

apecloud-bot added the pick-1.0 Auto cherry-pick to release-1.0 when PR merged label Dec 24, 2025

cjc7373 reviewed Dec 25, 2025

View reviewed changes

leon-inf force-pushed the support/action-timeout branch from 61542b8 to a608857 Compare December 26, 2025 06:28

wangyelei reviewed Dec 26, 2025

View reviewed changes

cjc7373 approved these changes Dec 26, 2025

View reviewed changes

apecloud-bot added the approved PR Approved Test label Dec 26, 2025

apecloud-bot approved these changes Dec 29, 2025

View reviewed changes

init

3580e66

leon-inf force-pushed the support/action-timeout branch from a608857 to 3580e66 Compare December 29, 2025 02:03

apecloud-bot removed the approved PR Approved Test label Dec 29, 2025

apecloud-bot approved these changes Dec 29, 2025

View reviewed changes

apecloud-bot added the approved PR Approved Test label Dec 29, 2025

leon-inf merged commit a250555 into main Dec 29, 2025
43 checks passed

leon-inf deleted the support/action-timeout branch December 29, 2025 02:15

chore: support timeoutSeconds in action execution #9955

chore: support timeoutSeconds in action execution #9955

Uh oh!

Conversation

leon-inf commented Dec 24, 2025

Uh oh!

apecloud-bot commented Dec 24, 2025

Uh oh!

leon-inf commented Dec 24, 2025

Uh oh!

codecov bot commented Dec 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

cjc7373 Dec 25, 2025

Choose a reason for hiding this comment

Uh oh!

leon-inf Dec 26, 2025

Choose a reason for hiding this comment

Uh oh!

wangyelei Dec 26, 2025

Choose a reason for hiding this comment

Uh oh!

leon-inf Dec 29, 2025

Choose a reason for hiding this comment

Uh oh!

leon-inf commented Dec 29, 2025

Uh oh!

leon-inf commented Dec 29, 2025

Uh oh!

Uh oh!

apecloud-bot commented Dec 29, 2025

Uh oh!

apecloud-bot commented Dec 29, 2025

Uh oh!

apecloud-bot commented Dec 29, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov bot commented Dec 24, 2025 •

edited

Loading