78bd17e805
Instead of using `MNT_DETACH` to unmount the container's mqueue/shm mounts, force it... but only on daemon init and shutdown. This makes sure that these IPC mounts are cleaned up even when the daemon is killed. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
60 lines
1.4 KiB
Go
60 lines
1.4 KiB
Go
package daemon
|
|
|
|
import (
|
|
"bufio"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"github.com/Sirupsen/logrus"
|
|
"github.com/docker/docker/pkg/mount"
|
|
)
|
|
|
|
// cleanupMounts umounts shm/mqueue mounts for old containers
|
|
func (daemon *Daemon) cleanupMounts() error {
|
|
logrus.Debugf("Cleaning up old shm/mqueue mounts: start.")
|
|
f, err := os.Open("/proc/self/mountinfo")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer f.Close()
|
|
|
|
return daemon.cleanupMountsFromReader(f, mount.Unmount)
|
|
}
|
|
|
|
func (daemon *Daemon) cleanupMountsFromReader(reader io.Reader, unmount func(target string) error) error {
|
|
if daemon.repository == "" {
|
|
return nil
|
|
}
|
|
sc := bufio.NewScanner(reader)
|
|
var errors []string
|
|
for sc.Scan() {
|
|
line := sc.Text()
|
|
fields := strings.Fields(line)
|
|
if strings.HasPrefix(fields[4], daemon.repository) {
|
|
logrus.Debugf("Mount base: %v, repository %s", fields[4], daemon.repository)
|
|
mnt := fields[4]
|
|
mountBase := filepath.Base(mnt)
|
|
if mountBase == "mqueue" || mountBase == "shm" {
|
|
logrus.Debugf("Unmounting %v", mnt)
|
|
if err := unmount(mnt); err != nil {
|
|
logrus.Error(err)
|
|
errors = append(errors, err.Error())
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if err := sc.Err(); err != nil {
|
|
return err
|
|
}
|
|
|
|
if len(errors) > 0 {
|
|
return fmt.Errorf("Error cleaningup mounts:\n%v", strings.Join(errors, "\n"))
|
|
}
|
|
|
|
logrus.Debugf("Cleaning up old shm/mqueue mounts: done.")
|
|
return nil
|
|
}
|