Fresh dep ensure

This commit is contained in:
Mike Cronce
2018-11-26 13:23:56 -05:00
parent 93cb8a04d7
commit 407478ab9a
9016 changed files with 551394 additions and 279685 deletions

View File

@ -11,10 +11,10 @@ go_library(
deps = [
"//pkg/kubelet/apis/cri:go_default_library",
"//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/clock:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/clock:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
],
)
@ -25,9 +25,9 @@ go_test(
deps = [
"//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library",
"//pkg/kubelet/apis/cri/testing:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/clock:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library",
"//vendor/github.com/stretchr/testify/require:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/clock:go_default_library",
],
)

View File

@ -26,7 +26,7 @@ import (
"strings"
"time"
"github.com/golang/glog"
"k8s.io/klog"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/util/clock"
@ -171,7 +171,7 @@ func (c *containerLogManager) Start() {
// Start a goroutine periodically does container log rotation.
go wait.Forever(func() {
if err := c.rotateLogs(); err != nil {
glog.Errorf("Failed to rotate container logs: %v", err)
klog.Errorf("Failed to rotate container logs: %v", err)
}
}, logMonitorPeriod)
}
@ -193,27 +193,27 @@ func (c *containerLogManager) rotateLogs() error {
// Note that we should not block log rotate for an error of a single container.
status, err := c.runtimeService.ContainerStatus(id)
if err != nil {
glog.Errorf("Failed to get container status for %q: %v", id, err)
klog.Errorf("Failed to get container status for %q: %v", id, err)
continue
}
path := status.GetLogPath()
info, err := os.Stat(path)
if err != nil {
if !os.IsNotExist(err) {
glog.Errorf("Failed to stat container log %q: %v", path, err)
klog.Errorf("Failed to stat container log %q: %v", path, err)
continue
}
// In rotateLatestLog, there are several cases that we may
// lose original container log after ReopenContainerLog fails.
// We try to to recover it by reopening container log.
// We try to recover it by reopening container log.
if err := c.runtimeService.ReopenContainerLog(id); err != nil {
glog.Errorf("Container %q log %q doesn't exist, reopen container log failed: %v", id, path, err)
klog.Errorf("Container %q log %q doesn't exist, reopen container log failed: %v", id, path, err)
continue
}
// The container log should be recovered.
info, err = os.Stat(path)
if err != nil {
glog.Errorf("Failed to stat container log %q after reopen: %v", path, err)
klog.Errorf("Failed to stat container log %q after reopen: %v", path, err)
continue
}
}
@ -222,7 +222,7 @@ func (c *containerLogManager) rotateLogs() error {
}
// Perform log rotation.
if err := c.rotateLog(id, path); err != nil {
glog.Errorf("Failed to rotate log %q for container %q: %v", path, id, err)
klog.Errorf("Failed to rotate log %q for container %q: %v", path, id, err)
continue
}
}
@ -379,7 +379,7 @@ func (c *containerLogManager) rotateLatestLog(id, log string) error {
// This shouldn't happen.
// Report an error if this happens, because we will lose original
// log.
glog.Errorf("Failed to rename rotated log %q back to %q: %v, reopen container log error: %v", rotated, log, renameErr, err)
klog.Errorf("Failed to rename rotated log %q back to %q: %v, reopen container log error: %v", rotated, log, renameErr, err)
}
return fmt.Errorf("failed to reopen container log %q: %v", id, err)
}