restore deferred cleanup in rootfs.init

dnephin · dnephin · commit a05e5fd77a1d · 2017-11-28T13:14:39.000-05:00
Signed-off-by: Daniel Nephin &lt;dnephin@gmail.com&gt;
diff --git a/gc/scheduler/scheduler.go b/gc/scheduler/scheduler.go
@@ -250,7 +250,6 @@ func (s *gcScheduler) run(ctx context.Context) {
 				schedC, nextCollection = schedule(interval)
 				continue
 			}
-			break
 		case e := <-s.eventC:
 			if lastCollection != nil && lastCollection.After(e.ts) {
 				continue
diff --git a/rootfs/init.go b/rootfs/init.go
@@ -70,6 +70,14 @@ func createInitLayer(ctx context.Context, parent, initName string, initFn func(s
 		return "", err
 	}
 
+	defer func() {
+		if err != nil {
+			if rerr := snapshotter.Remove(ctx, td); rerr != nil {
+				log.G(ctx).Errorf("Failed to remove snapshot %s: %v", td, rerr)
+			}
+		}
+	}()
+
 	if err = mounter.Mount(td, mounts...); err != nil {
 		return "", err
 	}

Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,6 @@ func (s *gcScheduler) run(ctx context.Context) {`
`250`	`250`	`schedC, nextCollection = schedule(interval)`
`251`	`251`	`continue`
`252`	`252`	`}`
`253`		`- break`
`254`	`253`	`case e := <-s.eventC:`
`255`	`254`	`if lastCollection != nil && lastCollection.After(e.ts) {`
`256`	`255`	`continue`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,14 @@ func createInitLayer(ctx context.Context, parent, initName string, initFn func(s`
`70`	`70`	`return "", err`
`71`	`71`	`}`
`72`	`72`
	`73`	`+ defer func() {`
	`74`	`+ if err != nil {`
	`75`	`+ if rerr := snapshotter.Remove(ctx, td); rerr != nil {`
	`76`	`+ log.G(ctx).Errorf("Failed to remove snapshot %s: %v", td, rerr)`
	`77`	`+ }`
	`78`	`+ }`
	`79`	`+ }()`
	`80`	`+`
`73`	`81`	`if err = mounter.Mount(td, mounts...); err != nil {`
`74`	`82`	`return "", err`
`75`	`83`	`}`