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

Merge pull request #1766 from sjenning/adapt-long-du

Browse Source 
adaptive longOp for du operation
This commit is contained in:
Derek Carr 2017-10-05 10:36:37 -04:00 committed by GitHub
commit 3e659ec0d1
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
container/common/fsHandler.go
View File

@ -51,7 +51,6 @@ type realFsHandler struct {
} }
const ( const (
longOp = time.Second
timeout = 2 * time.Minute timeout = 2 * time.Minute
maxBackoffFactor = 20 maxBackoffFactor = 20
) )
@ -111,6 +110,7 @@ func (fh *realFsHandler) update() error {
func (fh *realFsHandler) trackUsage() { func (fh *realFsHandler) trackUsage() {
fh.update() fh.update()
longOp := time.Second
for { for {
select { select {
case <-fh.stopChan: case <-fh.stopChan:
@ -128,7 +128,11 @@ func (fh *realFsHandler) trackUsage() {
} }
duration := time.Since(start) duration := time.Since(start)
if duration > longOp { if duration > longOp {
glog.V(2).Infof("du and find on following dirs took %v: %v", duration, []string{fh.rootfs, fh.extraDir}) // adapt longOp time so that message doesn't continue to print
// if the long duration is persistent either because of slow
// disk or lots of containers.
longOp = longOp + time.Second
glog.V(2).Infof("du and find on following dirs took %v: %v; will not log again for this container unless duration exceeds %d seconds.", duration, []string{fh.rootfs, fh.extraDir}, longOp)
} }
} }
} }