containers
/
toolbox
mirror of https://github.com/containers/toolbox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmd/initContainer: Defend against insufficient resources for inotify(7) 

Currently, inotify(7) is used to keep /etc/timezone inside the Toolbx
container synchronized with the host operating system's /etc/localtime.
However, /etc/timezone is only there for compatibility with Java.  The
vast majority of non-ancient code bases use /etc/localtime, which does
not need inotify(7) to stay synchronized.

Therefore, it's not worth preventing the container from starting when
the operating system is suffering from a shortage of resources needed
for inotify(7).  Especially because this shortage can be caused by a bug
in another program that's consuming too many inotify(7) instances and
watches.

https://github.com/containers/toolbox/issues/1329
This commit is contained in:
Debarshi Ray 2023-12-15 01:30:12 +01:00
parent 96ca9c6563
commit 786723116c
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/cmd/initContainer.go
View File

@ -32,6 +32,7 @@ import (
"github.com/fsnotify/fsnotify" "github.com/fsnotify/fsnotify"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"golang.org/x/sys/unix"
) )
var ( var (
@ -295,15 +296,31 @@ func initContainer(cmd *cobra.Command, args []string) error {
logrus.Debug("Setting up watches for file system events") logrus.Debug("Setting up watches for file system events")
var watcherForHostErrors chan error
var watcherForHostEvents chan fsnotify.Event
watcherForHost, err := fsnotify.NewWatcher() watcherForHost, err := fsnotify.NewWatcher()
if err != nil { if err != nil {
return err if errors.Is(err, unix.EMFILE) || errors.Is(err, unix.ENFILE) || errors.Is(err, unix.ENOMEM) {
logrus.Debugf("Setting up watches for file system events: failed to create Watcher: %s", err)
} else {
return fmt.Errorf("failed to create Watcher: %w", err)
}
} }
defer watcherForHost.Close() if watcherForHost != nil {
defer watcherForHost.Close()
if err := watcherForHost.Add("/run/host/etc"); err != nil { watcherForHostErrors = watcherForHost.Errors
return err watcherForHostEvents = watcherForHost.Events
if err := watcherForHost.Add("/run/host/etc"); err != nil {
if errors.Is(err, unix.ENOMEM) || errors.Is(err, unix.ENOSPC) {
logrus.Debugf("Setting up watches for file system events: failed to add path: %s", err)
} else {
return fmt.Errorf("failed to add path: %w", err)
}
}
} }
logrus.Debug("Finished initializing container") logrus.Debug("Finished initializing container")
@ -343,9 +360,9 @@ func initContainer(cmd *cobra.Command, args []string) error {
select { select {
case event := <-tickerDaily.C: case event := <-tickerDaily.C:
handleDailyTick(event) handleDailyTick(event)
case event := <-watcherForHost.Events: case event := <-watcherForHostEvents:
handleFileSystemEvent(event) handleFileSystemEvent(event)
case err := <-watcherForHost.Errors: case err := <-watcherForHostErrors:
logrus.Warnf("Received an error from the file system watcher: %v", err) logrus.Warnf("Received an error from the file system watcher: %v", err)
} }
} }