7490: The makeArvadosClient func, which is invoked by singlerun, should return error...

The main method expects error in all error cases and decides next action; when wait time in makeArvadosClient is provided it will retry.

diff --git a/services/datamanager/datamanager.go b/services/datamanager/datamanager.go
index a9306ce83a6011002cef96b86eb6caf700feda23..b81cf7edfeeb8ae00f16b0d39b1a7b54867e57b3 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 {

diff --git a/services/datamanager/datamanager_test.go b/services/datamanager/datamanager_test.go
index c2cb762d52b625b625634f24d385ddbf9ad4e7d8..6ceb1e625eb3a458e056771e1de2307f15e3c529 100644 (file)
--- a/services/datamanager/datamanager_test.go
+++ b/services/datamanager/datamanager_test.go
@@ -33,7 +33,11 @@ func SetupDataManagerTest(t *testing.T) {
        arvadostest.StartAPI()
        arvadostest.StartKeep(2, false)
 
-       arv = makeArvadosClient()
+       var err error
+       arv, err = makeArvadosClient()
+       if err != nil {
+               t.Fatalf("Error making arvados client: %s", err)
+       }
 
        // keep client
        keepClient = &keepclient.KeepClient{
@@ -44,7 +48,7 @@ func SetupDataManagerTest(t *testing.T) {
        }
 
        // discover keep services
-       if err := keepClient.DiscoverKeepServers(); err != nil {
+       if err = keepClient.DiscoverKeepServers(); err != nil {
                t.Fatalf("Error discovering keep services: %s", err)
        }
        keepServers = []string{}