opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-31 05:12:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Plugins: Remove registry dependency from process manager (#73241)

Browse Source 
simplify
This commit is contained in:
Will Browne
2023-08-16 10:46:00 +02:00
committed by GitHub
parent d935e6ff57
commit 75b0788377
16 changed files with 202 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
pkg/plugins/manager/process/process.go
View File

@ -3,54 +3,22 @@ package process
import (
"context"
"errors"
"sync"
"time"
"github.com/grafana/grafana/pkg/plugins"
"github.com/grafana/grafana/pkg/plugins/backendplugin"
"github.com/grafana/grafana/pkg/plugins/log"
"github.com/grafana/grafana/pkg/plugins/manager/registry"
)
var _ Service = (*Manager)(nil)
type Service struct{}
type Manager struct {
pluginRegistry registry.Service
mu sync.Mutex
log log.Logger
func ProvideService() *Service {
return &Service{}
}
func ProvideService(pluginRegistry registry.Service) *Manager {
return NewManager(pluginRegistry)
}
func NewManager(pluginRegistry registry.Service) *Manager {
return &Manager{
pluginRegistry: pluginRegistry,
log: log.New("plugin.process.manager"),
}
}
func (m *Manager) Run(ctx context.Context) error {
<-ctx.Done()
m.shutdown(ctx)
return ctx.Err()
}
func (m *Manager) Start(ctx context.Context, pluginID string) error {
p, exists := m.pluginRegistry.Plugin(ctx, pluginID)
if !exists {
return backendplugin.ErrPluginNotRegistered
}
func (*Service) Start(ctx context.Context, p *plugins.Plugin) error {
if !p.IsManaged() || !p.Backend || p.SignatureError != nil {
return nil
}
m.mu.Lock()
defer m.mu.Unlock()
if err := startPluginAndRestartKilledProcesses(ctx, p); err != nil {
return err
}
@ -59,15 +27,8 @@ func (m *Manager) Start(ctx context.Context, pluginID string) error {
return nil
}
func (m *Manager) Stop(ctx context.Context, pluginID string) error {
p, exists := m.pluginRegistry.Plugin(ctx, pluginID)
if !exists {
return backendplugin.ErrPluginNotRegistered
}
m.log.Debug("Stopping plugin process", "pluginId", p.ID)
m.mu.Lock()
defer m.mu.Unlock()
func (*Service) Stop(ctx context.Context, p *plugins.Plugin) error {
p.Logger().Debug("Stopping plugin process")
if err := p.Decommission(); err != nil {
return err
}
@ -79,23 +40,6 @@ func (m *Manager) Stop(ctx context.Context, pluginID string) error {
return nil
}
// shutdown stops all backend plugin processes
func (m *Manager) shutdown(ctx context.Context) {
var wg sync.WaitGroup
for _, p := range m.pluginRegistry.Plugins(ctx) {
wg.Add(1)
go func(p backendplugin.Plugin, ctx context.Context) {
defer wg.Done()
p.Logger().Debug("Stopping plugin")
if err := p.Stop(ctx); err != nil {
p.Logger().Error("Failed to stop plugin", "error", err)
}
p.Logger().Debug("Plugin stopped")
}(p, ctx)
}
wg.Wait()
}
func startPluginAndRestartKilledProcesses(ctx context.Context, p *plugins.Plugin) error {
if err := p.Start(ctx); err != nil {
return err
@ -123,7 +67,7 @@ func restartKilledProcess(ctx context.Context, p *plugins.Plugin) error {
if err := ctx.Err(); err != nil && !errors.Is(err, context.Canceled) {
return err
}
return nil
return p.Stop(ctx)
case <-ticker.C:
if p.IsDecommissioned() {
p.Logger().Debug("Plugin decommissioned")