Skip to content
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

clone LbEndpoint to prevent data race #22023

Merged
merged 1 commit into from
Mar 10, 2020
Merged

clone LbEndpoint to prevent data race #22023

merged 1 commit into from
Mar 10, 2020

Conversation

hzxuzhonghu
Copy link
Member

@hzxuzhonghu hzxuzhonghu commented Mar 10, 2020 •
edited
Loading

Hope to fix: #21912 (comment)

#20087 can be caused by updateCluster and with #21917, it can be fixed as well.

@hzxuzhonghu hzxuzhonghu requested review from a team as code owners March 10, 2020 03:03
@googlebot googlebot added the cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. label Mar 10, 2020
@istio-testing istio-testing added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 10, 2020
@ramaraochavali
Copy link
Contributor

/test unit-tests_istio

@ramaraochavali
Copy link
Contributor

/test integ-mixer-k8s-tests_istio

@istio-testing istio-testing merged commit fdc6dd4 into istio:master Mar 10, 2020
@hzxuzhonghu hzxuzhonghu deleted the lbw-race branch March 11, 2020 00:25
@istio-testing
Copy link
Collaborator

In response to a cherrypick label: #22023 failed to apply on top of branch "release-1.4":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	pilot/pkg/networking/util/util.go
M	pilot/pkg/networking/util/util_test.go
M	pilot/pkg/proxy/envoy/v2/ep_filters.go
Falling back to patching base and 3-way merge...
Auto-merging pilot/pkg/proxy/envoy/v2/ep_filters.go
CONFLICT (content): Merge conflict in pilot/pkg/proxy/envoy/v2/ep_filters.go
Auto-merging pilot/pkg/networking/util/util_test.go
Auto-merging pilot/pkg/networking/util/util.go
Patch failed at 0001 clone LbEndpoint to prevent data race

1 similar comment
@istio-testing
Copy link
Collaborator

In response to a cherrypick label: #22023 failed to apply on top of branch "release-1.4":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	pilot/pkg/networking/util/util.go
M	pilot/pkg/networking/util/util_test.go
M	pilot/pkg/proxy/envoy/v2/ep_filters.go
Falling back to patching base and 3-way merge...
Auto-merging pilot/pkg/proxy/envoy/v2/ep_filters.go
CONFLICT (content): Merge conflict in pilot/pkg/proxy/envoy/v2/ep_filters.go
Auto-merging pilot/pkg/networking/util/util_test.go
Auto-merging pilot/pkg/networking/util/util.go
Patch failed at 0001 clone LbEndpoint to prevent data race

@istio-testing istio-testing mentioned this pull request Mar 12, 2020
Closed
@istio-testing
Copy link
Collaborator

In response to a cherrypick label: new pull request created: #22141

ayj added a commit to ayj/istio that referenced this pull request Mar 13, 2020
@ayj
shared control plane multicluster fixes
036fc76 
* Rename the remote istiod service and endpoint to `istiod-remote` to
  avoid conflicts with the real local istiod service.

* Use the `istiod-remote.<namespace>.svc` hostname for the sidecar and
  ingress proxies discoveryAddress. This address needs to match the
  SAN in istiod's cert. The `istiod-remote` headless service will
  resolve the hostname to the remote IP address.

* Add the `istiod-remote` hostname to istiod's SANs. Also use istiod's
  namespace to construct the legacy service names instead of
  hardcoding them to `istio-system`.

* Simplify the remote profile by removing redundant and unused values.

