Commits on Apr 18, 2024

1. Fix deadlock during NRI plugin registration …

   During NRI external plugin registration:
   
   * `acceptPluginConnections()` is called
   * adaptation lock from `nri/pkg/adaptation` is acquired
   * `syncFn` is invoked
   * `syncFn` acquires NRI lock in `pkg/nri/nri.go`
   
   During container lifecycle events such as `ContainerStart`
   * NRI lock is acquired in pkg/nri.go
   * adaptation lock is acquired in `StateChange()` in `nri/pkg/adaptation`
   
   As a result, the locking order during NRI plugin registration is:
   * adaptation lock -> NRI lock
   
   While the locking order during container starts is:
   * NRI lock -> adaptation lock
   
   Due the fact that the locking order is inverted and not consistent, it
   it possible to encounter a deadlock.
   
   To fix the issue, during NRI plugin registration, first acquire the NRI
   lock (done via `syncFn` call) and only after acquire the adaptation lock.
   This ensures that NRI plugin registration the locking order is adaption
   lock -> NRI lock, which is consistent with the locking order during
   container lifecycle events.
   
   Fixes containerd/containerd#10085
   
   Signed-off-by: David Porter <porterdavid@google.com>

   

   bobbypage committed Apr 18, 2024
   Configuration menu

   • View commit details
   • Copy full SHA for c4893c7
   • Browse repository at this point

   Copy the full SHA

   c4893c7 View commit details

   Browse the repository at this point in the history