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

fix concurrent map access in endpoint metadata #44473

Merged
merged 9 commits into from
Apr 26, 2023
Merged

fix concurrent map access in endpoint metadata #44473

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c46458e
fix concurrent map access in endpoint metadata
ramaraochavali Apr 22, 2023
f3d8c45
only clone as needed
ramaraochavali Apr 23, 2023
c2aaebc
only clone as needed
ramaraochavali Apr 23, 2023
fad2314
remove unnecessary code
ramaraochavali Apr 23, 2023
ed76c70
review comments
ramaraochavali Apr 24, 2023
551c605
fix ut
ramaraochavali Apr 24, 2023
282a7d7
add test case
ramaraochavali Apr 26, 2023
0570f8f
add lock
ramaraochavali Apr 26, 2023
c716261
resolve conflicts
ramaraochavali Apr 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix concurrent map access in endpoint metadata 
Signed-off-by: Rama Chavali <rama.rao@salesforce.com>
  • Loading branch information
@ramaraochavali
ramaraochavali committed Apr 22, 2023
commit c46458e8910f6a7960b0273aa8f7cb2e52f6ccd1
6 changes: 5 additions & 1 deletion pilot/pkg/model/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,12 +516,16 @@ func (ep *IstioEndpoint) IsDiscoverableFromProxy(p *Proxy) bool {

// Metadata returns the endpoint metadata used for telemetry purposes.
func (ep *IstioEndpoint) Metadata() *EndpointMetadata {
labels := map[string]string{}
for k, v := range ep.Labels {
labels[k] = v
}
Copy link
Member

Choose a reason for hiding this comment

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

Can we deepcopy as needed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Did n't understand - what else need to be copied apart from labels?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

nm, understood what you mean,. Fixed

Copy link
Member

Choose a reason for hiding this comment

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

nit: maps.Clone

actually not really just a nit, it will perform better.

return &EndpointMetadata{
Network: ep.Network,
TLSMode: ep.TLSMode,
WorkloadName: ep.WorkloadName,
Namespace: ep.Namespace,
Labels: ep.Labels,
Labels: labels,
ClusterID: ep.Locality.ClusterID,
}
}
Expand Down