Capture and log sector sizes

``logical_sectors`` and ``physical_sectors`` sizes are now captured for each hardware info ``disks`` entry, and also logged for ``lsblk`` calls. This will be increasingly useful as storage devices with 4096 byte sector sizes become more common. Change-Id: I80b6b137f6e3071d9b8a4c1abe14416249aed9ac
2024-10-24 14:57:02 +13:00
parent 6a51399ba3
commit 1a939105ba
6 changed files with 123 additions and 75 deletions
--- a/ironic_python_agent/hardware.py
+++ b/ironic_python_agent/hardware.py
@@ -724,6 +724,8 @@ def list_all_block_devices(block_type='disk',
                                   by_path=by_path_name,
                                   uuid=device_raw['uuid'],
                                   partuuid=device_raw['partuuid'],
+                                   logical_sectors=device_raw['log-sec'],
+                                   physical_sectors=device_raw['phy-sec'],
                                   **extra))
    return devices

@@ -786,12 +788,14 @@ class HardwareType(object):
 class BlockDevice(encoding.SerializableComparable):
    serializable_fields = ('name', 'model', 'size', 'rotational',
                           'wwn', 'serial', 'vendor', 'wwn_with_extension',
-                           'wwn_vendor_extension', 'hctl', 'by_path')
+                           'wwn_vendor_extension', 'hctl', 'by_path',
+                           'logical_sectors', 'physical_sectors')

    def __init__(self, name, model, size, rotational, wwn=None, serial=None,
                 vendor=None, wwn_with_extension=None,
                 wwn_vendor_extension=None, hctl=None, by_path=None,
-                 uuid=None, partuuid=None):
+                 uuid=None, partuuid=None,
+                 logical_sectors=None, physical_sectors=None):
        self.name = name
        self.model = model
        self.size = size
@@ -805,6 +809,8 @@ class BlockDevice(encoding.SerializableComparable):
        self.hctl = hctl
        self.by_path = by_path
        self.partuuid = partuuid
+        self.logical_sectors = logical_sectors
+        self.physical_sectors = physical_sectors


 class NetworkInterface(encoding.SerializableComparable):
