0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add additional loggig in case of error of renaming runtimes-old and removing it

Browse source 
Signed-off-by: Illia Antypenko <ilya@antipenko.pp.ua>
(cherry picked from commit 07ba3e35d3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Illia Antypenko 2022-11-18 09:05:42 +01:00 • committed by Sebastiaan van Stijn
parent a8926de2a1
commit 322149038a
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
daemon/runtime_unix.go
View file

@ -53,8 +53,9 @@ func (daemon *Daemon) loadRuntimes() error {
func (daemon *Daemon) initRuntimes(runtimes map[string]types.Runtime) (err error) {
runtimeDir := filepath.Join(daemon.configStore.Root, "runtimes")
runtimeOldDir := runtimeDir + "-old"
// Remove old temp directory if any
os.RemoveAll(runtimeDir + "-old")
os.RemoveAll(runtimeOldDir)
tmpDir, err := os.MkdirTemp(daemon.configStore.Root, "gen-runtimes")
if err != nil {
return errors.Wrap(err, "failed to get temp dir to generate runtime scripts")
@ -68,8 +69,12 @@ func (daemon *Daemon) initRuntimes(runtimes map[string]types.Runtime) (err error
return
}
if err = os.Rename(runtimeDir, runtimeDir+"-old"); err != nil {
if err = os.Rename(runtimeDir, runtimeOldDir); err != nil {
logrus.WithError(err).WithField("dir", runtimeDir).
Warn("failed to rename runtimes dir to old. Will try to removing it")
if err = os.RemoveAll(runtimeDir); err != nil {
logrus.WithError(err).WithField("dir", runtimeDir).
Warn("failed to remove old runtimes dir")
return
}
}
@ -77,8 +82,8 @@ func (daemon *Daemon) initRuntimes(runtimes map[string]types.Runtime) (err error
err = errors.Wrap(err, "failed to setup runtimes dir, new containers may not start")
return
}
if err = os.RemoveAll(runtimeDir + "-old"); err != nil {
logrus.WithError(err).WithField("dir", tmpDir).
if err = os.RemoveAll(runtimeOldDir); err != nil {
logrus.WithError(err).WithField("dir", runtimeOldDir).
Warn("failed to remove old runtimes dir")
}
}()