search

openshift / cluster-etcd-operator

Operator to manage the lifecycle of the etcd members of an OpenShift cluster
Apache License 2.0
95 stars 127 forks source link

NO-JIRA: only update envvar listeners on real changes #1300

Closed tjungblu closed 2 months ago

tjungblu commented 2 months ago

While reviewing the changes in the backup PR, I've seen that I've introduced unnecessary listener updates during the lock refactoring two years ago.

This PR ensures we return early when the envvars has not changed.

Elbehery commented 2 months ago

/lgtm /approve

Elbehery commented 2 months ago

/lgtm

openshift-ci[bot] commented 2 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Elbehery, tjungblu

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

The pull request process is described here

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/openshift/cluster-etcd-operator/blob/master/OWNERS)~~ [Elbehery,tjungblu] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
openshift-ci-robot commented 2 months ago

@tjungblu: This pull request explicitly references no jira issue.

In response to [this](https://github.com/openshift/cluster-etcd-operator/pull/1300): >While reviewing the changes in the backup PR, I've seen that I've introduced unnecessary listener updates during the lock refactoring two years ago. > >This PR ensures we return early when the envvars has not changed. Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-etcd-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
tjungblu commented 2 months ago

/override ci/prow/e2e-aws-ovn-etcd-scaling

openshift-ci[bot] commented 2 months ago

@tjungblu: Overrode contexts on behalf of tjungblu: ci/prow/e2e-aws-ovn-etcd-scaling

In response to [this](https://github.com/openshift/cluster-etcd-operator/pull/1300#issuecomment-2253086955): >/override ci/prow/e2e-aws-ovn-etcd-scaling Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
openshift-ci[bot] commented 2 months ago

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

Test name Commit Details Required Rerun command
ci/prow/e2e-metal-ovn-ha-cert-rotation-shutdown 51c6aef563b3767cfd592617328c8ebde0aec9c6 link false /test e2e-metal-ovn-ha-cert-rotation-shutdown
ci/prow/e2e-metal-ovn-sno-cert-rotation-shutdown 51c6aef563b3767cfd592617328c8ebde0aec9c6 link false /test e2e-metal-ovn-sno-cert-rotation-shutdown
ci/prow/e2e-aws-etcd-recovery 51c6aef563b3767cfd592617328c8ebde0aec9c6 link false /test e2e-aws-etcd-recovery
ci/prow/e2e-aws-etcd-certrotation 51c6aef563b3767cfd592617328c8ebde0aec9c6 link false /test e2e-aws-etcd-certrotation

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
Elbehery commented 2 months ago

/cherrypick release-4.16 release-4.15

openshift-cherrypick-robot commented 2 months ago

@Elbehery: #1300 failed to apply on top of branch "release-4.16":

Applying: only update envvar listeners on real changes
Using index info to reconstruct a base tree...
M   pkg/etcdenvvar/envvarcontroller.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/etcdenvvar/envvarcontroller.go
CONFLICT (content): Merge conflict in pkg/etcdenvvar/envvarcontroller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 only update envvar listeners on real changes
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
In response to [this](https://github.com/openshift/cluster-etcd-operator/pull/1300#issuecomment-2253130419): >/cherrypick release-4.16 release-4.15 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
Elbehery commented 2 months ago

cherrypicked manually https://github.com/openshift/cluster-etcd-operator/pull/1302

openshift-bot commented 2 months ago

[ART PR BUILD NOTIFIER]

Distgit: cluster-etcd-operator This PR has been included in build cluster-etcd-operator-container-v4.17.0-202407261717.p0.g428a8fd.assembly.stream.el9. All builds following this will include this PR.