--- a/ironic_python_agent/tests/unit/extensions/test_image.py
+++ b/ironic_python_agent/tests/unit/extensions/test_image.py
@@ -833,7 +833,8 @@ Boot0004* ironic1      HD(1,GPT,55db8d03-c8f6-4a5b-9155-790dddc348fa,0x800,0x640
                    mock.call('udevadm', 'settle'),
                    mock.call('lsblk', '-bia', '--json',
                              '-oKNAME,MODEL,SIZE,ROTA,'
-                              + 'TYPE,UUID,PARTUUID,SERIAL,WWN',
+                              + 'TYPE,UUID,PARTUUID,SERIAL,WWN,'
+                              + 'LOG-SEC,PHY-SEC',
                              check_exit_code=[0]),
                    mock.call('umount', self.fake_dir + '/boot/efi',
                              attempts=3, delay_on_retry=True),
@@ -956,7 +957,8 @@ Boot0004* ironic1      HD(1,GPT,55db8d03-c8f6-4a5b-9155-790dddc348fa,0x800,0x640
                    mock.call('udevadm', 'settle'),
                    mock.call('lsblk', '-bia', '--json',
                              '-oKNAME,MODEL,SIZE,ROTA,'
-                              + 'TYPE,UUID,PARTUUID,SERIAL,WWN',
+                              + 'TYPE,UUID,PARTUUID,SERIAL,WWN,'
+                              + 'LOG-SEC,PHY-SEC',
                              check_exit_code=[0]),
                    mock.call('umount', self.fake_dir + '/boot/efi',
                              attempts=3, delay_on_retry=True),
--- a/ironic_python_agent/tests/unit/samples/hardware_samples.py
+++ b/ironic_python_agent/tests/unit/samples/hardware_samples.py
@@ -102,42 +102,44 @@ BLK_DEVICE_TEMPLATE = """
    "blockdevices": [
        {"kname":"sda", "model":"TinyUSB Drive", "size":3116853504,
        "rota":false, "type":"disk", "serial":"sda123", "uuid":"F531-BDC3",
-        "partuuid":null, "wwn":"wwn0"},
+        "partuuid":null, "wwn":"wwn0", "log-sec": 512, "phy-sec": 512},
        {"kname":"sdb", "model":"Fastable SD131 7", "size":10737418240,
        "rota":false, "type":"disk", "serial":"sdb123", "wwn":"wwn1",
-        "uuid":"9a5e5cca-e03d-4cbd-9054-9e6ca9048222", "partuuid":null},
+        "uuid":"9a5e5cca-e03d-4cbd-9054-9e6ca9048222", "partuuid":null,
+        "log-sec": 512, "phy-sec": 512},
        {"kname":"sdc", "model":"NWD-BLP4-1600", "size":1765517033472,
        "rota":false, "type":"disk", "serial":"sdc123", "uuid":null,
-        "partuuid":null, "wwn":"wwn2"},
+        "partuuid":null, "wwn":"wwn2", "log-sec": 512, "phy-sec": 512},
        {"kname":"sdd", "model":"NWD-BLP4-1600", "size":1765517033472,
        "rota":false, "type":"disk", "serial":"sdd123", "uuid":null,
-        "partuuid":null, "wwn":"wwn3"},
+        "partuuid":null, "wwn":"wwn3", "log-sec": 512, "phy-sec": 512},
        {"kname":"loop0", "model":null, "size":109109248, "rota":true,
        "type":"loop", "serial":null, "uuid":null, "partuuid": null,
-        "wwn":"wwn03"},
+        "wwn":"wwn03", "log-sec": 512, "phy-sec": 512},
        {"kname":"zram0", "model":null, "size":0, "rota":false, "type":"disk",
-        "serial":null, "uuid":null, "partuuid":null, "wwn":"wwn04"},
+        "serial":null, "uuid":null, "partuuid":null, "wwn":"wwn04",
+        "log-sec": 512, "phy-sec": 512},
        {"kname":"ram0", "model":null, "size":8388608, "rota":false,
-        "type":"disk", "serial":null, "uuid":null, "partuuid":null, "wwn":null
-        },
+        "type":"disk", "serial":null, "uuid":null, "partuuid":null, "wwn":null,
+        "log-sec": 512, "phy-sec": 512},
        {"kname":"ram1", "model":null, "size":8388608, "rota":false,
-        "type":"disk", "serial":null, "uuid":null, "partuuid":null, "wwn":null
-        },
+        "type":"disk", "serial":null, "uuid":null, "partuuid":null, "wwn":null,
+        "log-sec": 512, "phy-sec": 512},
        {"kname":"ram2", "model":null, "size":8388608, "rota":false,
-        "type":"disk", "serial":null,  "uuid":null, "partuuid":null,"wwn":null
-        },
+        "type":"disk", "serial":null,  "uuid":null, "partuuid":null,"wwn":null,
+        "log-sec": 512, "phy-sec": 512},
        {"kname":"ram3", "model":null, "size":8388608, "rota":false,
-        "type":"disk", "serial":null, "uuid":null, "partuuid":null, "wwn":null
-        },
+        "type":"disk", "serial":null, "uuid":null, "partuuid":null, "wwn":null,
+        "log-sec": 512, "phy-sec": 512},
        {"kname":"fd1", "model":"magic", "size":4096, "rota":true,
-        "type":"disk", "serial":null, "uuid":null, "partuuid":null, "wwn":null
-        },
+        "type":"disk", "serial":null, "uuid":null, "partuuid":null, "wwn":null,
+        "log-sec": 512, "phy-sec": 512},
        {"kname":"sdf", "model":"virtual floppy", "size":0, "rota":true,
-        "type":"disk", "serial":null, "uuid":null, "partuuid":null, "wwn":null
-        },
+        "type":"disk", "serial":null, "uuid":null, "partuuid":null, "wwn":null,
+        "log-sec": 512, "phy-sec": 512},
        {"kname":"dm-0", "model":"NWD-BLP4-1600", "size":"1765517033472",
        "rota":false, "type":"mpath", "serial":null, "uuid":null,
-        "partuuid":null, "wwn":null }
+        "partuuid":null, "wwn":null , "log-sec": 512, "phy-sec": 512}
    ]
 }
 """
@@ -148,10 +150,10 @@ BLK_DEVICE_TEMPLATE_SMALL = """
  "blockdevices": [
    {"kname":"sda", "model":"TinyUSB Drive", "size":3116853504, "rota":false,
    "type":"disk", "serial":"123", "uuid":"F531-BDC", "partuuid":null,
-    "wwn":"wwn0" },
+    "wwn":"wwn0", "log-sec": 512, "phy-sec": 512},
    {"kname":"sdb", "model":"AlmostBigEnough Drive", "size":"4294967295",
    "rota":false, "type":"disk", "serial":"456", "uuid":null, "partuuid":null,
-    "wwn":"wwn1" }
+    "wwn":"wwn1", "log-sec": 512, "phy-sec": 512}
  ]
 }
 """
@@ -162,10 +164,11 @@ BLK_INCOMPLETE_DEVICE_TEMPLATE_SMALL = """
 {
  "blockdevices": [
    {"kname":"sda", "model":"TinyUSB Drive", "size":3116853504, "rota":false,
-    "type":"disk", "serial":"", "uuid":"F531-BDC", "partuuid":null, "wwn":""},
+    "type":"disk", "serial":"", "uuid":"F531-BDC", "partuuid":null, "wwn":"",
+    "log-sec": 512, "phy-sec": 512},
    {"kname":"sdb", "model":"AlmostBigEnough Drive", "size":"4294967295",
    "rota":false, "type":"disk", "serial":"", "uuid":null, "partuuid":null,
-    "wwn":null }
+    "wwn":null , "log-sec": 512, "phy-sec": 512}
  ]
 }
 """
@@ -182,26 +185,31 @@ RAID_BLK_DEVICE_TEMPLATE = ("""
    "blockdevices": [
      {"kname":"sda", "model":"DRIVE 0", "size":1765517033472, "rota":true,
      "type":"disk", "serial":"sda123", "uuid":null, "partuuid":null,
-      "wwn":"wwn1234" },
+      "wwn":"wwn1234" , "log-sec": 512, "phy-sec": 512},
      {"kname":"sda1", "model":"DRIVE 0", "size":107373133824, "rota":true,
      "type":"part", "serial":"sda1123", "uuid":null, "partuuid":null,
-      "wwn":"wwn2222"},
+      "wwn":"wwn2222", "log-sec": 512, "phy-sec": 512},
      {"kname":"sdb", "model":"DRIVE 1", "size":1765517033472, "rota":true,
      "type":"disk", "serial":"sdb123", "uuid":null, "partuuid":null,
-      "wwn":"wwn333"},
+      "wwn":"wwn333", "log-sec": 512, "phy-sec": 512},
      {"kname":"sdb", "model":"DRIVE 1", "size":1765517033472, "rota":true,
-      "type":"disk", "uuid":null, "partuuid":null, "wwn":"444"},
+      "type":"disk", "uuid":null, "partuuid":null, "wwn":"444", "log-sec": 512,
+      "phy-sec": 512},
      {"kname":"sdb1", "model":"DRIVE 1", "size":107373133824, "rota":true,
      "type":"part", "serial":"sdb1123", "uuid":null, "partuuid":null,
-      "wwn":"wwn5"},
+      "wwn":"wwn5", "log-sec": 512, "phy-sec": 512},
      {"kname":"md0p1", "model":"RAID", "size":107236818944, "rota":false,
-      "type":"md", "serial":null, "uuid":null, "partuuid":null, "wwn":"wwn6"},
+      "type":"md", "serial":null, "uuid":null, "partuuid":null, "wwn":"wwn6",
+      "log-sec": 512, "phy-sec": 512},
      {"kname":"md0", "model":"RAID", "size":1765517033470, "rota":false,
-      "type":"raid1", "serial":null, "uuid":null, "partuuid":null, "wwn":"12"},
+      "type":"raid1", "serial":null, "uuid":null, "partuuid":null, "wwn":"12",
+      "log-sec": 512, "phy-sec": 512},
      {"kname":"md0", "model":"RAID", "size":1765517033470, "rota":false,
-      "type":"raid1", "serial":null, "uuid":null, "partuuid":null, "wwn":"33"},
+      "type":"raid1", "serial":null, "uuid":null, "partuuid":null, "wwn":"33",
+      "log-sec": 512, "phy-sec": 512},
      {"kname":"md1", "model":"RAID", "size":0, "rota":false, "type":"raid1",
-      "serial":null, "uuid":null, "partuuid":null, "wwn":null}
+      "serial":null, "uuid":null, "partuuid":null, "wwn":null, "log-sec": 512,
+      "phy-sec": 512}
    ]
 }
 """)
@@ -211,59 +219,63 @@ MULTIPATH_BLK_DEVICE_TEMPLATE = ("""
    "blockdevices": [
      {"kname":"sda", "model":"INTEL_SSDSC2CT060A3", "size":"60022480896",
      "rota":false, "type":"disk", "serial":"sda123", "uuid":null,
-      "partuuid":null, "wwn":null },
+      "partuuid":null, "wwn":null , "log-sec": 512, "phy-sec": 512},
      {"kname":"sda2", "model":null, "size":"59162722304", "rota":false,
      "type":"part", "uuid":"f8b55d59-96c3-3982-b129-1b6b2ee8da86",
      "partuuid":"c97c8aac-7796-4433-b1fc-9b5fac43edf3", "serial":"sda2123",
-      "wwn":"" },
+      "wwn":"" , "log-sec": 512, "phy-sec": 512},
      {"kname":"sda3", "model":null, "size":"650002432", "rota":false,
      "type":"part", "uuid":"b3b03565-5f13-3c93-b2a6-6d90e25be926",
      "partuuid":"6c85beff-b2bd-4a1c-91b7-8abb5256459d", "serial":"sda3123",
-      "wwn":"wwn1" },
+      "wwn":"wwn1" , "log-sec": 512, "phy-sec": 512},
      {"kname":"sda1", "model":null, "size":"209715200", "rota":false,
      "type":"part", "uuid":"0a83355d-7500-3f5f-9abd-66f6fd03714c",
      "partuuid":"eba28b26-b76a-402c-94dd-0b66a523a485", "serial":"sda1123",
-      "wwn":"123" },
+      "wwn":"123" , "log-sec": 512, "phy-sec": 512},
      {"kname":"dm-0", "model":null, "size":"60022480896", "rota":false,
      "type":"mpath", "serial":null, "uuid":null, "partuuid":null,
-      "wwn":"123aa" },
+      "wwn":"123aa" , "log-sec": 512, "phy-sec": 512},
      {"kname":"dm-4", "model":null, "size":"650002432", "rota":false,
      "type":"part", "uuid":"b3b03565-5f13-3c93-b2a6-6d90e25be926",
      "partuuid":"6c85beff-b2bd-4a1c-91b7-8abb5256459d", "serial":null,
-      "wwn":"123bb" },
+      "wwn":"123bb" , "log-sec": 512, "phy-sec": 512},
      {"kname":"dm-2", "model":null, "size":"209715200", "rota":false,
      "type":"part", "uuid":"0a83355d-7500-3f5f-9abd-66f6fd03714c",
      "partuuid":"eba28b26-b76a-402c-94dd-0b66a523a485", "serial":null,
-      "wwn":"123cc" },
+      "wwn":"123cc" , "log-sec": 512, "phy-sec": 512},
      {"kname":"dm-3", "model":null, "size":"59162722304", "rota":false,
      "type":"part", "uuid":"f8b55d59-96c3-3982-b129-1b6b2ee8da86",
      "partuuid":"c97c8aac-7796-4433-b1fc-9b5fac43edf3", "serial":null,
-      "wwn":"123dd" },
+      "wwn":"123dd" , "log-sec": 512, "phy-sec": 512},
      {"kname":"sdb", "model":"INTEL_SSDSC2CT060A3", "size":"60022480896",
      "rota":false, "type":"disk", "serial":"sdb123", "uuid":null,
-      "partuuid":null, "wwn":"123ee" },
+      "partuuid":null, "wwn":"123ee" , "log-sec": 512, "phy-sec": 512},
      {"kname":"sdb2", "model":null, "size":"59162722304",
      "rota":false, "type":"part", "serial":"sdb2123",
      "uuid":"f8b55d59-96c3-3982-b129-1b6b2ee8da86", "wwn":"123gg",
-      "partuuid":"c97c8aac-7796-4433-b1fc-9b5fac43edf3"},
+      "partuuid":"c97c8aac-7796-4433-b1fc-9b5fac43edf3", "log-sec": 512,
+      "phy-sec": 512},
      {"kname":"sdb3", "model":null, "size":"650002432",
      "rota":false, "type":"part", "serial":"sdv3123",
      "uuid":"b3b03565-5f13-3c93-b2a6-6d90e25be926", "wwn":"123zz",
-      "partuuid":"6c85beff-b2bd-4a1c-91b7-8abb5256459d"},
+      "partuuid":"6c85beff-b2bd-4a1c-91b7-8abb5256459d", "log-sec": 512,
+      "phy-sec": 512},
      {"kname":"sdb1", "model":null, "size":"209715200",
      "rota":false, "type":"part", "serial":"sdb1123",
      "uuid":"0a83355d-7500-3f5f-9abd-66f6fd03714c", "wwn":"123ll",
-      "partuuid":"eba28b26-b76a-402c-94dd-0b66a523a485"},
+      "partuuid":"eba28b26-b76a-402c-94dd-0b66a523a485", "log-sec": 512,
+      "phy-sec": 512},
      {"kname":"sdc", "model":"ST1000DM003-1CH162", "size":"1000204886016",
      "rota":true, "type":"disk", "serial":"sdc123", "uuid":null, "wwn":"123g",
-      "partuuid":null},
+      "partuuid":null, "log-sec": 512, "phy-sec": 512},
      {"kname":"sdc1", "model":null, "size":"899999072256",
      "rota":true, "type":"part", "serial":"sdc1123",
      "uuid":"457f7d3c-9376-4997-89bd-d1a7c8b04060", "wwn":"123kc",
-      "partuuid":"c9433d2e-3bbc-47b4-92bf-43c1d80f06e0"},
+      "partuuid":"c9433d2e-3bbc-47b4-92bf-43c1d80f06e0", "log-sec": 512,
+      "phy-sec": 512},
      {"kname":"dm-1", "model":null, "size":"1000204886016", "rota":false,
      "type":"mpath", "serial":null, "uuid":null, "partuuid":null,
-      "wwn":"sp0ng3b0b" }
+      "wwn":"sp0ng3b0b" , "log-sec": 512, "phy-sec": 512}
    ]
 }
 """)
@@ -273,10 +285,10 @@ PARTUUID_DEVICE_TEMPLATE = ("""
    "blockdevices": [
      {"kname":"sda", "model":"DRIVE 0", "size":1765517033472, "rota":true,
      "type":"disk", "serial":"sda123", "uuid":null, "partuuid":null,
-      "wwn":"4d4m" },
+      "wwn":"4d4m", "log-sec": 512, "phy-sec": 512},
      {"kname":"sda1", "model":"DRIVE 0", "size":107373133824, "rota":true,
      "type":"part", "serial":"sda1123", "uuid":"987654-3210", "wwn":"k4k1",
-      "partuuid":"1234-5678"}
+      "partuuid":"1234-5678", "log-sec": 512, "phy-sec": 512}
    ]
 }
 """)
--- a/ironic_python_agent/tests/unit/test_hardware.py
+++ b/ironic_python_agent/tests/unit/test_hardware.py
@@ -52,37 +52,44 @@ BLK_DEVICE_TEMPLATE_SMALL_DEVICES = [
    hardware.BlockDevice(name='/dev/sda', model='TinyUSB Drive',
                         size=3116853504, rotational=False,
                         vendor="FooTastic", uuid="F531-BDC3",
-                         serial="123", wwn="wwn0"),
+                         serial="123", wwn="wwn0",
+                         logical_sectors=512, physical_sectors=512),
    hardware.BlockDevice(name='/dev/sdb', model='AlmostBigEnough Drive',
                         size=4294967295, rotational=False,
                         vendor="FooTastic", uuid="",
-                         serial="456", wwn="wwn1"),
+                         serial="456", wwn="wwn1",
+                         logical_sectors=512, physical_sectors=512),
 ]

 RAID_BLK_DEVICE_TEMPLATE_DEVICES = [
    hardware.BlockDevice(name='/dev/sda', model='DRIVE 0',
                         size=1765517033472, rotational=True,
                         vendor="FooTastic", uuid="",
-                         serial="sda123", wwn="wwn1234"),
+                         serial="sda123", wwn="wwn1234",
+                         logical_sectors=512, physical_sectors=512),
    hardware.BlockDevice(name='/dev/sdb', model='DRIVE 1',
                         size=1765517033472, rotational=True,
                         vendor="FooTastic", uuid="",
-                         serial="sdb123", wwn="wwn333"),
+                         serial="sdb123", wwn="wwn333",
+                         logical_sectors=512, physical_sectors=512),
    hardware.BlockDevice(name='/dev/md0', model='RAID',
                         size=1765517033470, rotational=False,
                         vendor="FooTastic", uuid="",
-                         serial=None, wwn="12"),
+                         serial=None, wwn="12",
+                         logical_sectors=512, physical_sectors=512),
    hardware.BlockDevice(name='/dev/md1', model='RAID',
                         size=0, rotational=False,
                         vendor="FooTastic", uuid="",
-                         serial=None, wwn=None),
+                         serial=None, wwn=None,
+                         logical_sectors=512, physical_sectors=512),
 ]

 BLK_DEVICE_TEMPLATE_PARTUUID_DEVICE = [
    hardware.BlockDevice(name='/dev/sda1', model='DRIVE 0',
                         size=107373133824, rotational=True,
                         vendor="FooTastic", uuid="987654-3210",
-                         partuuid="1234-5678", serial="sda1123", wwn="k4k1"),
+                         partuuid="1234-5678", serial="sda1123", wwn="k4k1",
+                         logical_sectors=512, physical_sectors=512),
 ]


