starred/godoxy-yusing
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2026-04-25 01:38:30 +02:00
Code Issues 18 Packages Projects Releases 10 Wiki Activity

fix(proxmox): concurrent map write in UpdateResources

Browse Source
This commit is contained in:
yusing
2026-01-25 18:05:36 +08:00
parent ecc2547eb1
commit 9f245a62f2
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
internal/proxmox/client.go
View File

@@ -65,20 +65,21 @@ func (c *Client) UpdateClusterInfo(ctx context.Context) (err error) {
} }
func (c *Client) UpdateResources(ctx context.Context) error { func (c *Client) UpdateResources(ctx context.Context) error {
c.resourcesMu.Lock()
defer c.resourcesMu.Unlock()
resourcesSlice, err := c.Cluster.Resources(ctx, "vm") resourcesSlice, err := c.Cluster.Resources(ctx, "vm")
if err != nil { if err != nil {
return err return err
} }
clear(c.resources) vmResources := make([]*VMResource, len(resourcesSlice))
var errs errgroup.Group for i, resource := range resourcesSlice {
errs.SetLimit(runtime.GOMAXPROCS(0) * 2) vmResources[i] = &VMResource{
for _, resource := range resourcesSlice {
c.resources[resource.ID] = &VMResource{
ClusterResource: resource, ClusterResource: resource,
IPs: nil, IPs: nil,
} }
}
var errs errgroup.Group
errs.SetLimit(runtime.GOMAXPROCS(0) * 2)
for i, resource := range resourcesSlice {
vmResource := vmResources[i]
errs.Go(func() error { errs.Go(func() error {
node, ok := Nodes.Get(resource.Node) node, ok := Nodes.Get(resource.Node)
if !ok { if !ok {
@@ -96,13 +97,19 @@ func (c *Client) UpdateResources(ctx context.Context) error {
if err != nil { if err != nil {
return fmt.Errorf("failed to get ips for resource %s: %w", resource.ID, err) return fmt.Errorf("failed to get ips for resource %s: %w", resource.ID, err)
} }
c.resources[resource.ID].IPs = ips vmResource.IPs = ips
return nil return nil
}) })
} }
if err := errs.Wait(); err != nil { if err := errs.Wait(); err != nil {
return err return err
} }
c.resourcesMu.Lock()
clear(c.resources)
for i, resource := range resourcesSlice {
c.resources[resource.ID] = vmResources[i]
}
c.resourcesMu.Unlock()
log.Debug().Str("cluster", c.Cluster.Name).Msgf("[proxmox] updated %d resources", len(c.resources)) log.Debug().Str("cluster", c.Cluster.Name).Msgf("[proxmox] updated %d resources", len(c.resources))
return nil return nil
} }