Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Configure plugin start timeout for go-plugin.Client (#4477) #4478

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Configure plugin start timeout for go-plugin.Client (#4477) #4478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1a165f
Configure plugin start timeout for go-plugin.Client (#4477)
nmische Jan 25, 2025
98dfcda
Fix typo
nmische Jan 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkg/pluginmanager/lifecycle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"log"
"os/exec"
"syscall"
"time"

"github.com/hashicorp/go-hclog"
"github.com/hashicorp/go-plugin"
Expand Down Expand Up @@ -64,6 +65,7 @@ func start(steampipeExecutablePath string) (*State, error) {
Cmd: pluginManagerCmd,
AllowedProtocols: []plugin.Protocol{plugin.ProtocolGRPC},
Logger: logger,
StartTimeout: 3 * time.Minute, //TODO: make this configurable
})

if _, err := client.Start(); err != nil {
Expand Down
16 changes: 15 additions & 1 deletion pkg/pluginmanager_service/plugin_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,11 +501,25 @@ func (m *PluginManager) startPluginProcess(pluginInstance string, connectionConf

cmd := exec.Command(pluginPath)
m.setPluginMaxMemory(pluginConfig, cmd)
pluginStartTimeoutSecs := pluginConfig.GetStartTimeout()
if pluginStartTimeoutSecs == 0 {
if viper.IsSet(pconstants.ArgPluginStartTimeout) {
pluginStartTimeoutSecs = viper.GetInt64(pconstants.ArgPluginStartTimeout)
}
}
if pluginStartTimeoutSecs == 0 {
// if we don't have any timeout set use 30 seconds
pluginStartTimeoutSecs = int64(30)
}
pluginStartTimeoutDuration := time.Duration(pluginStartTimeoutSecs) * time.Second
log.Printf("[TRACE] %s pluginStartTimeoutDuration: %s", pluginPath, pluginStartTimeoutDuration)

client := goplugin.NewClient(&goplugin.ClientConfig{
HandshakeConfig: sdkshared.Handshake,
Plugins: pluginMap,
Cmd: cmd,
AllowedProtocols: []goplugin.Protocol{goplugin.ProtocolGRPC},
StartTimeout: pluginStartTimeoutDuration,

// pass our logger to the plugin client to ensure plugin logs end up in logfile
Logger: m.logger,
Expand Down Expand Up @@ -678,7 +692,7 @@ func (m *PluginManager) waitForPluginLoad(p *runningPlugin, req *pb.GetRequest)
}
pluginStartTimeoutSecs := pluginConfig.GetStartTimeout()
if pluginStartTimeoutSecs == 0 {
if viper.IsSet(pconstants.ArgMemoryMaxMbPlugin) {
if viper.IsSet(pconstants.ArgPluginStartTimeout) {
pluginStartTimeoutSecs = viper.GetInt64(pconstants.ArgPluginStartTimeout)
}
}
Expand Down
Loading