@@ -460,7 +467,8 @@ class TestGenericHardwareManager(base.IronicAgentTest):
        ]
        expected = [
            mock.call('lsblk', '-bia', '--json',
-                      '-oKNAME,MODEL,SIZE,ROTA,TYPE,UUID,PARTUUID,SERIAL,WWN',
+                      '-oKNAME,MODEL,SIZE,ROTA,TYPE,UUID,PARTUUID,SERIAL,WWN,'
+                      'LOG-SEC,PHY-SEC',
                      check_exit_code=[0]),
            mock.call('multipath', '-c', '/dev/sda'),
            mock.call('multipath', '-ll', '/dev/sda'),
@@ -540,7 +548,8 @@ class TestGenericHardwareManager(base.IronicAgentTest):
        ]
        expected = [
            mock.call('lsblk', '-bia', '--json',
-                      '-oKNAME,MODEL,SIZE,ROTA,TYPE,UUID,PARTUUID,SERIAL,WWN',
+                      '-oKNAME,MODEL,SIZE,ROTA,TYPE,UUID,PARTUUID,SERIAL,WWN,'
+                      'LOG-SEC,PHY-SEC',
                      check_exit_code=[0]),
            mock.call('multipath', '-c', '/dev/sda'),
            mock.call('multipath', '-ll', '/dev/sda'),
@@ -595,7 +604,8 @@ class TestGenericHardwareManager(base.IronicAgentTest):
        self.assertEqual('/dev/md0', self.hardware.get_os_install_device())
        expected = [
            mock.call('lsblk', '-bia', '--json',
-                      '-oKNAME,MODEL,SIZE,ROTA,TYPE,UUID,PARTUUID,SERIAL,WWN',
+                      '-oKNAME,MODEL,SIZE,ROTA,TYPE,UUID,PARTUUID,SERIAL,WWN,'
+                      'LOG-SEC,PHY-SEC',
                      check_exit_code=[0]),
        ]

@@ -621,14 +631,16 @@ class TestGenericHardwareManager(base.IronicAgentTest):
                               self.hardware.get_os_install_device)
        expected = [
            mock.call('lsblk', '-bia', '--json',
-                      '-oKNAME,MODEL,SIZE,ROTA,TYPE,UUID,PARTUUID,SERIAL,WWN',
+                      '-oKNAME,MODEL,SIZE,ROTA,TYPE,UUID,PARTUUID,SERIAL,WWN,'
+                      'LOG-SEC,PHY-SEC',
                      check_exit_code=[0]),
        ]

        mocked_execute.assert_has_calls(expected)
        mocked_execute.assert_called_once_with(
            'lsblk', '-bia', '--json',
-            '-oKNAME,MODEL,SIZE,ROTA,TYPE,UUID,PARTUUID,SERIAL,WWN',
+            '-oKNAME,MODEL,SIZE,ROTA,TYPE,UUID,PARTUUID,SERIAL,WWN,'
+            'LOG-SEC,PHY-SEC',
            check_exit_code=[0])
        self.assertIn(str(4 * units.Gi), ex.details)
        mock_cached_node.assert_called_once_with()
