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>
| ... | ... |
@@ -1249,6 +1249,9 @@ func (devices *DeviceSet) deactivateDevice(info *DevInfo) error {
|
| 1249 | 1249 |
func (devices *DeviceSet) removeDeviceAndWait(devname string) error {
|
| 1250 | 1250 |
var err error |
| 1251 | 1251 |
|
| 1252 |
+ logrus.Debugf("[devmapper] removeDeviceAndWait START(%s)", devname)
|
|
| 1253 |
+ defer logrus.Debugf("[devmapper] removeDeviceAndWait END(%s)", devname)
|
|
| 1254 |
+ |
|
| 1252 | 1255 |
for i := 0; i < 1000; i++ {
|
| 1253 | 1256 |
err = devicemapper.RemoveDevice(devname) |
| 1254 | 1257 |
if err == nil {
|
| ... | ... |
@@ -349,8 +349,6 @@ func CookieSupported() bool {
|
| 349 | 349 |
|
| 350 | 350 |
// Useful helper for cleanup |
| 351 | 351 |
func RemoveDevice(name string) error {
|
| 352 |
- logrus.Debugf("[devmapper] RemoveDevice START(%s)", name)
|
|
| 353 |
- defer logrus.Debugf("[devmapper] RemoveDevice END(%s)", name)
|
|
| 354 | 352 |
task, err := TaskCreateNamed(DeviceRemove, name) |
| 355 | 353 |
if task == nil {
|
| 356 | 354 |
return err |