Skip to content

chore: support stopping clusters with flat discrete ordinals #10002

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.

Sign up for GitHub

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

Jump to bottom
Merged
leon-inf merged 8 commits into from
Jan 19, 2026
Merged

chore: support stopping clusters with flat discrete ordinals #10002

leon-inf merged 8 commits into from
Jan 19, 2026

Conversation

@leon-inf
Copy link
Contributor

@leon-inf leon-inf commented Jan 14, 2026

close #9998

@leon-inf leon-inf added this to the Release 1.1.0 milestone Jan 14, 2026
@apecloud-bot
Copy link
Collaborator

apecloud-bot commented Jan 14, 2026

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.1

@github-actions github-actions bot added the size/XXL Denotes a PR that changes 1000+ lines. label Jan 14, 2026
@leon-inf
Copy link
Contributor Author

leon-inf commented Jan 14, 2026

/pick release-1.1

@apecloud-bot apecloud-bot added the pick-1.1 Auto cherry-pick to release-1.1 when PR merged label Jan 14, 2026
@leon-inf leon-inf force-pushed the feature/stop-flat-instances branch 3 times, most recently from 3463723 to 7165b64 Compare January 14, 2026 09:30
@leon-inf leon-inf force-pushed the feature/stop-flat-instances branch from 7165b64 to 78fe72e Compare January 15, 2026 02:37
@codecov
Copy link

codecov bot commented Jan 15, 2026 •
edited
Loading

Codecov Report

❌ Patch coverage is 58.98876% with 73 lines in your changes missing coverage. Please review.
✅ Project coverage is 51.47%. Comparing base (7007018) to head (509346b).
⚠️ Report is 4 commits behind head on main.

Files with missing lines Patch % Lines
...ntroller/instanceset/reconciler_revision_update.go 12.82% 33 Missing and 1 partial ⚠️
pkg/operations/rebuild_instance_inplace.go 68.29% 9 Missing and 4 partials ⚠️
...oller/instanceset/reconciler_instance_alignment.go 28.57% 10 Missing ⚠️
pkg/controller/component/workload_utils.go 60.00% 6 Missing ⚠️
...rs/apps/component/transformer_component_service.go 81.25% 2 Missing and 1 partial ⚠️
pkg/controller/builder/builder_instance_set.go 0.00% 2 Missing ⚠️
pkg/controller/instancetemplate/compression.go 0.00% 2 Missing ⚠️
pkg/controller/instanceset/reconciler_update.go 0.00% 0 Missing and 1 partial ⚠️
pkg/controller/instanceset2/reconciler_status.go 0.00% 1 Missing ⚠️
...ontroller/instancetemplate/name_builder_default.go 75.00% 1 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main   #10002      +/-   ##
==========================================
+ Coverage   51.35%   51.47%   +0.12%     
==========================================
  Files         541      541              
  Lines       58804    58763      -41     
==========================================
+ Hits        30196    30251      +55     
+ Misses      25644    25559      -85     
+ Partials     2964     2953      -11
Flag Coverage Δ
unittests 51.47% <58.98%> (+0.12%) ⬆️

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.

@leon-inf leon-inf marked this pull request as ready for review January 15, 2026 09:16
@leon-inf leon-inf requested a review from a team as a code owner January 15, 2026 09:16
cjc7373
cjc7373 reviewed Jan 15, 2026
View reviewed changes
@leon-inf leon-inf force-pushed the feature/stop-flat-instances branch from 18a97ce to 6cab44e Compare January 16, 2026 06:24
@leon-inf leon-inf force-pushed the feature/stop-flat-instances branch from 6cab44e to d17bb75 Compare January 16, 2026 06:58
@leon-inf leon-inf changed the title chore: support stopping clusters with flat ordinals chore: support stopping clusters with flat discrete ordinals Jan 16, 2026
cjc7373
cjc7373 approved these changes Jan 19, 2026
View reviewed changes
pkg/controller/instancetemplate/name_builder_flat.go Outdated
if _, ok := template2OrdinalSetMap[status.Name]; !ok {
template2OrdinalSetMap[status.Name] = sets.New[int32]()
// template2OrdinalSetMap[DefaultTemplateName].Insert(its.Status.AssignedOrdinals[DefaultTemplateName].Discrete...)
// globalUsedOrdinalSet.Insert(its.Status.AssignedOrdinals[DefaultTemplateName].Discrete...)
Copy link
Contributor

@cjc7373 cjc7373 Jan 19, 2026

Choose a reason for hiding this comment

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

can be removed?

Copy link
Contributor Author

@leon-inf leon-inf Jan 19, 2026

Choose a reason for hiding this comment

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

Done.

pkg/controller/component/workload_utils.go Outdated
}

func GeneratePodNamesByComp(comp *appsv1.Component) ([]string, error) {
func GenerateDesiredPodNamesByITS(runningITS, protoITS *workloads.InstanceSet) ([]string, error) {
Copy link
Contributor

@cjc7373 cjc7373 Jan 19, 2026

Choose a reason for hiding this comment

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

GenerateDesiredPodNamesByITS and GeneratePodNamesByITS are very similar names and may be confusing

Copy link
Contributor Author

@leon-inf leon-inf Jan 19, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

Rename GeneratePodNamesByITS to GetCurrentPodNamesByITS.

@apecloud-bot apecloud-bot added the approved PR Approved Test label Jan 19, 2026
@apecloud-bot apecloud-bot removed the approved PR Approved Test label Jan 19, 2026
@leon-inf
Copy link
Contributor Author

leon-inf commented Jan 19, 2026

/approve

@apecloud-bot apecloud-bot added the approved PR Approved Test label Jan 19, 2026
@leon-inf leon-inf merged commit 544c4a0 into main Jan 19, 2026
46 checks passed
@leon-inf leon-inf deleted the feature/stop-flat-instances branch January 19, 2026 09:08
@apecloud-bot
Copy link
Collaborator

apecloud-bot commented Jan 19, 2026

/cherry-pick release-1.1

apecloud-bot pushed a commit that referenced this pull request Jan 19, 2026
@leon-ape @apecloud-bot
chore: support stopping clusters with flat discrete ordinals (#10002)
fc63779 
(cherry picked from commit 544c4a0)
@apecloud-bot
Copy link
Collaborator

apecloud-bot commented Jan 19, 2026

🤖 says: cherry pick action finished successfully 🎉!
See: https://github.com/apecloud/kubeblocks/actions/runs/21131572027

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cjc7373 cjc7373 cjc7373 approved these changes

@apecloud-bot apecloud-bot apecloud-bot approved these changes

Assignees

No one assigned

Labels

approved PR Approved Test pick-1.1 Auto cherry-pick to release-1.1 when PR merged size/XXL Denotes a PR that changes 1000+ lines.

Projects

None yet

Milestone

Release 1.1.0

Development

Successfully merging this pull request may close these issues.

[BUG] stop -> start cluster with discrete ordinals may cause replica reconstruction

5 participants

@leon-inf @apecloud-bot @cjc7373 @leon-ape