From f9c38c723af4d8cce77a1a348ac4b9ef512641d7 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Tue, 19 Mar 2019 09:42:18 -0400 Subject: [PATCH] rbd: optionally compute volume allocation from capacity Use the new refresh volume allocation pool override to skip computing the actual volume usage if disabled. Signed-off-by: Jason Dillaman Signed-off-by: Michal Privoznik --- src/storage/storage_backend_rbd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 4744b7bfd8..61ebb9b541 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -563,7 +563,9 @@ volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol, vol->type = VIR_STORAGE_VOL_NETWORK; vol->target.format = VIR_STORAGE_FILE_RAW; - if (volStorageBackendRBDUseFastDiff(features, flags)) { + if (def->refresh && + def->refresh->volume.allocation == VIR_STORAGE_VOL_DEF_REFRESH_ALLOCATION_DEFAULT && + volStorageBackendRBDUseFastDiff(features, flags)) { VIR_DEBUG("RBD image %s/%s has fast-diff feature enabled. " "Querying for actual allocation", def->source.name, vol->name);