Merge branch 'master' into 4426-search-documentation

[arvados.git] / sdk / go / keepclient / support.go

diff --git a/sdk/go/keepclient/support.go b/sdk/go/keepclient/support.go
index c03578c5d3d868021e6e7f53460838409f172d31..940a110081dbaa46920cb472ea09d9e0635fd219 100644 (file)
--- a/sdk/go/keepclient/support.go
+++ b/sdk/go/keepclient/support.go
@@ -9,8 +9,8 @@ import (
        "io"
        "io/ioutil"
        "log"
+       "net"
        "net/http"
-       "os"
        "strings"
        "time"
 )
@@ -27,21 +27,56 @@ func Md5String(s string) string {
        return fmt.Sprintf("%x", md5.Sum([]byte(s)))
 }
 
-func (this *KeepClient) DiscoverKeepServers() error {
-       if prx := os.Getenv("ARVADOS_KEEP_PROXY"); prx != "" {
-               sr := map[string]string{"proxy": prx}
-               this.SetServiceRoots(sr)
-               this.Using_proxy = true
-               if this.Client.Timeout == 0 {
-                       this.Client.Timeout = 10 * time.Minute
+// Set timeouts apply when connecting to keepproxy services (assumed to be over
+// the Internet).
+func (this *KeepClient) setClientSettingsProxy() {
+       if this.Client.Timeout == 0 {
+               // Maximum time to wait for a complete response
+               this.Client.Timeout = 300 * time.Second
+
+               // TCP and TLS connection settings
+               this.Client.Transport = &http.Transport{
+                       Dial: (&net.Dialer{
+                               // The maximum time to wait to set up
+                               // the initial TCP connection.
+                               Timeout: 30 * time.Second,
+
+                               // The TCP keep alive heartbeat
+                               // interval.
+                               KeepAlive: 120 * time.Second,
+                       }).Dial,
+
+                       TLSHandshakeTimeout: 10 * time.Second,
                }
-               return nil
        }
 
+}
+
+// Set timeouts apply when connecting to keepstore services directly (assumed
+// to be on the local network).
+func (this *KeepClient) setClientSettingsStore() {
        if this.Client.Timeout == 0 {
-               this.Client.Timeout = 15 * time.Second
+               // Maximum time to wait for a complete response
+               this.Client.Timeout = 20 * time.Second
+
+               // TCP and TLS connection timeouts
+               this.Client.Transport = &http.Transport{
+                       Dial: (&net.Dialer{
+                               // The maximum time to wait to set up
+                               // the initial TCP connection.
+                               Timeout: 2 * time.Second,
+
+                               // The TCP keep alive heartbeat
+                               // interval.
+                               KeepAlive: 180 * time.Second,
+                       }).Dial,
+
+                       TLSHandshakeTimeout: 4 * time.Second,
+               }
        }
+}
 
+func (this *KeepClient) DiscoverKeepServers() (map[string]string, error) {
        type svcList struct {
                Items []keepDisk `json:"items"`
        }
@@ -51,7 +86,7 @@ func (this *KeepClient) DiscoverKeepServers() error {
 
        if err != nil {
                if err := this.Arvados.List("keep_disks", nil, &m); err != nil {
-                       return err
+                       return nil, err
                }
        }
 
@@ -78,9 +113,15 @@ func (this *KeepClient) DiscoverKeepServers() error {
                }
        }
 
+       if this.Using_proxy {
+               this.setClientSettingsProxy()
+       } else {
+               this.setClientSettingsStore()
+       }
+
        this.SetServiceRoots(service_roots)
 
-       return nil
+       return service_roots, nil
 }
 
 type uploadStatus struct {