* clone LbEndpoint to prevent data race (istio#22023)

* fix meshexpansion ports for non-istiod deployments
istio-testing pushed a commit that referenced this pull request Mar 17, 2020
@ayj
shared control plane multicluster fixes (#22173)
3218efd 
* shared control plane multicluster fixes

* Rename the remote istiod service and endpoint to `istiod-remote` to
  avoid conflicts with the real local istiod service.

* Use the `istiod-remote.<namespace>.svc` hostname for the sidecar and
  ingress proxies discoveryAddress. This address needs to match the
  SAN in istiod's cert. The `istiod-remote` headless service will
  resolve the hostname to the remote IP address.

* Add the `istiod-remote` hostname to istiod's SANs. Also use istiod's
  namespace to construct the legacy service names instead of
  hardcoding them to `istio-system`.

* Simplify the remote profile by removing redundant and unused values.

* clone LbEndpoint to prevent data race (#22023)

* fix meshexpansion ports for non-istiod deployments

* fix istio-reader-service-account

* fix prow e2e multicluster test

* backport istiod-remote discoveryAddress

* fix typo
@nacx nacx mentioned this pull request Mar 24, 2020
Closed
howardjohn pushed a commit to howardjohn/istio that referenced this pull request Mar 26, 2020
@hzxuzhonghu @howardjohn
clone LbEndpoint to prevent data race (istio#22023)
112462c 
(cherry picked from commit fdc6dd4)
@howardjohn howardjohn mentioned this pull request Mar 26, 2020
Merged
istio-testing pushed a commit that referenced this pull request Mar 26, 2020
@howardjohn @hzxuzhonghu
clone LbEndpoint to prevent data race (#22023) (#22528)
116216e 
(cherry picked from commit fdc6dd4)

Co-authored-by: Zhonghu Xu <xuzhonghu@huawei.com>
luksa pushed a commit to luksa/istio that referenced this pull request Jul 17, 2020
@dgn @yangminzhu
@ramaraochavali @myidpt @istio-testing @yxue @jwendell @knrc @hzxuzhonghu @howardjohn @gargnupur @lambdai @jacob-delgado @alexnederlof
MAISTRA-1449 Update to 1.4.8 (istio#110)
3e318dc 
* authz: fix the validation for request.headers (istio#21284)

* manual backport of 21513 (istio#21514)

Signed-off-by: Rama Chavali <rama.rao@salesforce.com>

* Fix PSP sample file to allow NET_RAW. (istio#21533)

* [release-1.4] remove use_downstream_protocol for gateway (istio#21727)

* remove use_downstream_protocol for gateway

* comment

* writing

Co-authored-by: Yan Xue <3491507+yxue@users.noreply.github.com>

* Update dependencies (istio#21765)

* Make iptables script and output consistent with golang (istio#21871)

Co-authored-by: knrc <knrc@users.noreply.github.com>

* [release-1.4] resign certificate (istio#22131)

* resign certificate

* test

Co-authored-by: xuzhonghu <xuzhonghu@huawei.com>

* Stop linting links of 1.4 branch (istio#22132)

This is going to continue to break as istio.io changes. We already
disabled this on 1.5/master.

* [release-1.4] Build: Honor GOBUILDFLAGS variable also in test mode (istio#22171)

We already honor it in `go build`, we should do the same
in `go test`.

Manual backport of istio#22163

* Update base image for release 1.4 (istio#22165)

* Fix GOBUILDFLAGS usage in codecov scripts (istio#22182)

This variable needs to be set before used (set -u) and must not be
quoted, otherwise it will become an empty arg for go test if it's empty.

Co-authored-by: Jonh Wendell <jonh.wendell@redhat.com>

* Update proxy to pickup fixes for ISTIO-SECURITY-2020-003. (istio#22257)

* Fix extra .Value in deployment file for stackdriver tracing vars (istio#22506)

Co-authored-by: gargnupur <gargnupur@google.com>

* Update operator SHA (istio#22523)

* clone LbEndpoint to prevent data race (istio#22023) (istio#22528)

(cherry picked from commit fdc6dd4)

Co-authored-by: Zhonghu Xu <xuzhonghu@huawei.com>

* cni: update SHA (istio#22569)

Signed-off-by: Yuchen Dai <silentdai@gmail.com>

* Make sure to use CNI 1.4 image when running tests under CNI (istio#23035)

* Make sure to use CNI 1.4 image when running tests under CNI

* Fix lint

* [release-1.4] Update dependencies with update_deps.sh (istio#23010)

* Update deps with update_deps.sh

* Dep updates again

* [release-1.4] Run update_deps.sh (istio#23051)

* Run update_deps.sh

Had to do go get istio.io/operator@5f8ecc70a0f4059bfd4d0f7867d4dc76407f2f08
since update_deps.sh was not updating it.

* Run go mod tidy

* Update with another cni change (istio#23061)

* [release-1.4] Fix Gateway helm chart for helm 3 (istio#23077)

* Fix Gateway helm chart for helm 3

Helm 3 threw an error that `$spec.sds` is not a function. Removing the parentheses led to the next problem: the and evaluates eager so `spec.sds.enabled` resulted in a `nil` exception.

By nesting the if, the problem is resolved

* Also fix the role

Co-authored-by: Alex Nederlof <alex@nederlof.com>

Co-authored-by: Yangmin Zhu <ymzhu@google.com>
Co-authored-by: Rama Chavali <rama.rao@salesforce.com>
Co-authored-by: Oliver Liu <yonggangl@google.com>
Co-authored-by: Istio Automation <istio.testing@gmail.com>
Co-authored-by: Yan Xue <3491507+yxue@users.noreply.github.com>
Co-authored-by: Jonh Wendell <jonh.wendell@redhat.com>
Co-authored-by: knrc <knrc@users.noreply.github.com>
Co-authored-by: xuzhonghu <xuzhonghu@huawei.com>
Co-authored-by: John Howard <howardjohn@google.com>
Co-authored-by: Eric Van Norman <ericvn@us.ibm.com>
Co-authored-by: Joshua Blatt <jblatt@google.com>
Co-authored-by: gargnupur <gargnupur@google.com>
Co-authored-by: Yuchen Dai <silentdai@gmail.com>
Co-authored-by: jacob-delgado <38300436+jacob-delgado@users.noreply.github.com>
Co-authored-by: Alex Nederlof <alex@nederlof.com>
brian-avery added a commit to brian-avery/istio that referenced this pull request Jan 5, 2021
@jwendell @yangminzhu
@ramaraochavali @myidpt @istio-testing @yxue @knrc @hzxuzhonghu @howardjohn @gargnupur @lambdai @jacob-delgado @alexnederlof @brian-avery @ostromart @stewartbutler @mergify
MAISTRA-1691: Update to latest 1.4 stream (istio#170)
7d3618c 
* authz: fix the validation for request.headers (istio#21284)

* manual backport of 21513 (istio#21514)

Signed-off-by: Rama Chavali <rama.rao@salesforce.com>

* Fix PSP sample file to allow NET_RAW. (istio#21533)

* [release-1.4] remove use_downstream_protocol for gateway (istio#21727)

* remove use_downstream_protocol for gateway

* comment

* writing

Co-authored-by: Yan Xue <3491507+yxue@users.noreply.github.com>

* Update dependencies (istio#21765)

* Make iptables script and output consistent with golang (istio#21871)

Co-authored-by: knrc <knrc@users.noreply.github.com>

* [release-1.4] resign certificate (istio#22131)

* resign certificate

* test

Co-authored-by: xuzhonghu <xuzhonghu@huawei.com>

* Stop linting links of 1.4 branch (istio#22132)

This is going to continue to break as istio.io changes. We already
disabled this on 1.5/master.

* [release-1.4] Build: Honor GOBUILDFLAGS variable also in test mode (istio#22171)

We already honor it in `go build`, we should do the same
in `go test`.

Manual backport of istio#22163

* Update base image for release 1.4 (istio#22165)

* Fix GOBUILDFLAGS usage in codecov scripts (istio#22182)

This variable needs to be set before used (set -u) and must not be
quoted, otherwise it will become an empty arg for go test if it's empty.

Co-authored-by: Jonh Wendell <jonh.wendell@redhat.com>

* Update proxy to pickup fixes for ISTIO-SECURITY-2020-003. (istio#22257)

* Fix extra .Value in deployment file for stackdriver tracing vars (istio#22506)

Co-authored-by: gargnupur <gargnupur@google.com>

* Update operator SHA (istio#22523)

* clone LbEndpoint to prevent data race (istio#22023) (istio#22528)

(cherry picked from commit fdc6dd4)

Co-authored-by: Zhonghu Xu <xuzhonghu@huawei.com>

* cni: update SHA (istio#22569)

Signed-off-by: Yuchen Dai <silentdai@gmail.com>

* Make sure to use CNI 1.4 image when running tests under CNI (istio#23035)

* Make sure to use CNI 1.4 image when running tests under CNI

* Fix lint

* [release-1.4] Update dependencies with update_deps.sh (istio#23010)

* Update deps with update_deps.sh

* Dep updates again

* [release-1.4] Run update_deps.sh (istio#23051)

* Run update_deps.sh

Had to do go get istio.io/operator@5f8ecc70a0f4059bfd4d0f7867d4dc76407f2f08
since update_deps.sh was not updating it.

* Run go mod tidy

* Update with another cni change (istio#23061)

* [release-1.4] Fix Gateway helm chart for helm 3 (istio#23077)

* Fix Gateway helm chart for helm 3

Helm 3 threw an error that `$spec.sds` is not a function. Removing the parentheses led to the next problem: the and evaluates eager so `spec.sds.enabled` resulted in a `nil` exception.

By nesting the if, the problem is resolved

* Also fix the role

Co-authored-by: Alex Nederlof <alex@nederlof.com>

* Citadel completely ignores namespaces opted out. (istio#23223)

* Add Kiali fix to Helm (istio#23445)

* Update operator for istio/operator#777 (istio#23540)

* bump base (istio#23655)

* Update cni sha for release-1.4 branch (istio#24216)

* [release-1.4] Update jquery and nodejs (istio#24407)

* Add files from cherrypick

* Update yaml files to pull 1.15.1 images

Co-authored-by: Brian Avery <bavery@redhat.com>

* Update proxy sha (istio#24721)

* Bump bookinfo images

* Update vendor

Co-authored-by: Yangmin Zhu <ymzhu@google.com>
Co-authored-by: Rama Chavali <rama.rao@salesforce.com>
Co-authored-by: Oliver Liu <yonggangl@google.com>
Co-authored-by: Istio Automation <istio.testing@gmail.com>
Co-authored-by: Yan Xue <3491507+yxue@users.noreply.github.com>
Co-authored-by: knrc <knrc@users.noreply.github.com>
Co-authored-by: xuzhonghu <xuzhonghu@huawei.com>
Co-authored-by: John Howard <howardjohn@google.com>
Co-authored-by: Eric Van Norman <ericvn@us.ibm.com>
Co-authored-by: Joshua Blatt <jblatt@google.com>
Co-authored-by: gargnupur <gargnupur@google.com>
Co-authored-by: Yuchen Dai <silentdai@gmail.com>
Co-authored-by: jacob-delgado <38300436+jacob-delgado@users.noreply.github.com>
Co-authored-by: Alex Nederlof <alex@nederlof.com>
Co-authored-by: Brian Avery <bavery@redhat.com>
Co-authored-by: Martin Ostrowski <mostrowski@google.com>
Co-authored-by: stewartbutler <stewartbutler@google.com>
Co-authored-by: Istio Automation <istio-testing-bot@google.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ramaraochavali ramaraochavali ramaraochavali approved these changes

Assignees
No one assigned
Labels
area/networking cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@hzxuzhonghu @ramaraochavali @istio-testing @ayj @googlebot @istio-policy-bot