snapshot of https://github.com/mattermost/mattermost.git (master, 2026-09-16; blobs > 131072B omitted)
Some checks failed
Server CI / Postgres (shard 0) (push) Has been skipped
Server CI / Postgres (shard 3) (push) Has been skipped
BuildEnv Docker Image / build-image (push) Failing after 4s
BuildEnv Docker Image / build-image-fips (push) Failing after 4s
Migration Review & Release Notes / Generate migration review & release notes (push) Failing after 3s
Server CI / Build Environment (push) Failing after 3s
Server CI / Postgres (shard 1) (push) Has been skipped
Tools CI / check-style (mattermost-govet) (push) Failing after 4s
Server CI / Postgres (shard 2) (push) Has been skipped
Tools CI / check-style (mmgotool) (push) Failing after 3s
Server CI / Elasticsearch v8 Compatibility (push) Has been skipped
Server CI / OpenSearch v2 Compatibility (push) Has been skipped
Server CI / Postgres FIPS (shard 0) (push) Has been skipped
Tools CI / Test (mattermost-govet) (push) Failing after 3s
Server CI / Postgres FIPS (shard 1) (push) Has been skipped
Server CI / Postgres FIPS (shard 2) (push) Has been skipped
Tools CI / Test (mmgotool) (push) Failing after 3s
Server CI / Postgres FIPS (shard 3) (push) Has been skipped
Server CI / Run mmctl tests (push) Has been skipped
Server CI / Run mmctl tests (FIPS) (push) Has been skipped
Server CI / Merge Postgres Test Results (push) Has been skipped
Server CI / Merge Postgres FIPS Test Results (push) Has been skipped
Server CI / Check backport migrations (push) Has been skipped
Server CI / Check generated files (push) Has been skipped
Server CI / check-style (push) Has been skipped
Server CI / Vet API (push) Has been skipped
Server CI / Build mattermost server app (push) Has been skipped
Server CI / Server CI Complete (push) Failing after 2s
Server CI / Server CI Artifacts (push) Has been skipped
Server CI / Sentry Upload (push) Has been skipped
Server CI / Server CI Report (push) Failing after 5m1s
Server CI Nightly Race / Race Detector (push) Has been skipped
CodeQL / Analyze (go) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Webapp CI Cache Warm / Warm Webapp node_modules Cache (push) Has been cancelled
E2E CI Cache Warm / Warm E2E npm Registry Cache (push) Has been cancelled
API / build (push) Has been cancelled
Web App CI / check-types (push) Has been cancelled
Web App CI / check-lint (push) Has been cancelled
Web App CI / check-i18n (push) Has been cancelled
Web App CI / check-external-links (push) Has been cancelled
Web App CI / test (platform) (push) Has been cancelled
Web App CI / test (mattermost-redux) (push) Has been cancelled
Web App CI / test (channels shard 1/4) (push) Has been cancelled
Web App CI / test (channels shard 2/4) (push) Has been cancelled
Web App CI / test (channels shard 3/4) (push) Has been cancelled
Web App CI / test (channels shard 4/4) (push) Has been cancelled
Web App CI / upload-coverage (push) Has been cancelled
Web App CI / build (push) Has been cancelled
YAML Lint / yamllint (push) Has been cancelled
Push mirrored docker images / cd/Push mirrored docker images (push) Has been cancelled
docs-cd / Build and deploy docs (push) Has been cancelled
Docs CI / build (push) Has been cancelled
E2E Cache Warm: Cypress deps / Warm Cypress deps cache (push) Has been cancelled
Scorecards supply-chain security / Scorecard analysis (push) Has been cancelled
Server CI Weekly / Postgres FIPS (push) Has been skipped
Server CI Weekly / Run mmctl tests (FIPS) (push) Has been skipped
Server CI Weekly / Postgres with binary parameters (push) Has been skipped
Server CI Weekly / Build Environment (push) Failing after 1s
Server CI Nightly Race / Build Environment (push) Failing after 1s
Server CI Cache Warm / Warm Go Module and Build Cache (push) Failing after 1s
Some checks failed
Server CI / Postgres (shard 0) (push) Has been skipped
Server CI / Postgres (shard 3) (push) Has been skipped
BuildEnv Docker Image / build-image (push) Failing after 4s
BuildEnv Docker Image / build-image-fips (push) Failing after 4s
Migration Review & Release Notes / Generate migration review & release notes (push) Failing after 3s
Server CI / Build Environment (push) Failing after 3s
Server CI / Postgres (shard 1) (push) Has been skipped
Tools CI / check-style (mattermost-govet) (push) Failing after 4s
Server CI / Postgres (shard 2) (push) Has been skipped
Tools CI / check-style (mmgotool) (push) Failing after 3s
Server CI / Elasticsearch v8 Compatibility (push) Has been skipped
Server CI / OpenSearch v2 Compatibility (push) Has been skipped
Server CI / Postgres FIPS (shard 0) (push) Has been skipped
Tools CI / Test (mattermost-govet) (push) Failing after 3s
Server CI / Postgres FIPS (shard 1) (push) Has been skipped
Server CI / Postgres FIPS (shard 2) (push) Has been skipped
Tools CI / Test (mmgotool) (push) Failing after 3s
Server CI / Postgres FIPS (shard 3) (push) Has been skipped
Server CI / Run mmctl tests (push) Has been skipped
Server CI / Run mmctl tests (FIPS) (push) Has been skipped
Server CI / Merge Postgres Test Results (push) Has been skipped
Server CI / Merge Postgres FIPS Test Results (push) Has been skipped
Server CI / Check backport migrations (push) Has been skipped
Server CI / Check generated files (push) Has been skipped
Server CI / check-style (push) Has been skipped
Server CI / Vet API (push) Has been skipped
Server CI / Build mattermost server app (push) Has been skipped
Server CI / Server CI Complete (push) Failing after 2s
Server CI / Server CI Artifacts (push) Has been skipped
Server CI / Sentry Upload (push) Has been skipped
Server CI / Server CI Report (push) Failing after 5m1s
Server CI Nightly Race / Race Detector (push) Has been skipped
CodeQL / Analyze (go) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Webapp CI Cache Warm / Warm Webapp node_modules Cache (push) Has been cancelled
E2E CI Cache Warm / Warm E2E npm Registry Cache (push) Has been cancelled
API / build (push) Has been cancelled
Web App CI / check-types (push) Has been cancelled
Web App CI / check-lint (push) Has been cancelled
Web App CI / check-i18n (push) Has been cancelled
Web App CI / check-external-links (push) Has been cancelled
Web App CI / test (platform) (push) Has been cancelled
Web App CI / test (mattermost-redux) (push) Has been cancelled
Web App CI / test (channels shard 1/4) (push) Has been cancelled
Web App CI / test (channels shard 2/4) (push) Has been cancelled
Web App CI / test (channels shard 3/4) (push) Has been cancelled
Web App CI / test (channels shard 4/4) (push) Has been cancelled
Web App CI / upload-coverage (push) Has been cancelled
Web App CI / build (push) Has been cancelled
YAML Lint / yamllint (push) Has been cancelled
Push mirrored docker images / cd/Push mirrored docker images (push) Has been cancelled
docs-cd / Build and deploy docs (push) Has been cancelled
Docs CI / build (push) Has been cancelled
E2E Cache Warm: Cypress deps / Warm Cypress deps cache (push) Has been cancelled
Scorecards supply-chain security / Scorecard analysis (push) Has been cancelled
Server CI Weekly / Postgres FIPS (push) Has been skipped
Server CI Weekly / Run mmctl tests (FIPS) (push) Has been skipped
Server CI Weekly / Postgres with binary parameters (push) Has been skipped
Server CI Weekly / Build Environment (push) Failing after 1s
Server CI Nightly Race / Build Environment (push) Failing after 1s
Server CI Cache Warm / Warm Go Module and Build Cache (push) Failing after 1s
This commit is contained in:
290
server/public/plugin/environment_with_rpcerr_test.go
Normal file
290
server/public/plugin/environment_with_rpcerr_test.go
Normal file
@@ -0,0 +1,290 @@
|
||||
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
||||
// See LICENSE.txt for license information.
|
||||
|
||||
package plugin
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"io"
|
||||
"net/rpc"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/mattermost/mattermost/server/public/model"
|
||||
"github.com/mattermost/mattermost/server/public/plugin/utils"
|
||||
"github.com/mattermost/mattermost/server/public/shared/mlog"
|
||||
)
|
||||
|
||||
func TestRunMultiPluginHookWithRPCErr(t *testing.T) {
|
||||
pluginDir, err := os.MkdirTemp("", "mm-rpcerr-plugin")
|
||||
require.NoError(t, err)
|
||||
t.Cleanup(func() { os.RemoveAll(pluginDir) })
|
||||
webappPluginDir, err := os.MkdirTemp("", "mm-rpcerr-webapp")
|
||||
require.NoError(t, err)
|
||||
t.Cleanup(func() { os.RemoveAll(webappPluginDir) })
|
||||
|
||||
pluginID1 := "test-rpc-err-plugin"
|
||||
pluginID2 := "test-rpc-err-plugin-2"
|
||||
require.NoError(t, os.MkdirAll(filepath.Join(pluginDir, pluginID1), 0700))
|
||||
require.NoError(t, os.MkdirAll(filepath.Join(pluginDir, pluginID2), 0700))
|
||||
backend1 := filepath.Join(pluginDir, pluginID1, "backend.exe")
|
||||
backend2 := filepath.Join(pluginDir, pluginID2, "backend.exe")
|
||||
|
||||
utils.CompileGo(t, `
|
||||
package main
|
||||
|
||||
import (
|
||||
"github.com/mattermost/mattermost/server/public/model"
|
||||
"github.com/mattermost/mattermost/server/public/plugin"
|
||||
)
|
||||
|
||||
type MyPlugin struct {
|
||||
plugin.MattermostPlugin
|
||||
}
|
||||
|
||||
func (p *MyPlugin) MessageHasBeenPosted(c *plugin.Context, post *model.Post) {}
|
||||
|
||||
func main() {
|
||||
plugin.ClientMain(&MyPlugin{})
|
||||
}
|
||||
`, backend1)
|
||||
copyExecutable(t, backend1, backend2)
|
||||
|
||||
require.NoError(t, os.WriteFile(
|
||||
filepath.Join(pluginDir, pluginID1, "plugin.json"),
|
||||
[]byte(`{"id":"`+pluginID1+`","server":{"executable":"backend.exe"}}`),
|
||||
0600,
|
||||
))
|
||||
require.NoError(t, os.WriteFile(
|
||||
filepath.Join(pluginDir, pluginID2, "plugin.json"),
|
||||
[]byte(`{"id":"`+pluginID2+`","server":{"executable":"backend.exe"}}`),
|
||||
0600,
|
||||
))
|
||||
|
||||
logger := mlog.CreateConsoleTestLogger(t)
|
||||
apiImpl := func(*model.Manifest) API { return nil }
|
||||
env, err := NewEnvironment(apiImpl, nil, pluginDir, webappPluginDir, logger, nil)
|
||||
require.NoError(t, err)
|
||||
t.Cleanup(env.Shutdown)
|
||||
|
||||
_, _, err = env.Activate(pluginID1)
|
||||
require.NoError(t, err)
|
||||
require.True(t, env.IsActive(pluginID1))
|
||||
_, _, err = env.Activate(pluginID2)
|
||||
require.NoError(t, err)
|
||||
require.True(t, env.IsActive(pluginID2))
|
||||
|
||||
t.Run("both plugins healthy - closure invoked once per plugin", func(t *testing.T) {
|
||||
seen := map[string]int{}
|
||||
runErr := env.RunMultiPluginHookWithRPCErr(func(hooks HooksWithRPCErr, manifest *model.Manifest) (bool, error) {
|
||||
seen[manifest.Id]++
|
||||
require.NoError(t, hooks.MessageHasBeenPostedWithRPCErr(&Context{}, &model.Post{}))
|
||||
return true, nil
|
||||
}, MessageHasBeenPostedID)
|
||||
require.NoError(t, runErr)
|
||||
require.Equal(t, map[string]int{pluginID1: 1, pluginID2: 1}, seen)
|
||||
})
|
||||
|
||||
t.Run("closure error propagates and stops iteration", func(t *testing.T) {
|
||||
sentinel := errors.New("from closure")
|
||||
var calls int
|
||||
runErr := env.RunMultiPluginHookWithRPCErr(func(_ HooksWithRPCErr, _ *model.Manifest) (bool, error) {
|
||||
calls++
|
||||
return true, sentinel
|
||||
}, MessageHasBeenPostedID)
|
||||
require.ErrorIs(t, runErr, sentinel)
|
||||
require.Equal(t, 1, calls)
|
||||
})
|
||||
|
||||
t.Run("hook id not implemented - closure never invoked", func(t *testing.T) {
|
||||
var calls int
|
||||
runErr := env.RunMultiPluginHookWithRPCErr(func(_ HooksWithRPCErr, _ *model.Manifest) (bool, error) {
|
||||
calls++
|
||||
return true, nil
|
||||
}, MessageHasBeenUpdatedID)
|
||||
require.NoError(t, runErr)
|
||||
require.Equal(t, 0, calls)
|
||||
})
|
||||
|
||||
t.Run("rpc transport error surfaces after plugin process dies", func(t *testing.T) {
|
||||
rp, ok := env.registeredPlugins.Load(pluginID1)
|
||||
require.True(t, ok)
|
||||
sup := rp.(registeredPlugin).supervisor
|
||||
require.NotNil(t, sup)
|
||||
sup.client.Kill()
|
||||
|
||||
// Give the rpc client a moment to notice the dead connection.
|
||||
require.Eventually(t, func() bool {
|
||||
var rpcErr error
|
||||
_ = env.RunMultiPluginHookWithRPCErr(func(hooks HooksWithRPCErr, manifest *model.Manifest) (bool, error) {
|
||||
if manifest.Id != pluginID1 {
|
||||
return true, nil
|
||||
}
|
||||
rpcErr = hooks.MessageHasBeenPostedWithRPCErr(&Context{}, &model.Post{})
|
||||
return true, nil
|
||||
}, MessageHasBeenPostedID)
|
||||
return rpcErr != nil
|
||||
}, 2*time.Second, 50*time.Millisecond)
|
||||
})
|
||||
}
|
||||
|
||||
// TestShutdownNoRPCErrorsDuringConcurrentHookDispatch verifies that concurrent
|
||||
// RunMultiPluginHookWithRPCErr calls during Shutdown do not observe "connection
|
||||
// is shut down" errors.
|
||||
//
|
||||
// The race: Shutdown closes each plugin's RPC connection (supervisor.Shutdown)
|
||||
// before removing it from registeredPlugins, leaving a window where the plugin
|
||||
// still appears active but its transport is dead. The fix sets the plugin state
|
||||
// to NotRunning before closing the RPC, so concurrent callers skip it cleanly.
|
||||
func TestShutdownNoRPCErrorsDuringConcurrentHookDispatch(t *testing.T) {
|
||||
pluginDir, err := os.MkdirTemp("", "mm-shutdown-race-plugin")
|
||||
require.NoError(t, err)
|
||||
t.Cleanup(func() { os.RemoveAll(pluginDir) })
|
||||
webappPluginDir, err := os.MkdirTemp("", "mm-shutdown-race-webapp")
|
||||
require.NoError(t, err)
|
||||
t.Cleanup(func() { os.RemoveAll(webappPluginDir) })
|
||||
|
||||
fastID := "test-shutdown-race-fast"
|
||||
slowID := "test-shutdown-race-slow"
|
||||
require.NoError(t, os.MkdirAll(filepath.Join(pluginDir, fastID), 0700))
|
||||
require.NoError(t, os.MkdirAll(filepath.Join(pluginDir, slowID), 0700))
|
||||
|
||||
fastBackend := filepath.Join(pluginDir, fastID, "backend.exe")
|
||||
slowBackend := filepath.Join(pluginDir, slowID, "backend.exe")
|
||||
|
||||
// fast plugin: instant OnDeactivate
|
||||
utils.CompileGo(t, `
|
||||
package main
|
||||
|
||||
import (
|
||||
"github.com/mattermost/mattermost/server/public/model"
|
||||
"github.com/mattermost/mattermost/server/public/plugin"
|
||||
)
|
||||
|
||||
type FastPlugin struct{ plugin.MattermostPlugin }
|
||||
|
||||
func (p *FastPlugin) MessageHasBeenPosted(_ *plugin.Context, _ *model.Post) {}
|
||||
|
||||
func main() { plugin.ClientMain(&FastPlugin{}) }
|
||||
`, fastBackend)
|
||||
|
||||
// slow plugin: OnDeactivate blocks until the test signals it via MessageWillBePosted,
|
||||
// keeping Shutdown's wg.Wait alive so the fast plugin's entry lingers in registeredPlugins.
|
||||
utils.CompileGo(t, `
|
||||
package main
|
||||
|
||||
import (
|
||||
"sync"
|
||||
|
||||
"github.com/mattermost/mattermost/server/public/model"
|
||||
"github.com/mattermost/mattermost/server/public/plugin"
|
||||
)
|
||||
|
||||
type SlowPlugin struct {
|
||||
plugin.MattermostPlugin
|
||||
once sync.Once
|
||||
proceed chan struct{}
|
||||
}
|
||||
|
||||
func (p *SlowPlugin) OnActivate() error {
|
||||
p.proceed = make(chan struct{})
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *SlowPlugin) OnDeactivate() error {
|
||||
<-p.proceed
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *SlowPlugin) MessageWillBePosted(_ *plugin.Context, _ *model.Post) (*model.Post, string) {
|
||||
p.once.Do(func() { close(p.proceed) })
|
||||
return nil, ""
|
||||
}
|
||||
|
||||
func (p *SlowPlugin) MessageHasBeenPosted(_ *plugin.Context, _ *model.Post) {}
|
||||
|
||||
func main() { plugin.ClientMain(&SlowPlugin{}) }
|
||||
`, slowBackend)
|
||||
|
||||
require.NoError(t, os.WriteFile(
|
||||
filepath.Join(pluginDir, fastID, "plugin.json"),
|
||||
[]byte(`{"id":"`+fastID+`","server":{"executable":"backend.exe"}}`),
|
||||
0600,
|
||||
))
|
||||
require.NoError(t, os.WriteFile(
|
||||
filepath.Join(pluginDir, slowID, "plugin.json"),
|
||||
[]byte(`{"id":"`+slowID+`","server":{"executable":"backend.exe"}}`),
|
||||
0600,
|
||||
))
|
||||
|
||||
logger := mlog.CreateConsoleTestLogger(t)
|
||||
apiImpl := func(*model.Manifest) API { return nil }
|
||||
env, err := NewEnvironment(apiImpl, nil, pluginDir, webappPluginDir, logger, nil)
|
||||
require.NoError(t, err)
|
||||
|
||||
_, _, err = env.Activate(fastID)
|
||||
require.NoError(t, err)
|
||||
_, _, err = env.Activate(slowID)
|
||||
require.NoError(t, err)
|
||||
|
||||
// Race window: Shutdown is running concurrently. After the fast plugin's RPC
|
||||
// is closed (it finishes OnDeactivate first) but before registeredPlugins is
|
||||
// cleaned up (gated on the slow plugin finishing), concurrent hook dispatches
|
||||
// must not observe net/rpc.ErrShutdown.
|
||||
//
|
||||
// The slow plugin blocks in OnDeactivate until we call MessageWillBePosted,
|
||||
// giving us a controlled window to dispatch hooks while the fast plugin's RPC
|
||||
// is already closed. Each dispatch involves IPC (a Unix socket round-trip),
|
||||
// which yields to the scheduler and lets the fast plugin's teardown goroutine run.
|
||||
shutdownDone := make(chan struct{})
|
||||
go func() {
|
||||
defer close(shutdownDone)
|
||||
env.Shutdown()
|
||||
}()
|
||||
|
||||
var rpcErrs []error
|
||||
for range 200 {
|
||||
_ = env.RunMultiPluginHookWithRPCErr(func(hooks HooksWithRPCErr, _ *model.Manifest) (bool, error) {
|
||||
if rpcErr := hooks.MessageHasBeenPostedWithRPCErr(&Context{}, &model.Post{}); rpcErr != nil {
|
||||
rpcErrs = append(rpcErrs, rpcErr)
|
||||
}
|
||||
return true, nil
|
||||
}, MessageHasBeenPostedID)
|
||||
}
|
||||
|
||||
// Signal the slow plugin to finish OnDeactivate, unblocking Shutdown.
|
||||
env.RunMultiPluginHook(func(hooks Hooks, _ *model.Manifest) bool {
|
||||
hooks.MessageWillBePosted(&Context{}, &model.Post{})
|
||||
return true
|
||||
}, MessageWillBePostedID)
|
||||
|
||||
<-shutdownDone
|
||||
|
||||
// Filter to only the canonical shutdown error so the test isn't brittle
|
||||
// against other transient RPC errors (e.g. EOF on race-y reads).
|
||||
var shutdownErrs []error
|
||||
for _, e := range rpcErrs {
|
||||
if errors.Is(e, rpc.ErrShutdown) {
|
||||
shutdownErrs = append(shutdownErrs, e)
|
||||
}
|
||||
}
|
||||
assert.Empty(t, shutdownErrs,
|
||||
"RunMultiPluginHookWithRPCErr dispatched to a plugin whose RPC connection was already closed during Shutdown")
|
||||
}
|
||||
|
||||
func copyExecutable(t *testing.T, src, dst string) {
|
||||
t.Helper()
|
||||
in, err := os.Open(src)
|
||||
require.NoError(t, err)
|
||||
defer in.Close()
|
||||
out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0700)
|
||||
require.NoError(t, err)
|
||||
defer out.Close()
|
||||
_, err = io.Copy(out, in)
|
||||
require.NoError(t, err)
|
||||
}
|
||||
Reference in New Issue
Block a user