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

Jump to bottom

Pluginwatcher: Fix panic on failed startup #70821

Merged
merged 3 commits into from
Nov 10, 2018
Merged

Pluginwatcher: Fix panic on failed startup #70821

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f5039a
Fix pluginwatcher panic on failed startup
Nov 8, 2018
3a467ff
Pluginwatcher: log error when walking fs rather than fail
Nov 8, 2018
11fef8b
Pluginwatcher should prevent kubelet from starting if we cannot watch…
Nov 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion pkg/kubelet/util/pluginwatcher/plugin_watcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,17 @@ func (w *Watcher) init() error {
}

// Walks through the plugin directory discover any existing plugin sockets.
// Goroutines started here will be waited for in Stop() before cleaning up.
// Ignore all errors except root dir not being walkable
func (w *Watcher) traversePluginDir(dir string) error {
return w.fs.Walk(dir, func(path string, info os.FileInfo, err error) error {
if err != nil {
return fmt.Errorf("error accessing path: %s error: %v", path, err)
if path == dir {
return fmt.Errorf("error accessing path: %s error: %v", path, err)
}

glog.Errorf("error accessing path: %s error: %v", path, err)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this cause all of plugin registration to fail or will it continue to walk? What kind of traversal ordering does this do?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What kind of traversal ordering does this do?

See filepath.Walk:

The files are walked in lexical order, which makes the output deterministic but means that for very large directories Walk can be inefficient. Walk does not follow symbolic links.

Will this cause all of plugin registration to fail or will it continue to walk?

No this will cause the traversePlugin function to ignore directories or files that can't be walked.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could we return a failure if it fail to access all dirs and files including root dir?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we chat a little offline, i think we only need to return error when root dir access failed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

return nil
}

switch mode := info.Mode(); {
Expand All @@ -187,7 +194,9 @@ func (w *Watcher) traversePluginDir(dir string) error {
return fmt.Errorf("failed to watch %s, err: %v", path, err)
}
case mode&os.ModeSocket != 0:
w.wg.Add(1)
go func() {
defer w.wg.Done()
w.fsWatcher.Events <- fsnotify.Event{
Name: path,
Op: fsnotify.Create,
Expand Down