Merge pull request #32 from dm3ch/fix-instancetype-deadlock

gitautomator[bot] · web-flow · commit 4820a24ca0cd · 2025-04-22T05:06:51.000Z
Fix deadlock on instancetype provider List() invokation
diff --git a/pkg/providers/instancetype/instancetype.go b/pkg/providers/instancetype/instancetype.go
@@ -73,9 +73,6 @@ func NewDefaultProvider(ctx context.Context, authOptions *auth.Credential) *Defa
 }
 
 func (p *DefaultProvider) List(ctx context.Context, nodeClass *v1alpha1.GCENodeClass) ([]*cloudprovider.InstanceType, error) {
-	p.muCache.Lock()
-	defer p.muCache.Unlock()
-
 	vmTypes, err := p.getInstanceTypes(ctx)
 	if err != nil {
 		return nil, fmt.Errorf("listing instance types: %w", err)

Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,6 @@ func NewDefaultProvider(ctx context.Context, authOptions auth.Credential) Defa`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`func (p DefaultProvider) List(ctx context.Context, nodeClass v1alpha1.GCENodeClass) ([]*cloudprovider.InstanceType, error) {`
`76`		`- p.muCache.Lock()`
`77`		`- defer p.muCache.Unlock()`
`78`		`-`
`79`	`76`	`vmTypes, err := p.getInstanceTypes(ctx)`
`80`	`77`	`if err != nil {`
`81`	`78`	`return nil, fmt.Errorf("listing instance types: %w", err)`