X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/036140f305fc34fdefe0ae393b1011f4c3f840de..a9e08c498ac8126026d1226f34913f87c8e590a0:/services/datamanager/datamanager.go?ds=sidebyside

diff --git a/services/datamanager/datamanager.go b/services/datamanager/datamanager.go
index d7ac0d2e1f..a9306ce83a 100644
--- a/services/datamanager/datamanager.go
+++ b/services/datamanager/datamanager.go
@@ -3,6 +3,7 @@
 package main
 
 import (
+	"errors"
 	"flag"
 	"fmt"
 	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
@@ -41,28 +42,38 @@ func init() {
 func main() {
 	flag.Parse()
 	if minutesBetweenRuns == 0 {
-		singlerun()
+		err := singlerun(makeArvadosClient())
+		if err != nil {
+			log.Fatalf("singlerun: %v", err)
+		}
 	} else {
 		waitTime := time.Minute * time.Duration(minutesBetweenRuns)
 		for {
 			log.Println("Beginning Run")
-			singlerun()
+			err := singlerun(makeArvadosClient())
+			if err != nil {
+				log.Printf("singlerun: %v", err)
+			}
 			log.Printf("Sleeping for %d minutes", minutesBetweenRuns)
 			time.Sleep(waitTime)
 		}
 	}
 }
 
-func singlerun() {
+func makeArvadosClient() arvadosclient.ArvadosClient {
 	arv, err := arvadosclient.MakeArvadosClient()
 	if err != nil {
-		log.Fatalf("Error setting up arvados client %s", err.Error())
+		log.Fatalf("Error setting up arvados client: %s", err)
 	}
+	return arv
+}
 
-	if is_admin, err := util.UserIsAdmin(arv); err != nil {
-		log.Fatalf("Error querying current arvados user %s", err.Error())
-	} else if !is_admin {
-		log.Fatalf("Current user is not an admin. Datamanager can only be run by admins.")
+func singlerun(arv arvadosclient.ArvadosClient) error {
+	var err error
+	if isAdmin, err := util.UserIsAdmin(arv); err != nil {
+		return errors.New("Error verifying admin token: " + err.Error())
+	} else if !isAdmin {
+		return errors.New("Current user is not an admin. Datamanager requires a privileged token.")
 	}
 
 	var arvLogger *logger.Logger
@@ -119,34 +130,41 @@ func singlerun() {
 			fmt.Sprintf("Error setting up keep client %s", err.Error()))
 	}
 
+	// Log that we're finished. We force the recording, since go will
+	// not wait for the write timer before exiting.
+	if arvLogger != nil {
+		defer arvLogger.FinalUpdate(func(p map[string]interface{}, e map[string]interface{}) {
+			summaryInfo := logger.GetOrCreateMap(p, "summary_info")
+			summaryInfo["block_replication_counts"] = bucketCounts
+			summaryInfo["replication_summary"] = replicationCounts
+			p["summary_info"] = summaryInfo
+
+			p["run_info"].(map[string]interface{})["finished_at"] = time.Now()
+		})
+	}
+
 	pullServers := summary.ComputePullServers(kc,
 		&keepServerInfo,
 		readCollections.BlockToDesiredReplication,
 		replicationSummary.UnderReplicatedBlocks)
 
 	pullLists := summary.BuildPullLists(pullServers)
-	trashLists := summary.BuildTrashLists(kc,
+
+	trashLists, trashErr := summary.BuildTrashLists(kc,
 		&keepServerInfo,
 		replicationSummary.KeepBlocksNotInCollections)
 
 	summary.WritePullLists(arvLogger, pullLists)
-	keep.SendTrashLists(arvLogger, kc, trashLists)
 
-	// Log that we're finished. We force the recording, since go will
-	// not wait for the write timer before exiting.
-	if arvLogger != nil {
-		arvLogger.FinalUpdate(func(p map[string]interface{}, e map[string]interface{}) {
-			summaryInfo := logger.GetOrCreateMap(p, "summary_info")
-			summaryInfo["block_replication_counts"] = bucketCounts
-			summaryInfo["replication_summary"] = replicationCounts
-			p["summary_info"] = summaryInfo
-
-			p["run_info"].(map[string]interface{})["finished_at"] = time.Now()
-		})
+	if trashErr != nil {
+		return err
 	}
+	keep.SendTrashLists(kc, trashLists)
+
+	return nil
 }
 
-// Returns a data fetcher that fetches data from remote servers.
+// BuildDataFetcher returns a data fetcher that fetches data from remote servers.
 func BuildDataFetcher(arv arvadosclient.ArvadosClient) summary.DataFetcher {
 	return func(arvLogger *logger.Logger,
 		readCollections *collection.ReadCollections,