X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/dbf51c6ab20fab93c3f71910c13de9d4a0501bad..7413300e85b60d0533ec117b2175cb67fd9f10e3:/sdk/go/keepclient/support.go diff --git a/sdk/go/keepclient/support.go b/sdk/go/keepclient/support.go index bd9b2e35f7..b904b099cb 100644 --- a/sdk/go/keepclient/support.go +++ b/sdk/go/keepclient/support.go @@ -2,19 +2,24 @@ package keepclient import ( "crypto/md5" - "encoding/json" "errors" "fmt" "git.curoverse.com/arvados.git/sdk/go/streamer" "io" "io/ioutil" "log" + "math/rand" "net" "net/http" "strings" "time" ) +// Function used to emit debug messages. The easiest way to enable +// keepclient debug messages in your application is to assign +// log.Printf to DebugPrintf. +var DebugPrintf = func(string, ...interface{}) {} + type keepService struct { Uuid string `json:"uuid"` Hostname string `json:"service_host"` @@ -29,9 +34,9 @@ func Md5String(s string) string { return fmt.Sprintf("%x", md5.Sum([]byte(s))) } -// Set timeouts apply when connecting to keepproxy services (assumed to be over -// the Internet). -func (this *KeepClient) setClientSettingsProxy() { +// Set timeouts applicable when connecting to non-disk services +// (assumed to be over the Internet). +func (this *KeepClient) setClientSettingsNonDisk() { if this.Client.Timeout == 0 { // Maximum time to wait for a complete response this.Client.Timeout = 300 * time.Second @@ -53,8 +58,8 @@ func (this *KeepClient) setClientSettingsProxy() { } } -// Set timeouts apply when connecting to keepstore services directly (assumed -// to be on the local network). +// Set timeouts applicable when connecting to keepstore services directly +// (assumed to be on the local network). func (this *KeepClient) setClientSettingsDisk() { if this.Client.Timeout == 0 { // Maximum time to wait for a complete response @@ -81,86 +86,6 @@ type svcList struct { Items []keepService `json:"items"` } -// DiscoverKeepServers gets list of available keep services from api server -func (this *KeepClient) DiscoverKeepServers() error { - var list svcList - - // Get keep services from api server - err := this.Arvados.Call("GET", "keep_services", "", "accessible", nil, &list) - if err != nil { - return err - } - - return this.loadKeepServers(list) -} - -// LoadKeepServicesFromJSON gets list of available keep services from given JSON -func (this *KeepClient) LoadKeepServicesFromJSON(services string) error { - var list svcList - - // Load keep services from given json - dec := json.NewDecoder(strings.NewReader(services)) - if err := dec.Decode(&list); err != nil { - return err - } - - return this.loadKeepServers(list) -} - -// loadKeepServers -func (this *KeepClient) loadKeepServers(list svcList) error { - listed := make(map[string]bool) - localRoots := make(map[string]string) - gatewayRoots := make(map[string]string) - writableLocalRoots := make(map[string]string) - - // replicasPerService is 1 for disks; unknown or unlimited otherwise - this.replicasPerService = 1 - this.Using_proxy = false - - for _, service := range list.Items { - scheme := "http" - if service.SSL { - scheme = "https" - } - url := fmt.Sprintf("%s://%s:%d", scheme, service.Hostname, service.Port) - - // Skip duplicates - if listed[url] { - continue - } - listed[url] = true - - localRoots[service.Uuid] = url - if service.SvcType == "proxy" { - this.Using_proxy = true - } - - if service.ReadOnly == false { - writableLocalRoots[service.Uuid] = url - if service.SvcType != "disk" { - this.replicasPerService = 0 - } - } - - // Gateway services are only used when specified by - // UUID, so there's nothing to gain by filtering them - // by service type. Including all accessible services - // (gateway and otherwise) merely accommodates more - // service configurations. - gatewayRoots[service.Uuid] = url - } - - if this.Using_proxy { - this.setClientSettingsProxy() - } else { - this.setClientSettingsDisk() - } - - this.SetServiceRoots(localRoots, writableLocalRoots, gatewayRoots) - return nil -} - type uploadStatus struct { err error url string @@ -169,14 +94,14 @@ type uploadStatus struct { response string } -func (this KeepClient) uploadToKeepServer(host string, hash string, body io.ReadCloser, - upload_status chan<- uploadStatus, expectedLength int64, requestId string) { +func (this *KeepClient) uploadToKeepServer(host string, hash string, body io.ReadCloser, + upload_status chan<- uploadStatus, expectedLength int64, requestID int32) { var req *http.Request var err error var url = fmt.Sprintf("%s/%s", host, hash) if req, err = http.NewRequest("PUT", url, nil); err != nil { - log.Printf("[%v] Error creating request PUT %v error: %v", requestId, url, err.Error()) + log.Printf("[%08x] Error creating request PUT %v error: %v", requestID, url, err.Error()) upload_status <- uploadStatus{err, url, 0, 0, ""} body.Close() return @@ -201,7 +126,7 @@ func (this KeepClient) uploadToKeepServer(host string, hash string, body io.Read var resp *http.Response if resp, err = this.Client.Do(req); err != nil { - log.Printf("[%v] Upload failed %v error: %v", requestId, url, err.Error()) + log.Printf("[%08x] Upload failed %v error: %v", requestID, url, err.Error()) upload_status <- uploadStatus{err, url, 0, 0, ""} return } @@ -214,28 +139,28 @@ func (this KeepClient) uploadToKeepServer(host string, hash string, body io.Read defer resp.Body.Close() defer io.Copy(ioutil.Discard, resp.Body) - respbody, err2 := ioutil.ReadAll(&io.LimitedReader{resp.Body, 4096}) + respbody, err2 := ioutil.ReadAll(&io.LimitedReader{R: resp.Body, N: 4096}) response := strings.TrimSpace(string(respbody)) if err2 != nil && err2 != io.EOF { - log.Printf("[%v] Upload %v error: %v response: %v", requestId, url, err2.Error(), response) + log.Printf("[%08x] Upload %v error: %v response: %v", requestID, url, err2.Error(), response) upload_status <- uploadStatus{err2, url, resp.StatusCode, rep, response} } else if resp.StatusCode == http.StatusOK { - log.Printf("[%v] Upload %v success", requestId, url) + log.Printf("[%08x] Upload %v success", requestID, url) upload_status <- uploadStatus{nil, url, resp.StatusCode, rep, response} } else { - log.Printf("[%v] Upload %v error: %v response: %v", requestId, url, resp.StatusCode, response) + log.Printf("[%08x] Upload %v error: %v response: %v", requestID, url, resp.StatusCode, response) upload_status <- uploadStatus{errors.New(resp.Status), url, resp.StatusCode, rep, response} } } -func (this KeepClient) putReplicas( +func (this *KeepClient) putReplicas( hash string, tr *streamer.AsyncStream, expectedLength int64) (locator string, replicas int, err error) { - // Take the hash of locator and timestamp in order to identify this - // specific transaction in log statements. - requestId := fmt.Sprintf("%x", md5.Sum([]byte(hash+time.Now().String())))[0:8] + // Generate an arbitrary ID to identify this specific + // transaction in debug logs. + requestID := rand.Int31() // Calculate the ordering for uploading to servers sv := NewRootSorter(this.WritableLocalRoots(), hash).GetSortedRoots() @@ -280,8 +205,8 @@ func (this KeepClient) putReplicas( for active*replicasPerThread < remaining_replicas { // Start some upload requests if next_server < len(sv) { - log.Printf("[%v] Begin upload %s to %s", requestId, hash, sv[next_server]) - go this.uploadToKeepServer(sv[next_server], hash, tr.MakeStreamReader(), upload_status, expectedLength, requestId) + log.Printf("[%08x] Begin upload %s to %s", requestID, hash, sv[next_server]) + go this.uploadToKeepServer(sv[next_server], hash, tr.MakeStreamReader(), upload_status, expectedLength, requestID) next_server += 1 active += 1 } else { @@ -292,8 +217,8 @@ func (this KeepClient) putReplicas( } } } - log.Printf("[%v] Replicas remaining to write: %v active uploads: %v", - requestId, remaining_replicas, active) + log.Printf("[%08x] Replicas remaining to write: %v active uploads: %v", + requestID, remaining_replicas, active) // Now wait for something to happen. if active > 0 {