IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Plugins: Don't start runner ticker for Core plugins (#46964)

Browse Source 
* Plugins: Don't start runner ticker for Core plugins

* add test

* correct start check in test
This commit is contained in:
Will Browne 2022-03-30 14:48:49 +02:00 committed by GitHub
parent 114704e2e2
commit 23dde457ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/plugins/manager/manager.go
View File

@ -185,13 +185,15 @@ func (m *PluginManager) start(ctx context.Context, p *plugins.Plugin) error {
return backendplugin.ErrPluginNotRegistered return backendplugin.ErrPluginNotRegistered
} }
if p.IsCorePlugin() {
return nil
}
if err := startPluginAndRestartKilledProcesses(ctx, p); err != nil { if err := startPluginAndRestartKilledProcesses(ctx, p); err != nil {
return err return err
} }
if !p.IsCorePlugin() { p.Logger().Debug("Successfully started backend plugin process")
p.Logger().Debug("Successfully started backend plugin process")
}
return nil return nil
} }

18
pkg/plugins/manager/manager_test.go
View File

@ -242,7 +242,7 @@ func TestPluginManager_Installer(t *testing.T) {
err := pm.loadPlugins(context.Background(), plugins.Core, "test/path") err := pm.loadPlugins(context.Background(), plugins.Core, "test/path")
require.NoError(t, err) require.NoError(t, err)
assert.Equal(t, 1, pc.startCount) assert.Equal(t, 0, pc.startCount)
assert.Equal(t, 0, pc.stopCount) assert.Equal(t, 0, pc.stopCount)
assert.False(t, pc.exited) assert.False(t, pc.exited)
assert.False(t, pc.decommissioned) assert.False(t, pc.decommissioned)
@ -433,6 +433,20 @@ func TestPluginManager_lifecycle_managed(t *testing.T) {
}) })
}) })
}) })
newScenario(t, true, func(t *testing.T, ctx *managerScenarioCtx) {
t.Run("Backend core plugin is registered but not started", func(t *testing.T) {
ctx.plugin.Class = plugins.Core
err := ctx.manager.registerAndStart(context.Background(), ctx.plugin)
require.NoError(t, err)
require.NotNil(t, ctx.plugin)
require.Equal(t, testPluginID, ctx.plugin.ID)
require.Equal(t, 0, ctx.pluginClient.startCount)
testPlugin, exists := ctx.manager.Plugin(context.Background(), testPluginID)
assert.True(t, exists)
require.NotNil(t, testPlugin)
})
})
} }
func TestPluginManager_lifecycle_unmanaged(t *testing.T) { func TestPluginManager_lifecycle_unmanaged(t *testing.T) {
@ -541,7 +555,7 @@ func newScenario(t *testing.T, managed bool, fn func(t *testing.T, ctx *managerS
manager: manager, manager: manager,
} }
ctx.plugin, ctx.pluginClient = createPlugin(testPluginID, "", plugins.Core, managed, true) ctx.plugin, ctx.pluginClient = createPlugin(testPluginID, "", plugins.External, managed, true)
fn(t, ctx) fn(t, ctx)
} }