Skip to content

Backport testutils.ExecuteUntil to 3.5 branch#17177

Merged
ahrtr merged 1 commit into
etcd-io:release-3.5from
amit-rastogi:release-3.5
Jan 3, 2024
Merged

Backport testutils.ExecuteUntil to 3.5 branch#17177
ahrtr merged 1 commit into
etcd-io:release-3.5from
amit-rastogi:release-3.5

Conversation

@amit-rastogi

@amit-rastogi amit-rastogi commented Dec 31, 2023

Copy link
Copy Markdown

As part of #15247, backporting #16822 to 3.5 branch will be done in 2 steps-

  1. backport testutils.ExecuteUntil to 3.5 branch since tests/e2e/v3_lease_no_proxy_test.go makes use of testutils.ExecuteUntil
  2. backport changes in Ignore old leader's leases revoking request #16822 to 3.5 branch

This PR addresses Step 1 above.

@k8s-ci-robot

Copy link
Copy Markdown

Hi @amit-rastogi. 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. Regular contributors should join the org to skip this step.

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/test-infra repository.

@jmhbnz jmhbnz left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Hey @amit-rastogi - Please ensure your commit is signed so the developer certificate of origin (DCO) check passes, i.e:

git rebase HEAD~1 --signoff
git push --force

/ok-to-test

Note: It looks like tests/e2e/v3_lease_no_proxy_test.go only has the one reference to testutils.ExecuteUntil. As an alternative we could slightly tweak that line to instead call executeWithTimeout which is what other e2e tests in release-3.5 currently do, refer example https://github.com/etcd-io/etcd/blob/release-3.5/tests/e2e/ctl_v3_grpc_test.go#L112. I think my preference would be to keep the backport as minimal as possible to just tweak to use executeWithTimeout but I defer to maintainers on which approach is preferred.

Signed-off-by: Amit Rastogi <amitrastogi2206@gmail.com>
@amit-rastogi

amit-rastogi commented Jan 1, 2024

Copy link
Copy Markdown
Author

Hey @amit-rastogi - Please ensure your commit is signed so the developer certificate of origin (DCO) check passes, i.e:

git rebase HEAD~1 --signoff
git push --force

/ok-to-test

Note: It looks like tests/e2e/v3_lease_no_proxy_test.go only has the one reference to testutils.ExecuteUntil. As an alternative we could slightly tweak that line to instead call executeWithTimeout which is what other e2e tests in release-3.5 currently do, refer example https://github.com/etcd-io/etcd/blob/release-3.5/tests/e2e/ctl_v3_grpc_test.go#L112. I think my preference would be to keep the backport as minimal as possible to just tweak to use executeWithTimeout but I defer to maintainers on which approach is preferred.

Thanks @jmhbnz for the feedback. I'll analyze the usage of executeWithTimeout as you have suggested.

Also, had few observations related to the interface of EtcdProcessCluster in 3.5 vis-a-vis the main branch. The tests/e2e/v3_lease_no_proxy_test.go which needs to be backported references methods like WaitLeader and EndpointsGRPC which are not present in the 3.5 EtcdProcessCluster interface. Analyzing more on this.

Also, made minor change in EtcdProcessClusterConfig (tests/framework/e2e/cluster.go) in 3.5 to add the GoFailClientTimeout field used in tests/e2e/v3_lease_no_proxy_test.go.

@ahrtr

ahrtr commented Jan 3, 2024

Copy link
Copy Markdown
Member

The tests/e2e/v3_lease_no_proxy_test.go which needs to be backported references methods like WaitLeader and EndpointsGRPC which are not present in the 3.5 EtcdProcessCluster interface. Analyzing more on this.

Suggest to backport them as well, in this PR in a separate PR.

@amit-rastogi

Copy link
Copy Markdown
Author

The tests/e2e/v3_lease_no_proxy_test.go which needs to be backported references methods like WaitLeader and EndpointsGRPC which are not present in the 3.5 EtcdProcessCluster interface. Analyzing more on this.

Suggest to backport them as well, in this PR in a separate PR.

Thanks @ahrtr. I'll create a separate PR for that.

@ahrtr ahrtr merged commit af1fb6f into etcd-io:release-3.5 Jan 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

5 participants