Run imageservice.Cleanup() also before daemon start

Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>

Author: olljanat

daemon/daemon.go

@@ -1039,6 +1039,13 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S
 		TrustKey:                  trustKey,
 	})
 
+	// Image cleanup on some graph drivers (e.g. windowsfilter) takes so much time
+	// that it is not able to run during default 15 seconds shutdown timeout
+	// that why we run cleanup also just before daemon starts.
+	if !d.configStore.LiveRestoreEnabled {
+		d.imageService.Cleanup()
+	}
+
 	go d.execCommandGC()
 
 	d.containerd, err = libcontainerd.NewClient(ctx, d.containerdCli, filepath.Join(config.ExecRoot, "containerd"), config.ContainerdNamespace, d)

daemon/images/service.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"os"
 	"runtime"
+	"time"
 
 	"github.com/docker/docker/container"
 	daemonevents "github.com/docker/docker/daemon/events"
@@ -157,16 +158,18 @@ func (i *ImageService) GetLayerMountID(cid string, os string) (string, error) {
 	return i.layerStores[os].GetMountID(cid)
 }
 
-// Cleanup resources before the process is shutdown.
-// called from daemon.go Daemon.Shutdown()
+// Cleanup resources before the process is started/shutdown.
+// called from daemon.go Daemon.NewDaemon() and Daemon.Shutdown()
 func (i *ImageService) Cleanup() {
+	cleanupStart := time.Now()
 	for os, ls := range i.layerStores {
 		if ls != nil {
 			if err := ls.Cleanup(); err != nil {
 				logrus.Errorf("Error during layer Store.Cleanup(): %v %s", err, os)
 			}
 		}
 	}
+	logrus.Infof("ImageService cleanup took %.2f seconds", time.Since(cleanupStart).Seconds())
 }
 
 // GraphDriverForOS returns the name of the graph drvier

integration/plugin/graphdriver/external_test.go

@@ -378,7 +378,7 @@ func testExternalGraphDriver(ext string, ec map[string]*graphEventsCounter) func
 			assert.Check(t, ec[ext].gets >= 1)
 			assert.Check(t, ec[ext].puts >= 1)
 			assert.Check(t, is.Equal(ec[ext].stats, 5))
-			assert.Check(t, is.Equal(ec[ext].cleanups, 2))
+			assert.Check(t, is.Equal(ec[ext].cleanups, 4))
 			assert.Check(t, ec[ext].applydiff >= 1)
 			assert.Check(t, is.Equal(ec[ext].changes, 1))
 			assert.Check(t, is.Equal(ec[ext].diffsize, 0))