prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix detection of AWS cloud taking 20s when not on AWS

Browse Source
This commit is contained in:
derekwaynecarr 2016-03-08 13:00:39 -05:00
parent 89676792bd
commit 4886fb51b2
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
utils/cloudinfo/aws.go
View File

@ -15,6 +15,8 @@
package cloudinfo package cloudinfo
import ( import (
"time"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/ec2metadata" "github.com/aws/aws-sdk-go/aws/ec2metadata"
"github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/aws/session"
@ -23,7 +25,13 @@ import (
) )
func onAWS() bool { func onAWS() bool {
client := ec2metadata.New(session.New(&aws.Config{})) // the default client behavior retried the operation multiple times with a 5s timeout per attempt.
// if you were not on aws, you would block for 20s when invoking this operation.
// we reduce retries to 0 and set the timeout to 2s to reduce the time this blocks when not on aws.
client := ec2metadata.New(session.New(&aws.Config{MaxRetries: aws.Int(0)}))
if client.Config.HTTPClient != nil {
client.Config.HTTPClient.Timeout = time.Duration(2 * time.Second)
}
return client.Available() return client.Available()
} }