@@ -1467,7 +1479,8 @@ class TestGenericHardwareManager(base.IronicAgentTest):
        mock_readlink.assert_has_calls(expected_calls)
        expected_calls = [
            mock.call('lsblk', '-bia', '--json',
-                      '-oKNAME,MODEL,SIZE,ROTA,TYPE,UUID,PARTUUID,SERIAL,WWN',
+                      '-oKNAME,MODEL,SIZE,ROTA,TYPE,UUID,PARTUUID,SERIAL,WWN,'
+                      'LOG-SEC,PHY-SEC',
                      check_exit_code=[0]),
            mock.call('multipath', '-c', '/dev/sda'),
            mock.call('multipath', '-c', '/dev/sdb'),
@@ -1599,7 +1612,8 @@ class TestGenericHardwareManager(base.IronicAgentTest):
        mock_readlink.assert_has_calls(expected_calls)
        expected_calls = [
            mock.call('lsblk', '-bia', '--json',
-                      '-oKNAME,MODEL,SIZE,ROTA,TYPE,UUID,PARTUUID,SERIAL,WWN',
+                      '-oKNAME,MODEL,SIZE,ROTA,TYPE,UUID,PARTUUID,SERIAL,WWN,'
+                      'LOG-SEC,PHY-SEC',
                      check_exit_code=[0]),
            mock.call('multipath', '-c', '/dev/sda'),
            mock.call('multipath', '-c', '/dev/sdb'),
@@ -5652,7 +5666,8 @@ class TestModuleFunctions(base.IronicAgentTest):
        result = hardware.list_all_block_devices()
        expected_calls = [
            mock.call('lsblk', '-bia', '--json',
-                      '-oKNAME,MODEL,SIZE,ROTA,TYPE,UUID,PARTUUID,SERIAL,WWN',
+                      '-oKNAME,MODEL,SIZE,ROTA,TYPE,UUID,PARTUUID,SERIAL,WWN,'
+                      'LOG-SEC,PHY-SEC',
                      check_exit_code=[0]),
            mock.call('multipath', '-c', '/dev/sda'),
            mock.call('multipath', '-c', '/dev/sdb')
@@ -5699,7 +5714,8 @@ class TestModuleFunctions(base.IronicAgentTest):
        ]
        expected_calls = [
            mock.call('lsblk', '-bia', '--json',
-                      '-oKNAME,MODEL,SIZE,ROTA,TYPE,UUID,PARTUUID,SERIAL,WWN',
+                      '-oKNAME,MODEL,SIZE,ROTA,TYPE,UUID,PARTUUID,SERIAL,WWN,'
+                      'LOG-SEC,PHY-SEC',
                      check_exit_code=[0]),
            mock.call('multipath', '-c', '/dev/sda'),
            mock.call('multipath', '-c', '/dev/sda1'),
@@ -5738,7 +5754,8 @@ class TestModuleFunctions(base.IronicAgentTest):
        result = hardware.list_all_block_devices(block_type='part')
        expected_calls = [
            mock.call('lsblk', '-bia', '--json',
-                      '-oKNAME,MODEL,SIZE,ROTA,TYPE,UUID,PARTUUID,SERIAL,WWN',
+                      '-oKNAME,MODEL,SIZE,ROTA,TYPE,UUID,PARTUUID,SERIAL,WWN,'
+                      'LOG-SEC,PHY-SEC',
                      check_exit_code=[0]),
            mock.call('multipath', '-c', '/dev/sda'),
            mock.call('multipath', '-c', '/dev/sda1'),
@@ -5761,7 +5778,8 @@ class TestModuleFunctions(base.IronicAgentTest):
        result = hardware.list_all_block_devices()
        mocked_execute.assert_called_once_with(
            'lsblk', '-bia', '--json',
-            '-oKNAME,MODEL,SIZE,ROTA,TYPE,UUID,PARTUUID,SERIAL,WWN',
+            '-oKNAME,MODEL,SIZE,ROTA,TYPE,UUID,PARTUUID,SERIAL,WWN,'
+            'LOG-SEC,PHY-SEC',
            check_exit_code=[0])
        self.assertEqual([], result)
        mocked_udev.assert_called_once_with()
@@ -5775,15 +5793,17 @@ class TestModuleFunctions(base.IronicAgentTest):
        mocked_mpath.return_value = False
        expected_calls = [
            mock.call('lsblk', '-bia', '--json',
-                      '-oKNAME,MODEL,SIZE,ROTA,TYPE,UUID,PARTUUID,SERIAL,WWN',
+                      '-oKNAME,MODEL,SIZE,ROTA,TYPE,UUID,PARTUUID,SERIAL,WWN,'
+                      'LOG-SEC,PHY-SEC',
                      check_exit_code=[0]),
        ]
        mocked_execute.return_value = (
            '{"blockdevices": [{"type":"disk", "model":"model"}]}', '')
        self.assertRaisesRegex(
            errors.BlockDeviceError,
-            r'Block device caused unknown error: kname, partuuid, rota, '
-            r'serial, size, uuid, wwn must be returned by lsblk.',
+            r'Block device caused unknown error: kname, log-sec, partuuid, '
+            r'phy-sec, rota, serial, size, uuid, wwn '
+            r'must be returned by lsblk.',
            hardware.list_all_block_devices)
        mocked_udev.assert_called_once_with()
        mocked_execute.assert_has_calls(expected_calls)
--- a/ironic_python_agent/utils.py
+++ b/ironic_python_agent/utils.py
@@ -60,7 +60,8 @@ AGENT_PARAMS_CACHED = dict()


 LSBLK_COLUMNS = ['KNAME', 'MODEL', 'SIZE', 'ROTA',
-                 'TYPE', 'UUID', 'PARTUUID', 'SERIAL', 'WWN']
+                 'TYPE', 'UUID', 'PARTUUID', 'SERIAL', 'WWN',
+                 'LOG-SEC', 'PHY-SEC']


 DEVICE_EXTRACTOR = re.compile(r'^(?:(.*\d)p|(.*\D))(?:\d+)$')
--- a/releasenotes/notes/sector_size-b2c0a07086012c17.yaml
+++ b/releasenotes/notes/sector_size-b2c0a07086012c17.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    ``logical_sectors`` and ``physical_sectors`` sizes are now captured for each
+    hardware info ``disks`` entry, and also logged for ``lsblk`` calls. This
+    will be increasingly useful as storage devices with 4096 byte sector sizes
+    become more common.