7490: added several error condition check tests for datamanager/keep package; increas...

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

diff --git a/services/datamanager/datamanager.go b/services/datamanager/datamanager.go
index 4e3b4e95671c7a63f54be270e88df1db5cbf7b7f..a19d01f6cb954eb8978cb596aa266b1c7800eff9 100644 (file)
--- a/services/datamanager/datamanager.go
+++ b/services/datamanager/datamanager.go
@@ -42,7 +42,11 @@ func init() {
 func main() {
        flag.Parse()
        if minutesBetweenRuns == 0 {
-               err := singlerun(makeArvadosClient())
+               arv, err := makeArvadosClient()
+               if err != nil {
+                       log.Fatalf("makeArvadosClient: %v", err)
+               }
+               err = singlerun(arv)
                if err != nil {
                        log.Fatalf("singlerun: %v", err)
                }
@@ -50,7 +54,11 @@ func main() {
                waitTime := time.Minute * time.Duration(minutesBetweenRuns)
                for {
                        log.Println("Beginning Run")
-                       err := singlerun(makeArvadosClient())
+                       arv, err := makeArvadosClient()
+                       if err != nil {
+                               log.Fatalf("makeArvadosClient: %v", err)
+                       }
+                       err = singlerun(arv)
                        if err != nil {
                                log.Printf("singlerun: %v", err)
                        }
@@ -60,12 +68,8 @@ func main() {
        }
 }
 
-func makeArvadosClient() arvadosclient.ArvadosClient {
-       arv, err := arvadosclient.MakeArvadosClient()
-       if err != nil {
-               log.Fatalf("Error setting up arvados client: %s", err)
-       }
-       return arv
+func makeArvadosClient() (arvadosclient.ArvadosClient, error) {
+       return arvadosclient.MakeArvadosClient()
 }
 
 func singlerun(arv arvadosclient.ArvadosClient) error {
@@ -126,8 +130,7 @@ func singlerun(arv arvadosclient.ArvadosClient) 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
@@ -154,18 +157,20 @@ func singlerun(arv arvadosclient.ArvadosClient) 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(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,
@@ -174,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
        }
 }