Skip to content

[14.5-stable] zfs: report zvol provisioned size (volsize) in volume metrics - #6876

Merged
rene merged 1 commit into
lf-edge:14.5-stablefrom
milan-zededa:14.5-backport-6154-zvol-volsize
Oct 26, 2026
Merged

rene merged 1 commit into
lf-edge:14.5-stablefrom
milan-zededa:14.5-backport-6154-zvol-volsize

Conversation

@milan-zededa

Copy link
Copy Markdown
Contributor

Description

Backport of #6154 to 14.5-stable.

Clean cherry-pick with -x from d80e69ac2f, no conflicts. Only the pillar part (zfs.go) of the PR is backported; its evetest changes are part of the evetest backport (#6873).

Without this fix TestZVolProvisionedSizeReported fails: every ZFS zvol reports a provisioned size of 0.

PR dependencies

None.

How to test and validate this PR

Covered by the evetest test TestZVolProvisionedSizeReported (added to 14.5-stable by #6873):

EVETEST_EVE_VERSION=<14.5-stable build with this PR> make evetest NAME=TestZVolProvisionedSizeReported

Changelog notes

ZFS zvol-backed volumes now report their provisioned size (volsize) instead of 0.

Checklist

  • I've provided a proper description
  • I've added the proper documentation
  • I've tested my PR on amd64 device
  • I've tested my PR on arm64 device
  • I've written the test verification instructions
  • I've set the proper labels to this PR

For backport PRs (remove it if it's not a backport):

  • I've added a reference link to the original PR
  • PR's title follows the template

And the last but not least:

  • I've checked the boxes above, or I've provided a good reason why I didn't
    check them.

fillImgInfo() populated ImgInfo.ActualSize (from the zfs "usedbydataset"
property) but never set ImgInfo.VirtualSize. volumeHandlerZVol's
GetVolumeDetails() returns imgInfo.VirtualSize as the volume's max size,
so every ZFS zvol reported a provisioned size of 0: AppDiskMetric
ProvisionedBytes was 0, and volume resource MaxSizeBytes was 0, for all
zvol-backed volumes -- even though the zvol has a non-zero volsize
(e.g. `zfs get volsize` reports 5G while ProvisionedBytes was 0).

Read the "volsize" property and set VirtualSize from it. This is
best-effort: fillImgInfo also runs on every dataset via
GetAllZFSVolumeInfo (including filesystem datasets and the pool root,
which have no volsize), so a missing or non-numeric value leaves
VirtualSize at 0 rather than returning an error, to avoid dropping
non-volume datasets from the results.

Add an evetest regression test (TestZVolProvisionedSizeReported) on a
KVM + ZFS device. It declares a single standalone empty block-device
(VCOT_BLANK) volume -- no application, no image download, no data I/O,
since the provisioned size is fixed at zvol creation and independent of
usage -- then waits for volumemgr to create it and asserts the reported
provisioned size is the zvol volsize (~1 GiB), not 0, at all three
layers: ZInfoVolume.Resources.MaxSizeBytes, ZMetricVolume.TotalBytes,
and volumemgr's AppDiskMetric.ProvisionedBytes pubsub object. This also
adds the EdgeDeviceConfig.AddBlankVolume builder, since evetest
previously had no way to declare an empty block-device volume.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Andrew Durbin <andrewd@zededa.com>
(cherry picked from commit d80e69a)
@milan-zededa
milan-zededa force-pushed the 14.5-backport-6154-zvol-volsize branch from 41672dd to 2fd6ba3 Compare October 22, 2026 14:16
@rene
rene merged commit fe1706d into lf-edge:14.5-stable Oct 26, 2026
44 of 48 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants