github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-24 00:31:24 +00:00
Code Issues Projects Releases Wiki Activity

Update cadvisor to 6116f265302357cbb10f84737af30b1f13ce2d6c

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu
2018-02-08 22:37:39 +00:00
parent c15ae2fff7
commit eabffb6eb0
10 changed files with 250 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vendor/github.com/google/cadvisor/container/docker/docker.go generated vendored
View File

@@ -29,19 +29,27 @@ import (
"github.com/google/cadvisor/machine"
)
const defaultTimeout = time.Second * 5
var dockerTimeout = 10 * time.Second
func defaultContext() context.Context {
ctx, _ := context.WithTimeout(context.Background(), defaultTimeout)
ctx, _ := context.WithTimeout(context.Background(), dockerTimeout)
return ctx
}
func SetTimeout(timeout time.Duration) {
dockerTimeout = timeout
}
func Status() (v1.DockerStatus, error) {
return StatusWithContext(defaultContext())
}
func StatusWithContext(ctx context.Context) (v1.DockerStatus, error) {
client, err := Client()
if err != nil {
return v1.DockerStatus{}, fmt.Errorf("unable to communicate with docker daemon: %v", err)
}
dockerInfo, err := client.Info(defaultContext())
dockerInfo, err := client.Info(ctx)
if err != nil {
return v1.DockerStatus{}, err
}

3
vendor/github.com/google/cadvisor/container/docker/handler.go generated vendored
View File

@@ -44,6 +44,7 @@ import (
const (
// The read write layers exist here.
aufsRWLayer = "diff"
overlayRWLayer = "upper"
overlay2RWLayer = "diff"
// Path to the directory where docker stores log files if the json logging driver is enabled.
@@ -197,7 +198,7 @@ func newDockerContainerHandler(
case aufsStorageDriver:
rootfsStorageDir = path.Join(storageDir, string(aufsStorageDriver), aufsRWLayer, rwLayerID)
case overlayStorageDriver:
rootfsStorageDir = path.Join(storageDir, string(storageDriver), rwLayerID)
rootfsStorageDir = path.Join(storageDir, string(storageDriver), rwLayerID, overlayRWLayer)
case overlay2StorageDriver:
rootfsStorageDir = path.Join(storageDir, string(storageDriver), rwLayerID, overlay2RWLayer)
case zfsStorageDriver: