X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2578d032288f24988a54ee57708fe71902e4ef92..7e773735e9d547381a77baeeb139696dfa66a7a6:/services/datamanager/datamanager.go

diff --git a/services/datamanager/datamanager.go b/services/datamanager/datamanager.go
index 2078edcdaa..70a9ae7859 100644
--- a/services/datamanager/datamanager.go
+++ b/services/datamanager/datamanager.go
@@ -41,19 +41,25 @@ func init() {
 func main() {
 	flag.Parse()
 	if minutesBetweenRuns == 0 {
-		singlerun()
+		err := singlerun()
+		if err != nil {
+			log.Fatalf("Got an error: %v", err)
+		}
 	} else {
 		waitTime := time.Minute * time.Duration(minutesBetweenRuns)
 		for {
 			log.Println("Beginning Run")
-			singlerun()
+			err := singlerun()
+			if err != nil {
+				log.Printf("Got an error: %v", err)
+			}
 			log.Printf("Sleeping for %d minutes", minutesBetweenRuns)
 			time.Sleep(waitTime)
 		}
 	}
 }
 
-func singlerun() {
+func singlerun() error {
 	arv, err := arvadosclient.MakeArvadosClient()
 	if err != nil {
 		log.Fatalf("Error setting up arvados client %s", err.Error())
@@ -119,32 +125,39 @@ 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)
 
-	summary.WriteTrashLists(arvLogger, 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
+	} else {
+		keep.SendTrashLists(keep.GetDataManagerToken(arvLogger), kc, trashLists)
 	}
+
+	return nil
 }
 
 // Returns a data fetcher that fetches data from remote servers.