projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7393-s3-volume' closes #7393
[arvados.git]
/
sdk
/
go
/
keepclient
/
keepclient.go
diff --git
a/sdk/go/keepclient/keepclient.go
b/sdk/go/keepclient/keepclient.go
index 0e6fadcc3548c99d2e85c30219a74ffdce42bf72..26aa7177e05c3aa64d3e956f183379614093d341 100644
(file)
--- a/
sdk/go/keepclient/keepclient.go
+++ b/
sdk/go/keepclient/keepclient.go
@@
-11,7
+11,6
@@
import (
"git.curoverse.com/arvados.git/sdk/go/streamer"
"io"
"io/ioutil"
"git.curoverse.com/arvados.git/sdk/go/streamer"
"io"
"io/ioutil"
- "log"
"net/http"
"regexp"
"strconv"
"net/http"
"regexp"
"strconv"
@@
-68,7
+67,6
@@
const X_Keep_Replicas_Stored = "X-Keep-Replicas-Stored"
type KeepClient struct {
Arvados *arvadosclient.ArvadosClient
Want_replicas int
type KeepClient struct {
Arvados *arvadosclient.ArvadosClient
Want_replicas int
- Using_proxy bool
localRoots *map[string]string
writableLocalRoots *map[string]string
gatewayRoots *map[string]string
localRoots *map[string]string
writableLocalRoots *map[string]string
gatewayRoots *map[string]string
@@
-78,6
+76,9
@@
type KeepClient struct {
// set to 1 if all writable services are of disk type, otherwise 0
replicasPerService int
// set to 1 if all writable services are of disk type, otherwise 0
replicasPerService int
+
+ // Any non-disk typed services found in the list of keepservers?
+ foundNonDiskSvc bool
}
// MakeKeepClient creates a new KeepClient by contacting the API server to discover Keep servers.
}
// MakeKeepClient creates a new KeepClient by contacting the API server to discover Keep servers.
@@
-101,7
+102,6
@@
func New(arv *arvadosclient.ArvadosClient) *KeepClient {
kc := &KeepClient{
Arvados: arv,
Want_replicas: defaultReplicationLevel,
kc := &KeepClient{
Arvados: arv,
Want_replicas: defaultReplicationLevel,
- Using_proxy: false,
Client: &http.Client{Transport: &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: arv.ApiInsecure}}},
Retries: 2,
Client: &http.Client{Transport: &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: arv.ApiInsecure}}},
Retries: 2,
@@
-232,7
+232,7
@@
func (kc *KeepClient) getOrHead(method string, locator string) (io.ReadCloser, i
}
serversToTry = retryList
}
}
serversToTry = retryList
}
-
log.
Printf("DEBUG: %s %s failed: %v", method, locator, errs)
+
Debug
Printf("DEBUG: %s %s failed: %v", method, locator, errs)
var err error
if count404 == numServers {
var err error
if count404 == numServers {