X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ba554bbf8076caae0928b426e640f6660ee9e068..HEAD:/sdk/go/arvadosclient/arvadosclient.go diff --git a/sdk/go/arvadosclient/arvadosclient.go b/sdk/go/arvadosclient/arvadosclient.go index 13b3a30ac4..1f849ebace 100644 --- a/sdk/go/arvadosclient/arvadosclient.go +++ b/sdk/go/arvadosclient/arvadosclient.go @@ -9,21 +9,18 @@ package arvadosclient import ( "bytes" "crypto/tls" - "crypto/x509" "encoding/json" "errors" "fmt" "io" - "io/ioutil" - "log" "net/http" "net/url" - "os" "strings" "sync" "time" "git.arvados.org/arvados.git/sdk/go/arvados" + "github.com/sirupsen/logrus" ) type StringMatcher func(string) bool @@ -109,6 +106,14 @@ type ArvadosClient struct { // available services. KeepServiceURIs []string + // Maximum disk cache size in bytes or percent of total + // filesystem size. If zero, use default, currently 10% of + // filesystem size. + DiskCacheSize arvados.ByteSizeOrPercent + + // Where to write debug logs. May be nil. + Logger logrus.FieldLogger + // Discovery document DiscoveryDoc Dict @@ -121,40 +126,10 @@ type ArvadosClient struct { RequestID string } -var CertFiles = []string{ - "/etc/arvados/ca-certificates.crt", - "/etc/ssl/certs/ca-certificates.crt", // Debian/Ubuntu/Gentoo etc. - "/etc/pki/tls/certs/ca-bundle.crt", // Fedora/RHEL -} - // MakeTLSConfig sets up TLS configuration for communicating with // Arvados and Keep services. func MakeTLSConfig(insecure bool) *tls.Config { - tlsconfig := tls.Config{InsecureSkipVerify: insecure} - - if !insecure { - // Use the first entry in CertFiles that we can read - // certificates from. If none of those work out, use - // the Go defaults. - certs := x509.NewCertPool() - for _, file := range CertFiles { - data, err := ioutil.ReadFile(file) - if err != nil { - if !os.IsNotExist(err) { - log.Printf("proceeding without loading cert file %q: %s", file, err) - } - continue - } - if !certs.AppendCertsFromPEM(data) { - log.Printf("unable to load any certificates from %v", file) - continue - } - tlsconfig.RootCAs = certs - break - } - } - - return &tlsconfig + return &tls.Config{InsecureSkipVerify: insecure} } // New returns an ArvadosClient using the given arvados.Client @@ -178,6 +153,8 @@ func New(c *arvados.Client) (*ArvadosClient, error) { Client: hc, Retries: 2, KeepServiceURIs: c.KeepServiceURIs, + DiskCacheSize: c.DiskCacheSize, + Logger: c.Logger, lastClosedIdlesAt: time.Now(), } @@ -231,74 +208,37 @@ func (c *ArvadosClient) CallRaw(method string, resourceType string, uuid string, vals.Set(k, string(m)) } } - - retryable := false - switch method { - case "GET", "HEAD", "PUT", "OPTIONS", "DELETE": - retryable = true - } - - // Non-retryable methods such as POST are not safe to retry automatically, - // so we minimize such failures by always using a new or recently active socket - if !retryable { - if time.Since(c.lastClosedIdlesAt) > MaxIdleConnectionDuration { - c.lastClosedIdlesAt = time.Now() - c.Client.Transport.(*http.Transport).CloseIdleConnections() - } - } - - // Make the request var req *http.Request - var resp *http.Response - - for attempt := 0; attempt <= c.Retries; attempt++ { - if method == "GET" || method == "HEAD" { - u.RawQuery = vals.Encode() - if req, err = http.NewRequest(method, u.String(), nil); err != nil { - return nil, err - } - } else { - if req, err = http.NewRequest(method, u.String(), bytes.NewBufferString(vals.Encode())); err != nil { - return nil, err - } - req.Header.Add("Content-Type", "application/x-www-form-urlencoded") - } - - // Add api token header - req.Header.Add("Authorization", fmt.Sprintf("OAuth2 %s", c.ApiToken)) - if c.RequestID != "" { - req.Header.Add("X-Request-Id", c.RequestID) - } - - resp, err = c.Client.Do(req) - if err != nil { - if retryable { - time.Sleep(RetryDelay) - continue - } else { - return nil, err - } - } - - if resp.StatusCode == http.StatusOK { - return resp.Body, nil + if method == "GET" || method == "HEAD" { + u.RawQuery = vals.Encode() + if req, err = http.NewRequest(method, u.String(), nil); err != nil { + return nil, err } - - defer resp.Body.Close() - - switch resp.StatusCode { - case 408, 409, 422, 423, 500, 502, 503, 504: - time.Sleep(RetryDelay) - continue - default: - return nil, newAPIServerError(c.ApiServer, resp) + } else { + if req, err = http.NewRequest(method, u.String(), bytes.NewBufferString(vals.Encode())); err != nil { + return nil, err } + req.Header.Add("Content-Type", "application/x-www-form-urlencoded") } - - if resp != nil { + if c.RequestID != "" { + req.Header.Add("X-Request-Id", c.RequestID) + } + client := arvados.Client{ + Client: c.Client, + APIHost: c.ApiServer, + AuthToken: c.ApiToken, + Insecure: c.ApiInsecure, + Timeout: 30 * RetryDelay * time.Duration(c.Retries), + } + resp, err := client.Do(req) + if err != nil { + return nil, err + } + if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusNoContent { + defer resp.Body.Close() return nil, newAPIServerError(c.ApiServer, resp) } - return nil, err + return resp.Body, nil } func newAPIServerError(ServerAddress string, resp *http.Response) APIServerError { @@ -332,12 +272,12 @@ func newAPIServerError(ServerAddress string, resp *http.Response) APIServerError // Call an API endpoint and parse the JSON response into an object. // -// method - HTTP method: GET, HEAD, PUT, POST, PATCH or DELETE. -// resourceType - the type of arvados resource to act on (e.g., "collections", "pipeline_instances"). -// uuid - the uuid of the specific item to access. May be empty. -// action - API method name (e.g., "lock"). This is often empty if implied by method and uuid. -// parameters - method parameters. -// output - a map or annotated struct which is a legal target for encoding/json/Decoder. +// method - HTTP method: GET, HEAD, PUT, POST, PATCH or DELETE. +// resourceType - the type of arvados resource to act on (e.g., "collections", "pipeline_instances"). +// uuid - the uuid of the specific item to access. May be empty. +// action - API method name (e.g., "lock"). This is often empty if implied by method and uuid. +// parameters - method parameters. +// output - a map or annotated struct which is a legal target for encoding/json/Decoder. // // Returns a non-nil error if an error occurs making the API call, the // API responds with a non-successful HTTP status, or an error occurs