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

Preserve node snap versions during updates #216

Merged
merged 1 commit into from
Sep 18, 2024
Merged

Preserve node snap versions during updates #216

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 16 additions & 8 deletions xds/snapshotter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,8 +403,10 @@ func (s *Snapshotter) addOrUpdateNode(nodeID, address string, streamID int64) {
log.Logger.Info("New stream for node", "node", nodeID, "streamID", streamID)
nodeResources[streamID] = makeEmptyNodeResources()
updatedNode := &Node{
address: node.address,
resources: nodeResources,
address: node.address,
resources: nodeResources,
serviceSnapVersion: node.serviceSnapVersion,
endpointsSnapVersion: node.endpointsSnapVersion,
}
s.nodes.Store(nodeID, updatedNode)
}
Expand All @@ -430,8 +432,10 @@ func (s *Snapshotter) deleteNodeStream(nodeID string, streamID int64) {
}
// else just update the node
updatedNode := &Node{
address: node.address,
resources: nodeResources,
address: node.address,
resources: nodeResources,
serviceSnapVersion: node.serviceSnapVersion,
endpointsSnapVersion: node.endpointsSnapVersion,
}
s.nodes.Store(nodeID, updatedNode)
if err := s.nodeServiceSnapshot(nodeID); err != nil {
Expand Down Expand Up @@ -510,8 +514,10 @@ func (s *Snapshotter) updateNodeStreamResources(nodeID, typeURL string, streamID
nodeResources[streamID].services[typeURL] = newSnapResources
nodeResources[streamID].servicesNames[typeURL] = resources
updatedNode := &Node{
address: node.address,
resources: nodeResources,
address: node.address,
resources: nodeResources,
serviceSnapVersion: node.serviceSnapVersion,
endpointsSnapVersion: node.endpointsSnapVersion,
}
s.nodes.Store(nodeID, updatedNode)
return nil
Expand Down Expand Up @@ -539,8 +545,10 @@ func (s *Snapshotter) updateNodeStreamEndpointsResources(nodeID, typeURL string,
nodeResources[streamID].endpoints[typeURL] = newSnapResources
nodeResources[streamID].endpointsNames[typeURL] = resources
updatedNode := &Node{
address: node.address,
resources: nodeResources,
address: node.address,
resources: nodeResources,
serviceSnapVersion: node.serviceSnapVersion,
endpointsSnapVersion: node.endpointsSnapVersion,
}
s.nodes.Store(nodeID, updatedNode)
return nil
Expand Down
Loading