Skip to content

Commit 30a1952

Browse files
committed
More explanation in logs
1 parent e0ff51e commit 30a1952

File tree

1 file changed

+59
-19
lines changed

1 file changed

+59
-19
lines changed

images/agent/internal/controller/bd/discoverer.go

Lines changed: 59 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ func (d *Discoverer) filterDevices(devices []internal.Device) ([]internal.Device
354354
}
355355
devicesByKName[device.KName] = &device
356356
}
357-
d.log.Trace(fmt.Sprintf("[filterDevices] Made map by KName in %v", time.Since(start)))
357+
d.log.Trace("[filterDevices] Made map by KName", "duration", time.Since(start))
358358

359359
start = time.Now()
360360
// feel up missing serial and wwn for mpath and partitions
@@ -397,7 +397,7 @@ func (d *Discoverer) filterDevices(devices []internal.Device) ([]internal.Device
397397
}
398398
}
399399
}
400-
d.log.Trace("Found missing Serial and Wwn in %v", time.Since(start))
400+
d.log.Trace("Found missing Serial and Wwn", "duration", time.Since(start))
401401

402402
// deleting parent devices
403403

@@ -410,27 +410,67 @@ func (d *Discoverer) filterDevices(devices []internal.Device) ([]internal.Device
410410
}
411411
}
412412

413-
devices = slices.DeleteFunc(devices, func(device internal.Device) bool {
414-
if device.FSType == "mpath_member" {
415-
return true
416-
}
413+
devices = slices.DeleteFunc(
414+
devices,
415+
func(device internal.Device) bool {
416+
if device.FSType == "mpath_member" {
417+
d.log.Trace("[filterDevices] filtered out", "name", device.Name, "kname", device.KName, "reason", "mpath_member")
418+
return true
419+
}
417420

418-
if strings.HasPrefix(device.Name, internal.DRBDName) || !hasValidType(device.Type) || !hasValidFSType(device.FSType) {
419-
return true
420-
}
421+
if strings.HasPrefix(device.Name, internal.DRBDName) {
422+
d.log.Trace("[filterDevices] filtered out", "name", device.Name, "kname", device.KName, "reason", "drbd")
423+
return true
424+
}
425+
if !hasValidType(device.Type) {
426+
d.log.Trace(
427+
"[filterDevices] filtered out",
428+
"name", device.Name,
429+
"kname", device.KName,
430+
"reason", "type",
431+
"type", device.Type,
432+
)
433+
return true
434+
}
435+
if !hasValidFSType(device.FSType) {
436+
d.log.Trace(
437+
"[filterDevices] filtered out",
438+
"name", device.Name,
439+
"kname", device.KName,
440+
"reason", "fstype",
441+
"fstype", device.FSType,
442+
)
443+
return true
444+
}
421445

422-
_, hasChildren := pkNames[device.KName]
423-
if hasChildren && device.FSType != internal.LVMFSType {
424-
return true
425-
}
446+
_, hasChildren := pkNames[device.KName]
447+
if hasChildren && device.FSType != internal.LVMFSType {
448+
d.log.Trace(
449+
"[filterDevices] filtered out",
450+
"name", device.Name,
451+
"kname", device.KName,
452+
"reason", "has children but not LVM",
453+
"fstype", device.FSType,
454+
"has_children", hasChildren,
455+
)
456+
return true
457+
}
426458

427-
validSize, err := hasValidSize(device.Size)
428-
if err != nil || !validSize {
429-
return true
430-
}
459+
validSize, err := hasValidSize(device.Size)
460+
if err != nil || !validSize {
461+
d.log.Trace(
462+
"[filterDevices] filtered out",
463+
"name", device.Name,
464+
"kname", device.KName,
465+
"reason", "invalid size",
466+
"size", device.Size,
467+
)
468+
return true
469+
}
431470

432-
return false
433-
})
471+
return false
472+
},
473+
)
434474

435475
d.log.Trace(fmt.Sprintf("[filterDevices] final filtered devices: %+v", devices))
436476

0 commit comments

Comments
 (0)