dilim/containerd
1
0
Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-08-09 01:21:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13390 from k8s-infra-cherrypick-robot/cherry-pick-13363-to-release/2.3

Browse Source 
[release/2.3] server: tolerate failed gRPC plugins when starting listeners
This commit is contained in:
Maksym Pavlenko
2026-05-12 21:05:55 -07:00
committed by GitHub
parent 1ad3402b85 3a88fdde0c
commit 2315484b7e
2 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
plugins/server/grpc/plugin.go
View File

@@ -20,7 +20,6 @@ import (
"context"
"crypto/tls"
"crypto/x509"
"errors"
"fmt"
"net"
"os"
@@ -112,12 +111,19 @@ func init() {
}
s := grpc.NewServer(serverOpts...)
ps, err := ic.GetByType(plugins.GRPCPlugin) // ensure grpc plugin is initialized
if err != nil && !errors.Is(err, plugin.ErrPluginNotFound) {
return nil, err
}
for _, p := range ps {
if gs, ok := p.(grpcService); ok {
// Iterate plugins directly rather than using GetByType, which
// short-circuits on the first plugin that failed to initialize.
// Plugins that failed (e.g. CRI under rootless) have already been
// logged and should not prevent the GRPC server from starting.
for _, p := range ic.Plugins().GetAll() {
if p.Registration.Type != plugins.GRPCPlugin {
continue
}
instance, err := p.Instance()
if err != nil {
continue
}
if gs, ok := instance.(grpcService); ok {
if err := gs.Register(s); err != nil {
return nil, fmt.Errorf("failed to register grpc service: %w", err)
}
@@ -218,13 +224,18 @@ func init() {
}
s := grpc.NewServer(serverOpts...)
ps, err := ic.GetByType(plugins.GRPCPlugin) // ensure grpc plugin is initialized
if err != nil && !errors.Is(err, plugin.ErrPluginNotFound) {
return nil, err
}
// Iterate plugins directly rather than using GetByType, which
// short-circuits on the first plugin that failed to initialize.
var hasService bool
for _, p := range ps {
if gs, ok := p.(tcpService); ok {
for _, p := range ic.Plugins().GetAll() {
if p.Registration.Type != plugins.GRPCPlugin {
continue
}
instance, err := p.Instance()
if err != nil {
continue
}
if gs, ok := instance.(tcpService); ok {
if err := gs.RegisterTCP(s); err != nil {
return nil, fmt.Errorf("failed to register grpc service: %w", err)
}

30
plugins/server/ttrpc/plugin.go
View File

@@ -18,7 +18,6 @@ package ttrpc
import (
"context"
"errors"
"fmt"
"net"
"os"
@@ -75,25 +74,20 @@ func init() {
type ttrpcService interface {
RegisterTTRPC(*ttrpc.Server) error
}
// Iterate plugins directly rather than using GetByType, which
// short-circuits on the first plugin that failed to initialize.
// Plugins that failed (e.g. CRI under rootless) have already been
// logged and should not prevent the TTRPC server from starting.
var hasService bool
ps, err := ic.GetByType(plugins.TTRPCPlugin) // ensure grpc plugin is initialized
if err != nil && !errors.Is(err, plugin.ErrPluginNotFound) {
return nil, err
}
for _, p := range ps {
if gs, ok := p.(ttrpcService); ok {
if err := gs.RegisterTTRPC(s); err != nil {
return nil, fmt.Errorf("failed to register ttrpc service: %w", err)
}
hasService = true
for _, p := range ic.Plugins().GetAll() {
if p.Registration.Type != plugins.TTRPCPlugin && p.Registration.Type != plugins.GRPCPlugin {
continue
}
}
ps, err = ic.GetByType(plugins.GRPCPlugin) // ensure grpc plugin is initialized
if err != nil && !errors.Is(err, plugin.ErrPluginNotFound) {
return nil, err
}
for _, p := range ps {
if gs, ok := p.(ttrpcService); ok {
instance, err := p.Instance()
if err != nil {
continue
}
if gs, ok := instance.(ttrpcService); ok {
if err := gs.RegisterTTRPC(s); err != nil {
return nil, fmt.Errorf("failed to register ttrpc service: %w", err)
}