projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18700: Merge branch 'main'
[arvados.git]
/
sdk
/
go
/
health
/
aggregator.go
diff --git
a/sdk/go/health/aggregator.go
b/sdk/go/health/aggregator.go
index 794adabdd3926b6b04036a6c62b1044f2e8f13d5..23d7e8d431b7ed1160f3fcf8796e5b755d1dd078 100644
(file)
--- a/
sdk/go/health/aggregator.go
+++ b/
sdk/go/health/aggregator.go
@@
-6,8
+6,8
@@
package health
import (
"context"
import (
"context"
+ "crypto/tls"
"encoding/json"
"encoding/json"
- "errors"
"fmt"
"net/http"
"net/url"
"fmt"
"net/http"
"net/url"
@@
-35,7
+35,13
@@
type Aggregator struct {
}
func (agg *Aggregator) setup() {
}
func (agg *Aggregator) setup() {
- agg.httpClient = http.DefaultClient
+ agg.httpClient = &http.Client{
+ Transport: &http.Transport{
+ TLSClientConfig: &tls.Config{
+ InsecureSkipVerify: agg.Cluster.TLS.Insecure,
+ },
+ },
+ }
if agg.timeout == 0 {
// this is always the case, except in the test suite
agg.timeout = defaultTimeout
if agg.timeout == 0 {
// this is always the case, except in the test suite
agg.timeout = defaultTimeout
@@
-127,7
+133,14
@@
func (agg *Aggregator) ClusterHealth() ClusterHealthResponse {
}
mtx.Unlock()
}
mtx.Unlock()
+ checkURLs := map[arvados.URL]bool{}
for addr := range svc.InternalURLs {
for addr := range svc.InternalURLs {
+ checkURLs[addr] = true
+ }
+ if len(checkURLs) == 0 && svc.ExternalURL.Host != "" {
+ checkURLs[svc.ExternalURL] = true
+ }
+ for addr := range checkURLs {
wg.Add(1)
go func(svcName arvados.ServiceName, addr arvados.URL) {
defer wg.Done()
wg.Add(1)
go func(svcName arvados.ServiceName, addr arvados.URL) {
defer wg.Done()
@@
-176,44
+189,46
@@
func (agg *Aggregator) pingURL(svcURL arvados.URL) (*url.URL, error) {
func (agg *Aggregator) ping(target *url.URL) (result CheckResult) {
t0 := time.Now()
func (agg *Aggregator) ping(target *url.URL) (result CheckResult) {
t0 := time.Now()
-
- var err error
defer func() {
result.ResponseTime = json.Number(fmt.Sprintf("%.6f", time.Since(t0).Seconds()))
defer func() {
result.ResponseTime = json.Number(fmt.Sprintf("%.6f", time.Since(t0).Seconds()))
- if err != nil {
- result.Health, result.Error = "ERROR", err.Error()
- } else {
- result.Health = "OK"
- }
}()
}()
+ result.Health = "ERROR"
req, err := http.NewRequest("GET", target.String(), nil)
if err != nil {
req, err := http.NewRequest("GET", target.String(), nil)
if err != nil {
+ result.Error = err.Error()
return
}
req.Header.Set("Authorization", "Bearer "+agg.Cluster.ManagementToken)
return
}
req.Header.Set("Authorization", "Bearer "+agg.Cluster.ManagementToken)
+ // Avoid workbench1's redirect-http-to-https feature
+ req.Header.Set("X-Forwarded-Proto", "https")
+
ctx, cancel := context.WithTimeout(req.Context(), time.Duration(agg.timeout))
defer cancel()
req = req.WithContext(ctx)
resp, err := agg.httpClient.Do(req)
if err != nil {
ctx, cancel := context.WithTimeout(req.Context(), time.Duration(agg.timeout))
defer cancel()
req = req.WithContext(ctx)
resp, err := agg.httpClient.Do(req)
if err != nil {
+ result.Error = err.Error()
return
}
result.HTTPStatusCode = resp.StatusCode
result.HTTPStatusText = resp.Status
err = json.NewDecoder(resp.Body).Decode(&result.Response)
if err != nil {
return
}
result.HTTPStatusCode = resp.StatusCode
result.HTTPStatusText = resp.Status
err = json.NewDecoder(resp.Body).Decode(&result.Response)
if err != nil {
-
err = fmt.Error
f("cannot decode response: %s", err)
+
result.Error = fmt.Sprint
f("cannot decode response: %s", err)
} else if resp.StatusCode != http.StatusOK {
} else if resp.StatusCode != http.StatusOK {
-
err = fmt.Error
f("HTTP %d %s", resp.StatusCode, resp.Status)
+
result.Error = fmt.Sprint
f("HTTP %d %s", resp.StatusCode, resp.Status)
} else if h, _ := result.Response["health"].(string); h != "OK" {
if e, ok := result.Response["error"].(string); ok && e != "" {
} else if h, _ := result.Response["health"].(string); h != "OK" {
if e, ok := result.Response["error"].(string); ok && e != "" {
- err = errors.New(e)
+ result.Error = e
+ return
} else {
} else {
- err = fmt.Errorf("health=%q in ping response", h)
+ result.Error = fmt.Sprintf("health=%q in ping response", h)
+ return
}
}
}
}
+ result.Health = "OK"
return
}
return
}