Merge branch 'master' of https://github.com/taskcluster/generic-worker into bug1534223

Author: petemoore

main.go

@@ -1202,3 +1202,27 @@ type TaskContext struct {
 	TaskDir string
 	User    *gwruntime.OSUser
 }
+
+// deleteTaskDirs deletes all task directories (directories whose name starts
+// with `task_`) inside directory parentDir, except those whose names are in
+// skipNames
+func deleteTaskDirs(parentDir string, skipNames ...string) error {
+	taskDirs, err := taskDirsIn(parentDir)
+	if err != nil {
+		return err
+	}
+outer:
+	for _, taskDir := range taskDirs {
+		name := filepath.Base(taskDir)
+		for _, skip := range skipNames {
+			if name == skip {
+				continue outer
+			}
+		}
+		err = deleteDir(taskDir)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}

main_test.go

@@ -10,9 +10,6 @@ import (
 	"strings"
 	"testing"
 	"time"
-
-	"github.com/taskcluster/generic-worker/gwconfig"
-	"github.com/taskcluster/generic-worker/runtime"
 )
 
 // Test failure should resolve as "failed"
@@ -197,18 +194,7 @@ func TestRemoveTaskDirs(t *testing.T) {
 			t.Fatalf("Could not write %v file: %v", file, err)
 		}
 	}
-	config = &gwconfig.Config{
-		PublicConfig: gwconfig.PublicConfig{
-			TasksDir: d,
-		},
-	}
-	taskContext = &TaskContext{
-		TaskDir: filepath.Join(d, "task_1234561234"),
-		User: &runtime.OSUser{
-			Name: "task_1234561234",
-		},
-	}
-	err = deleteTaskDirs()
+	err = deleteTaskDirs(d, "task_1234561234")
 	if err != nil {
 		t.Fatalf("Could not remove task directories: %v", err)
 	}

plat_all-unix-style.go

@@ -85,7 +85,7 @@ func purgeOldTasks() error {
 		log.Printf("WARNING: Not purging previous task directories/users since config setting cleanUpTaskDirs is false")
 		return nil
 	}
-	return deleteTaskDirs()
+	return deleteTaskDirs(config.TasksDir, taskContext.User.Name)
 }
 
 func install(arguments map[string]interface{}) (err error) {
@@ -175,27 +175,6 @@ func defaultTasksDir() string {
 	return filepath.Dir(os.Getenv("HOME"))
 }
 
-func deleteTaskDirs() error {
-	currentTaskDir := taskContext.TaskDir
-	taskDirs, err := taskDirsIn(config.TasksDir)
-	if err != nil {
-		return err
-	}
-	for _, taskDir := range taskDirs {
-		// this string comparison works because both taskDir and currentTaskDir
-		// are constructed from filepath.Join(config.TasksDir, taskDir) - but
-		// if this becomes a problem, we can call os.Stat against both files
-		// and use os.SameFile to check if they are the same file (directory).
-		if taskDir != currentTaskDir {
-			err = deleteDir(taskDir)
-			if err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
 func GrantSIDFullControlOfInteractiveWindowsStationAndDesktop(sid string) (err error) {
 	return fmt.Errorf("Cannot grant %v full control of interactive windows station and desktop; platform %v does not have such entities", sid, runtime.GOOS)
 }

plat_windows.go

@@ -452,9 +452,14 @@ func purgeOldTasks() error {
 		log.Printf("WARNING: Not purging previous task directories/users since config setting cleanUpTaskDirs is false")
 		return nil
 	}
-	err := deleteTaskDirs()
+	err := deleteTaskDirs(win32.ProfilesDirectory(), taskContext.User.Name, AutoLogonCredentials().Name)
 	if err != nil {
-		log.Printf("Could not delete old task directories:\n%v", err)
+		log.Printf("Could not delete task directory %v:\n%v", win32.ProfilesDirectory(), err)
+		return err
+	}
+	err = deleteTaskDirs(config.TasksDir, taskContext.User.Name, AutoLogonCredentials().Name)
+	if err != nil {
+		log.Printf("Could not delete old task directory %v:\n%v", config.TasksDir, err)
 		return err
 	}
 	// note if this fails, we carry on without throwing an error
@@ -793,14 +798,6 @@ func AutoLogonCredentials() (user runtime.OSUser) {
 	return
 }
 
-func deleteTaskDirs() error {
-	err := removeTaskDirs(win32.ProfilesDirectory())
-	if err != nil {
-		return err
-	}
-	return removeTaskDirs(config.TasksDir)
-}
-
 func (pd *PlatformData) RefreshLoginSession() {
 	err := pd.LoginInfo.Release()
 	if err != nil {
@@ -935,22 +932,3 @@ func GrantSIDFullControlOfInteractiveWindowsStationAndDesktop(sid string) (err e
 func rebootBetweenTasks() bool {
 	return true
 }
-
-func removeTaskDirs(parentDir string) error {
-	currentTaskUser := taskContext.User.Name
-	nextTaskUser := AutoLogonCredentials().Name
-	taskDirs, err := taskDirsIn(parentDir)
-	if err != nil {
-		return err
-	}
-	for _, taskDir := range taskDirs {
-		name := filepath.Base(taskDir)
-		if name != currentTaskUser && name != nextTaskUser {
-			err = deleteDir(taskDir)
-			if err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}