Skip to content

Commit

Permalink
Merge pull request juju#18095 from barrettj12/block-devices-log
Browse files Browse the repository at this point in the history
juju#18095

There was a INFO log line coming from the diskmanager worker which logged the full details of all block devices:

```
machine-1: 11:57:48 INFO juju.worker.diskmanager block devices changed: []blockdevice.BlockDevice{blockdevice.BlockDevice{DeviceName:"loop0", DeviceLinks:[]string(nil), Label:"", UUID:"", HardwareId:"", WWN:"", BusAddress:"", SizeMiB:0x19, FilesystemType:"", InUse:true, MountPoint:"/snap/amazon-ssm-agent/7993", SerialId:""}, blockdevice.BlockDevice{DeviceName:"loop1", DeviceLinks:[]string(nil), Label:"", UUID:"", HardwareId:"", WWN:"", BusAddress:"", SizeMiB:0x37, FilesystemType:"", InUse:true, MountPoint:"/snap/core18/2829", SerialId:""}, blockdevice.BlockDevice{DeviceName:"loop2", DeviceLinks:[]string(nil), Label:"", UUID:"", HardwareId:"", WWN:"", BusAddress:"", SizeMiB:0x3f, FilesystemType:"", InUse:true, MountPoint:"/snap/core20/2318", SerialId:""}, blockdevice.BlockDevice{DeviceName:"loop3", DeviceLinks:[]string(nil), Label:"", UUID:"", HardwareId:"", WWN:"", BusAddress:"", SizeMiB:0x57, FilesystemType:"", InUse:true, MountPoint:"/snap/lxd/29351", SerialId:""}, blockdevice.BlockDevice{DeviceName:"loop4", DeviceLinks:[]string(nil), Label:"", UUID:"", HardwareId:"", WWN:"", BusAddress:"", SizeMiB:0x26, FilesystemType:"", InUse:true, MountPoint:"/snap/snapd/21759", SerialId:""}, blockdevice.BlockDevice{DeviceName:"nvme0n1", DeviceLinks:[]string{"/dev/disk/by-id/nvme-Amazon_Elastic_Block_Store_vol0c420a863d8601e33", "/dev/disk/by-id/nvme-Amazon_Elastic_Block_Store_vol0c420a863d8601e33_1", "/dev/disk/by-id/nvme-uuid.0c7ae913-250a-5ce7-858c-a7300899b6f2", "/dev/disk/by-path/pci-0000:00:04.0-nvme-1"}, Label:"", UUID:"", HardwareId:"", WWN:"uuid.0c7ae913-250a-5ce7-858c-a7300899b6f2", BusAddress:"", SizeMiB:0x2000, FilesystemType:"", InUse:true, MountPoint:"", SerialId:"Amazon_Elastic_Block_Store_vol0c420a863d8601e33_1"}, blockdevice.BlockDevice{DeviceName:"nvme0n1p1", DeviceLinks:[]string{"/dev/disk/by-id/nvme-Amazon_Elastic_Block_Store_vol0c420a863d8601e33-part1", "/dev/disk/by-id/nvme-Amazon_Elastic_Block_Store_vol0c420a863d8601e33_1-part1", "/dev/disk/by-id/nvme-uuid.0c7ae913-250a-5ce7-858c-a7300899b6f2-part1", "/dev/disk/by-label/cloudimg-rootfs", "/dev/disk/by-partuuid/0dfc108f-487a-42fe-b16c-43a08251766c", "/dev/disk/by-path/pci-0000:00:04.0-nvme-1-part1", "/dev/disk/by-uuid/b53da42c-7176-4376-a284-2adc3c9cca40"}, Label:"cloudimg-rootfs", UUID:"b53da42c-7176-4376-a284-2adc3c9cca40", HardwareId:"", WWN:"uuid.0c7ae913-250a-5ce7-858c-a7300899b6f2", BusAddress:"", SizeMiB:0x1f90, FilesystemType:"ext4", InUse:true, MountPoint:"/", SerialId:"Amazon_Elastic_Block_Store_vol0c420a863d8601e33_1"}, blockdevice.BlockDevice{DeviceName:"nvme0n1p14", DeviceLinks:[]string{"/dev/disk/by-id/nvme-Amazon_Elastic_Block_Store_vol0c420a863d8601e33-part14", "/dev/disk/by-id/nvme-Amazon_Elastic_Block_Store_vol0c420a863d8601e33_1-part14", "/dev/disk/by-id/nvme-uuid.0c7ae913-250a-5ce7-858c-a7300899b6f2-part14", "/dev/disk/by-partuuid/54ccafe4-0306-4677-bc74-d7e63cfecbea", "/dev/disk/by-path/pci-0000:00:04.0-nvme-1-part14"}, Label:"", UUID:"", HardwareId:"", WWN:"uuid.0c7ae913-250a-5ce7-858c-a7300899b6f2", BusAddress:"", SizeMiB:0x4, FilesystemType:"", InUse:false, MountPoint:"", SerialId:"Amazon_Elastic_Block_Store_vol0c420a863d8601e33_1"}, blockdevice.BlockDevice{DeviceName:"nvme0n1p15", DeviceLinks:[]string{"/dev/disk/by-id/nvme-Amazon_Elastic_Block_Store_vol0c420a863d8601e33-part15", "/dev/disk/by-id/nvme-Amazon_Elastic_Block_Store_vol0c420a863d8601e33_1-part15", "/dev/disk/by-id/nvme-uuid.0c7ae913-250a-5ce7-858c-a7300899b6f2-part15", "/dev/disk/by-label/UEFI", "/dev/disk/by-partuuid/487bb43b-3a97-45c5-9e4e-e1354227cfb4", "/dev/disk/by-path/pci-0000:00:04.0-nvme-1-part15", "/dev/disk/by-uuid/A88B-5130"}, Label:"UEFI", UUID:"A88B-5130", HardwareId:"", WWN:"uuid.0c7ae913-250a-5ce7-858c-a7300899b6f2", BusAddress:"", SizeMiB:0x6a, FilesystemType:"vfat", InUse:true, MountPoint:"/boot/efi", SerialId:"Amazon_Elastic_Block_Store_vol0c420a863d8601e33_1"}}
```

This was creating a lot of noise in the debug logs. This is far too much information for an Infof call, it would be more appropriate at the Trace level.

## QA steps

Deploy a machine on AWS, check the debug log.
  • Loading branch information
jujubot authored Sep 23, 2024
2 parents 1f9651c + 0013733 commit ad82933
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion worker/diskmanager/diskmanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func doWork(listf ListBlockDevicesFunc, b BlockDeviceSetter, old *[]storage.Bloc
logger.Tracef("no changes to block devices detected")
return nil
}
logger.Infof("block devices changed: %#v", blockDevices)
logger.Tracef("block devices changed: %#v", blockDevices)
if err := b.SetMachineBlockDevices(blockDevices); err != nil {
return err
}
Expand Down

0 comments on commit ad82933

Please sign in to comment.