Browse Source

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 <vgoyal@redhat.com>
Vivek Goyal 10 năm trước cách đây
mục cha
commit
cb7c893275

+ 3 - 0
daemon/graphdriver/devmapper/deviceset.go

@@ -1249,6 +1249,9 @@ func (devices *DeviceSet) deactivateDevice(info *DevInfo) error {
 func (devices *DeviceSet) removeDeviceAndWait(devname string) error {
 func (devices *DeviceSet) removeDeviceAndWait(devname string) error {
 	var err 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++ {
 	for i := 0; i < 1000; i++ {
 		err = devicemapper.RemoveDevice(devname)
 		err = devicemapper.RemoveDevice(devname)
 		if err == nil {
 		if err == nil {

+ 0 - 2
pkg/devicemapper/devmapper.go

@@ -349,8 +349,6 @@ func CookieSupported() bool {
 
 
 // Useful helper for cleanup
 // Useful helper for cleanup
 func RemoveDevice(name string) error {
 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)
 	task, err := TaskCreateNamed(DeviceRemove, name)
 	if task == nil {
 	if task == nil {
 		return err
 		return err