Merge pull request #79 from bobbypage/gh_nri_10085

Fix deadlock during NRI plugin registration
containerd · Apr 18, 2024 · fa64d11 · fa64d11
2 parents 53d3371 + c4893c7
commit fa64d11
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/pkg/adaptation/adaptation.go b/pkg/adaptation/adaptation.go
@@ -431,18 +431,16 @@ func (r *Adaptation) acceptPluginConnections(l net.Listener) error {
 				continue
 			}
 
-			r.Lock()
-
 			err = r.syncFn(ctx, p.synchronize)
 			if err != nil {
 				log.Infof(ctx, "failed to synchronize plugin: %v", err)
 			} else {
+				r.Lock()
 				r.plugins = append(r.plugins, p)
 				r.sortPlugins()
+				r.Unlock()
 			}
 
-			r.Unlock()
-
 			log.Infof(ctx, "plugin %q connected", p.name())
 		}
 	}()