Skip to content

Remove unneeded noise from the cleanup watcher in case the plugin state directory hasn't been created yet. #299

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

Merged
copybara-service merged 1 commit into from
Feb 14, 2026
Merged

Remove unneeded noise from the cleanup watcher in case the plugin state directory hasn't been created yet. #299

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions internal/plugin/manager/cleanup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ func (m *PluginManager) retryFailedRemovals(ctx context.Context) (bool, error) {
pluginInstallLoc := filepath.Join(baseState(), pluginInstallDir)
pluginDirs, err := os.ReadDir(pluginInstallLoc)
if err != nil {
if errors.Is(err, os.ErrNotExist) {
galog.V(1).Debugf("Plugin install directory %q does not exist, nothing to clean up", pluginInstallLoc)
return true, nil
}
return true, fmt.Errorf("failed to read plugin install directory: %w", err)
}

Expand All @@ -58,7 +62,7 @@ func (m *PluginManager) retryFailedRemovals(ctx context.Context) (bool, error) {
nameIndex := strings.LastIndex(p.Name(), "_")
pluginName := p.Name()[:nameIndex]
pluginRevision := p.Name()[nameIndex+1:]
galog.Debugf("Checking plugin %q, revision %q", pluginName, pluginRevision)
galog.V(1).Debugf("Checking plugin %q, revision %q", pluginName, pluginRevision)
// We want to avoid cleaning up plugins that currently have a request in progress.
// This is to prevent a race condition where the plugin is removed in the
// middle of an installation request.
Expand All @@ -81,10 +85,10 @@ func (m *PluginManager) retryFailedRemovals(ctx context.Context) (bool, error) {
}
// Check if the link points to a plugin directory that is no longer cached
// by the guest agent.
galog.Debugf("Checking link %q", link)
galog.V(1).Debugf("Checking link %q", link)
if _, ok := failedRemovals[filepath.Base(dest)]; ok {
linkPath := filepath.Join(pluginInstallLoc, link)
galog.Debugf("Removing link %q", linkPath)
galog.V(1).Debugf("Removing link %q", linkPath)
if err := os.Remove(linkPath); err != nil {
galog.Debugf("Unable to remove link %q: %v", linkPath, err)
}
Expand Down