Merge pull request #2463 from crosbymichael/temp-clean

crosbymichael · web-flow · commit ed697290da60 · 2018-07-17T10:27:21.000-04:00
Don't prevent boot on temp cleanup
diff --git a/cmd/containerd/command/main.go b/cmd/containerd/command/main.go
@@ -116,8 +116,12 @@ func App() *cli.App {
 			return errors.Wrap(err, "creating temp mount location")
 		}
 		// unmount all temp mounts on boot for the server
-		if err := mount.CleanupTempMounts(0); err != nil {
-			return errors.Wrap(err, "unmounting temp mounts")
+		warnings, err := mount.CleanupTempMounts(0)
+		if err != nil {
+			log.G(ctx).WithError(err).Error("unmounting temp mounts")
+		}
+		for _, w := range warnings {
+			log.G(ctx).WithError(w).Warn("cleanup temp mount")
 		}
 		address := config.GRPC.Address
 		if address == "" {
diff --git a/mount/temp_unix.go b/mount/temp_unix.go
@@ -39,10 +39,10 @@ func SetTempMountLocation(root string) error {
 }
 
 // CleanupTempMounts all temp mounts and remove the directories
-func CleanupTempMounts(flags int) error {
+func CleanupTempMounts(flags int) (warnings []error, err error) {
 	mounts, err := Self()
 	if err != nil {
-		return err
+		return nil, err
 	}
 	var toUnmount []string
 	for _, m := range mounts {
@@ -53,11 +53,12 @@ func CleanupTempMounts(flags int) error {
 	sort.Sort(sort.Reverse(sort.StringSlice(toUnmount)))
 	for _, path := range toUnmount {
 		if err := UnmountAll(path, flags); err != nil {
-			return err
+			warnings = append(warnings, err)
+			continue
 		}
 		if err := os.Remove(path); err != nil {
-			return err
+			warnings = append(warnings, err)
 		}
 	}
-	return nil
+	return warnings, nil
 }
diff --git a/mount/temp_unsupported.go b/mount/temp_unsupported.go
@@ -24,6 +24,6 @@ func SetTempMountLocation(root string) error {
 }
 
 // CleanupTempMounts all temp mounts and remove the directories
-func CleanupTempMounts(flags int) error {
-	return nil
+func CleanupTempMounts(flags int) ([]error, error) {
+	return nil, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -39,10 +39,10 @@ func SetTempMountLocation(root string) error {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`// CleanupTempMounts all temp mounts and remove the directories`
`42`		`-func CleanupTempMounts(flags int) error {`
	`42`	`+func CleanupTempMounts(flags int) (warnings []error, err error) {`
`43`	`43`	`mounts, err := Self()`
`44`	`44`	`if err != nil {`
`45`		`- return err`
	`45`	`+ return nil, err`
`46`	`46`	`}`
`47`	`47`	`var toUnmount []string`
`48`	`48`	`for _, m := range mounts {`
`@@ -53,11 +53,12 @@ func CleanupTempMounts(flags int) error {`
`53`	`53`	`sort.Sort(sort.Reverse(sort.StringSlice(toUnmount)))`
`54`	`54`	`for _, path := range toUnmount {`
`55`	`55`	`if err := UnmountAll(path, flags); err != nil {`
`56`		`- return err`
	`56`	`+ warnings = append(warnings, err)`
	`57`	`+ continue`
`57`	`58`	`}`
`58`	`59`	`if err := os.Remove(path); err != nil {`
`59`		`- return err`
	`60`	`+ warnings = append(warnings, err)`
`60`	`61`	`}`
`61`	`62`	`}`
`62`		`- return nil`
	`63`	`+ return warnings, nil`
`63`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@ func SetTempMountLocation(root string) error {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`// CleanupTempMounts all temp mounts and remove the directories`
`27`		`-func CleanupTempMounts(flags int) error {`
`28`		`- return nil`
	`27`	`+func CleanupTempMounts(flags int) ([]error, error) {`
	`28`	`+ return nil, nil`
`29`	`29`	`}`