Merge branch 'master' into 7253-datamanager-test-errors

[arvados.git] / services / datamanager / datamanager.go

diff --git a/services/datamanager/datamanager.go b/services/datamanager/datamanager.go
index 70a9ae785956396bab936e73b1a7f6ed04c63731..3c53b4ad2a2c59e6cea0b538ff1b7ca6f5999831 100644 (file)
--- 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,17 +42,25 @@ func init() {
 func main() {
        flag.Parse()
        if minutesBetweenRuns == 0 {
-               err := singlerun()
+               arv, err := arvadosclient.MakeArvadosClient()
                if err != nil {
-                       log.Fatalf("Got an error: %v", err)
+                       loggerutil.FatalWithMessage(arvLogger, fmt.Sprintf("Error making arvados client: %v", err))
+               }
+               err = singlerun(arv)
+               if err != nil {
+                       loggerutil.FatalWithMessage(arvLogger, fmt.Sprintf("singlerun: %v", err))
                }
        } else {
                waitTime := time.Minute * time.Duration(minutesBetweenRuns)
                for {
                        log.Println("Beginning Run")
-                       err := singlerun()
+                       arv, err := arvadosclient.MakeArvadosClient()
                        if err != nil {
-                               log.Printf("Got an error: %v", err)
+                               loggerutil.FatalWithMessage(arvLogger, fmt.Sprintf("Error making arvados client: %v", err))
+                       }
+                       err = singlerun(arv)
+                       if err != nil {
+                               log.Printf("singlerun: %v", err)
                        }
                        log.Printf("Sleeping for %d minutes", minutesBetweenRuns)
                        time.Sleep(waitTime)
@@ -59,19 +68,16 @@ func main() {
        }
 }
 
-func singlerun() error {
-       arv, err := arvadosclient.MakeArvadosClient()
-       if err != nil {
-               log.Fatalf("Error setting up arvados client %s", err.Error())
-       }
+var arvLogger *logger.Logger
 
-       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
        if logEventTypePrefix != "" {
                arvLogger = logger.NewLogger(logger.LoggerParams{
                        Client:          arv,
@@ -98,7 +104,14 @@ func singlerun() error {
 
        dataFetcher(arvLogger, &readCollections, &keepServerInfo)
 
-       summary.MaybeWriteData(arvLogger, readCollections, keepServerInfo)
+       if readCollections.Err != nil {
+               return readCollections.Err
+       }
+
+       err = summary.MaybeWriteData(arvLogger, readCollections, keepServerInfo)
+       if err != nil {
+               return err
+       }
 
        buckets := summary.BucketReplication(readCollections, keepServerInfo)
        bucketCounts := buckets.Counts()
@@ -121,8 +134,7 @@ func singlerun() error {
 
        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())
        }
 
        // Log that we're finished. We force the recording, since go will
@@ -149,18 +161,20 @@ func singlerun() error {
                &keepServerInfo,
                replicationSummary.KeepBlocksNotInCollections)
 
-       summary.WritePullLists(arvLogger, pullLists)
+       err = summary.WritePullLists(arvLogger, pullLists)
+       if err != nil {
+               return err
+       }
 
        if trashErr != nil {
                return err
-       } else {
-               keep.SendTrashLists(keep.GetDataManagerToken(arvLogger), kc, trashLists)
        }
+       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,
@@ -175,12 +189,17 @@ func BuildDataFetcher(arv arvadosclient.ArvadosClient) summary.DataFetcher {
                                        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
        }
 }