Skip to content

Automated cherry pick of #20840#21572

Merged
ahrtr merged 1 commit intoetcd-io:release-3.6from
pjsharath28:automated-cherry-pick-of-#20840-upstream-release-3.6
Apr 7, 2026
Merged

Automated cherry pick of #20840#21572
ahrtr merged 1 commit intoetcd-io:release-3.6from
pjsharath28:automated-cherry-pick-of-#20840-upstream-release-3.6

Conversation

@pjsharath28
Copy link
Copy Markdown
Contributor

@pjsharath28 pjsharath28 commented Apr 5, 2026

Cherry pick of #20840 on release-3.6.

#20840: tests: Change max retries when removing a member from a

@jonathan-albrecht-ibm @pjsharath28
tests: Change max retries when removing a member from a cluster
eff7875 
In CI, the TestGateway and TestMixVersionsSnapshotByAddingMember
are flaky due to the TestMixVersionsSnapshotByAddingMember test
sometimes not closing the second etcd process. This happens if
the second process has not had enough time to become healthy according
to the logic in EtcdServer.mayRemoveMember.

Fix this by retrying member removal for twice the etcdserver.HealthInterval
in EtcdProcessCluster.CloseProc.

Signed-off-by: Jonathan Albrecht <jonathan.albrecht@ibm.com>
@k8s-ci-robot
Copy link
Copy Markdown

k8s-ci-robot commented Apr 5, 2026

Hi @pjsharath28. Thanks for your PR.

I'm waiting for a etcd-io member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Tip

We noticed you've done this a few times! Consider joining the org to skip this step and gain /lgtm and other bot rights. We recommend asking approvers on your previous PRs to sponsor you.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@ahrtr
Copy link
Copy Markdown
Member

ahrtr commented Apr 7, 2026

/ok-to-test

@k8s-ci-robot
Copy link
Copy Markdown

k8s-ci-robot commented Apr 7, 2026

@pjsharath28: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-etcd-govulncheck eff7875 link true /test pull-etcd-govulncheck

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@codecov
Copy link
Copy Markdown

codecov bot commented Apr 7, 2026 •
edited
Loading

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 68.93%. Comparing base (db8d13a) to head (eff7875).
⚠️ Report is 2 commits behind head on release-3.6.

Additional details and impacted files

see 24 files with indirect coverage changes

@@               Coverage Diff               @@
##           release-3.6   #21572      +/-   ##
===============================================
+ Coverage        68.90%   68.93%   +0.03%     
===============================================
  Files              420      420              
  Lines            35841    35841              
===============================================
+ Hits             24695    24707      +12     
+ Misses            9698     9688      -10     
+ Partials          1448     1446       -2

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update db8d13a...eff7875. Read the comment docs.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@k8s-ci-robot
Copy link
Copy Markdown

k8s-ci-robot commented Apr 7, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahrtr, pjsharath28

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ahrtr ahrtr merged commit f31179a into etcd-io:release-3.6 Apr 7, 2026
35 of 36 checks passed
@pjsharath28
Copy link
Copy Markdown
Contributor Author

pjsharath28 commented Apr 7, 2026

Thanks @ahrtr.

While working on this PR, I noticed that the hack/patch/cherrypick.sh script does not appear to be part of the current workflow. Cherry-picks seem to be handled via the k8s-infra-cherrypick-robot instead.

Given this, should we consider removing this script to avoid confusion? Alternatively, we could keep it but clearly document that the recommended approach is to use the bot rather than the script.

@ahrtr
Copy link
Copy Markdown
Member

ahrtr commented Apr 7, 2026

Given this, should we consider removing this script to avoid confusion?

Seems reasonable. cc @ivanvc

@pjsharath28
Copy link
Copy Markdown
Contributor Author

pjsharath28 commented Apr 7, 2026

Sure thanks, I create an issue #21579 to track the same.

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

Reviewers

@ahrtr ahrtr ahrtr approved these changes

Assignees

No one assigned

Labels

approved area/testing ok-to-test size/XS

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@pjsharath28 @k8s-ci-robot @ahrtr @jonathan-albrecht-ibm