From cb7c893275c32ddfa775c3f22869a9c211024c71 Mon Sep 17 00:00:00 2001 From: Vivek Goyal Date: Thu, 2 Apr 2015 16:47:14 -0400 Subject: [PATCH] devicemapper: Remove debug messages from RemoveDevice() devmapper graph driver retries device removal 1000 times in case of failure and if this fills up console with 1000 messages (when daemon is running in debug mode). So remove these debug messages. Signed-off-by: Vivek Goyal --- daemon/graphdriver/devmapper/deviceset.go | 3 +++ pkg/devicemapper/devmapper.go | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go index 5515df9960..5923811d26 100644 --- a/daemon/graphdriver/devmapper/deviceset.go +++ b/daemon/graphdriver/devmapper/deviceset.go @@ -1249,6 +1249,9 @@ func (devices *DeviceSet) deactivateDevice(info *DevInfo) error { func (devices *DeviceSet) removeDeviceAndWait(devname string) error { var err error + logrus.Debugf("[devmapper] removeDeviceAndWait START(%s)", devname) + defer logrus.Debugf("[devmapper] removeDeviceAndWait END(%s)", devname) + for i := 0; i < 1000; i++ { err = devicemapper.RemoveDevice(devname) if err == nil { diff --git a/pkg/devicemapper/devmapper.go b/pkg/devicemapper/devmapper.go index e8341692a4..f75031996d 100644 --- a/pkg/devicemapper/devmapper.go +++ b/pkg/devicemapper/devmapper.go @@ -349,8 +349,6 @@ func CookieSupported() bool { // Useful helper for cleanup func RemoveDevice(name string) error { - logrus.Debugf("[devmapper] RemoveDevice START(%s)", name) - defer logrus.Debugf("[devmapper] RemoveDevice END(%s)", name) task, err := TaskCreateNamed(DeviceRemove, name) if task == nil { return err