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

Merge pull request #1359 from ncdc/thin-pool-watcher-logging

Browse Source 
Make ThinPoolWatcher loglevel consistent
This commit is contained in:
Vish Kannan 2016-07-28 09:56:08 -07:00 committed by GitHub
commit 8fc0cdbb85
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
container/docker/handler.go
View File

@ -294,7 +294,10 @@ func (h *dockerFsHandler) Usage() (uint64, uint64) {
if h.thinPoolWatcher != nil {
thinPoolUsage, err := h.thinPoolWatcher.GetUsage(h.deviceID)
if err != nil {
glog.Errorf("unable to get fs usage from thin pool for device %v: %v", h.deviceID, err)
// TODO: ideally we should keep track of how many times we failed to get the usage for this
// device vs how many refreshes of the cache there have been, and display an error e.g. if we've
// had at least 1 refresh and we still can't find the device.
glog.V(5).Infof("unable to get fs usage from thin pool for device %s: %v", h.deviceID, err)
} else {
baseUsage = thinPoolUsage
usage += thinPoolUsage

6
devicemapper/thin_pool_watcher.go
View File

@ -74,7 +74,7 @@ func (w *ThinPoolWatcher) Start() {
// print latency for refresh
duration := time.Since(start)
glog.V(3).Infof("thin_ls(%d) took %s", start.Unix(), duration)
glog.V(5).Infof("thin_ls(%d) took %s", start.Unix(), duration)
}
}
}
@ -115,7 +115,7 @@ func (w *ThinPoolWatcher) Refresh() error {
}
if currentlyReserved {
glog.V(4).Infof("metadata for %v is currently reserved; releasing", w.poolName)
glog.V(5).Infof("metadata for %v is currently reserved; releasing", w.poolName)
_, err = w.dmsetup.Message(w.poolName, 0, releaseMetadataMessage)
if err != nil {
err = fmt.Errorf("error releasing metadata snapshot for %v: %v", w.poolName, err)
@ -123,7 +123,7 @@ func (w *ThinPoolWatcher) Refresh() error {
}
}
glog.Infof("reserving metadata snapshot for thin-pool %v", w.poolName)
glog.V(5).Infof("reserving metadata snapshot for thin-pool %v", w.poolName)
// NOTE: "0" in the call below is for the 'sector' argument to 'dmsetup
// message'. It's not needed for thin pools.
if output, err := w.dmsetup.Message(w.poolName, 0, reserveMetadataMessage); err != nil {