Fix Linux Sector count Fact

[lukecdavidson]

SUMMARY

The sectors fact returned is currently incorrect. Leading to the bug #26280. The current method for getting the sectors is to read /size from sysfs (i.e. /sys/block/zram0/size). Linux creates this number assuming the sector size is 512. Ansible then multiplies this sector count by 512 to get the disk size. This will result in a correct disk size, but the sector count is incorrect. This PR fixes the sector count that is returned.

Fixes #26280

ISSUE TYPE

• Bugfix Pull Request

COMPONENT NAME

Module for gathering facts for linux hardware.

ADDITIONAL INFORMATION

Sector count is reported correctly by fdisk fdisk -l /dev/zram0:

Disk /dev/zram0: 8 GiB, 8589934592 bytes, 2097152 sectors
Units: sectors of 1 * 4096 = 4096 bytes
Sector size (logical/physical): 4096 bytes / 4096 bytes
I/O size (minimum/optimal): 4096 bytes / 4096 bytes

Snippet of a device with block size of 4096 before the change ansible localhost -m setup -a filter='devices'

            "zram0": {
                "holders": [],
                "host": "",
                "links": {
                    "ids": [],
                    "labels": [],
                    "masters": [],
                    "uuids": []
                },
                "model": null,
                "partitions": {},
                "removable": "0",
                "rotational": "0",
                "sas_address": null,
                "sas_device_handle": null,
                "scheduler_mode": "",
                "sectors": "16777216",
                "sectorsize": "4096",
                "size": "8.00 GB",
                "support_discard": "4096",
                "vendor": null,
                "virtual": 1
            }

Device from ansible localhost -m setup -a filter='devices' after the change

            "zram0": {
                "holders": [],
                "host": "",
                "links": {
                    "ids": [],
                    "labels": [],
                    "masters": [],
                    "uuids": []
                },
                "model": null,
                "partitions": {},
                "removable": "0",
                "rotational": "0",
                "sas_address": null,
                "sas_device_handle": null,
                "scheduler_mode": "",
                "sectors": 2097152,
                "sectorsize": "4096",
                "size": "8.00 GB",
                "support_discard": "4096",
                "vendor": null,
                "virtual": 1
            }

Size is still correct and the sector count is now correct.

[ansibot]

@lukecdavidson this PR contains the following merge commits:

• 65f35e7

Please rebase your branch to remove these commits.

click here for bot help