Merge pull request #1785 from sjenning/fix-msg

dashpole · web-flow · commit bfb7e13720f9 · 2017-10-30T09:57:31.000-07:00
fix long du duration message
diff --git a/container/common/fsHandler.go b/container/common/fsHandler.go
@@ -132,7 +132,7 @@ func (fh *realFsHandler) trackUsage() {
 				// 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)
+				glog.V(2).Infof("du and find on following dirs took %v: %v; will not log again for this container unless duration exceeds %v", duration, []string{fh.rootfs, fh.extraDir}, longOp)
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ func (fh *realFsHandler) trackUsage() {`
`132`	`132`	`// if the long duration is persistent either because of slow`
`133`	`133`	`// disk or lots of containers.`
`134`	`134`	`longOp = longOp + time.Second`
`135`		`- 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)`
	`135`	`+ glog.V(2).Infof("du and find on following dirs took %v: %v; will not log again for this container unless duration exceeds %v", duration, []string{fh.rootfs, fh.extraDir}, longOp)`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`	`}`