X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f78434fcb802949eaae131adf625950ad9981ede..c5602bf4ba4724376c2d5405302d240daaae506f:/services/datamanager/datamanager.go?ds=sidebyside

diff --git a/services/datamanager/datamanager.go b/services/datamanager/datamanager.go
index 91612668b5..a19d01f6cb 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,42 @@ func init() {
 func main() {
 	flag.Parse()
 	if minutesBetweenRuns == 0 {
-		singlerun()
+		arv, err := makeArvadosClient()
+		if err != nil {
+			log.Fatalf("makeArvadosClient: %v", err)
+		}
+		err = singlerun(arv)
+		if err != nil {
+			log.Fatalf("singlerun: %v", err)
+		}
 	} else {
 		waitTime := time.Minute * time.Duration(minutesBetweenRuns)
 		for {
 			log.Println("Beginning Run")
-			singlerun()
+			arv, err := makeArvadosClient()
+			if err != nil {
+				log.Fatalf("makeArvadosClient: %v", err)
+			}
+			err = singlerun(arv)
+			if err != nil {
+				log.Printf("singlerun: %v", err)
+			}
 			log.Printf("Sleeping for %d minutes", minutesBetweenRuns)
 			time.Sleep(waitTime)
 		}
 	}
 }
 
-func singlerun() {
-	arv, err := arvadosclient.MakeArvadosClient()
-	if err != nil {
-		log.Fatalf("Error setting up arvados client %s", err.Error())
-	}
+func makeArvadosClient() (arvadosclient.ArvadosClient, error) {
+	return arvadosclient.MakeArvadosClient()
+}
 
-	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
@@ -115,23 +130,13 @@ func singlerun() {
 
 	kc, err := keepclient.MakeKeepClient(&arv)
 	if err != nil {
-		loggerutil.FatalWithMessage(arvLogger,
-			fmt.Sprintf("Error setting up keep client %s", err.Error()))
+		return fmt.Errorf("Error setting up keep client %v", err.Error())
 	}
 
-	pullServers := summary.ComputePullServers(kc,
-		&keepServerInfo,
-		readCollections.BlockToDesiredReplication,
-		replicationSummary.UnderReplicatedBlocks)
-
-	pullLists := summary.BuildPullLists(pullServers)
-
-	summary.WritePullLists(arvLogger, pullLists)
-
 	// 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{}) {
+		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
@@ -140,9 +145,32 @@ func singlerun() {
 			p["run_info"].(map[string]interface{})["finished_at"] = time.Now()
 		})
 	}
+
+	pullServers := summary.ComputePullServers(kc,
+		&keepServerInfo,
+		readCollections.BlockToDesiredReplication,
+		replicationSummary.UnderReplicatedBlocks)
+
+	pullLists := summary.BuildPullLists(pullServers)
+
+	trashLists, trashErr := summary.BuildTrashLists(kc,
+		&keepServerInfo,
+		replicationSummary.KeepBlocksNotInCollections)
+
+	err = summary.WritePullLists(arvLogger, pullLists)
+	if err != nil {
+		return err
+	}
+
+	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,
@@ -151,18 +179,24 @@ func BuildDataFetcher(arv arvadosclient.ArvadosClient) summary.DataFetcher {
 
 		go func() {
 			collectionChannel <- collection.GetCollectionsAndSummarize(
+				arvLogger,
 				collection.GetCollectionsParams{
 					Client:    arv,
 					Logger:    arvLogger,
 					BatchSize: 50})
 		}()
 
-		*keepServerInfo = keep.GetKeepServersAndSummarize(
+		var err error
+		*keepServerInfo, err = keep.GetKeepServersAndSummarize(
 			keep.GetKeepServersParams{
 				Client: arv,
 				Logger: arvLogger,
 				Limit:  1000})
 
+		if err != nil {
+			return
+		}
+
 		*readCollections = <-collectionChannel
 	}
 }