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 b81cf7edfeeb8ae00f16b0d39b1a7b54867e57b3..a19d01f6cb954eb8978cb596aa266b1c7800eff9 100644 (file)
--- a/services/datamanager/datamanager.go
+++ b/services/datamanager/datamanager.go
@@ -130,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
@@ -158,7 +157,10 @@ 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
@@ -177,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
        }
 }