From f81d915431f835ddd271651c23ead86fd8a537b7 Mon Sep 17 00:00:00 2001 From: Nate Gordon Date: Tue, 14 Sep 2021 10:36:34 -0500 Subject: [PATCH 1/2] Applying PR #3884 from 4.13: https://github.com/apache/cloudstack/pull/3884/files --- server/src/com/cloud/server/StatsCollector.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/server/src/com/cloud/server/StatsCollector.java b/server/src/com/cloud/server/StatsCollector.java index b66fa5f0600d..87f1205a9a3c 100644 --- a/server/src/com/cloud/server/StatsCollector.java +++ b/server/src/com/cloud/server/StatsCollector.java @@ -906,10 +906,7 @@ protected void runInContext() { List volumes = _volsDao.findByPoolId(pool.getId(), null); List volumeLocators = new ArrayList(); for (VolumeVO volume: volumes){ - if (volume.getFormat() == ImageFormat.QCOW2) { - volumeLocators.add(volume.getUuid()); - } - else if (volume.getFormat() == ImageFormat.VHD){ + if (volume.getFormat() == ImageFormat.QCOW2 || volume.getFormat() == ImageFormat.VHD) { volumeLocators.add(volume.getPath()); } else if (volume.getFormat() == ImageFormat.OVA){ From d7fa092aca255a5cbb0cd1ad663f65fe4fc04259 Mon Sep 17 00:00:00 2001 From: Nate Gordon Date: Tue, 14 Sep 2021 10:36:34 -0500 Subject: [PATCH 2/2] Applying PR #3884 from 4.13: https://github.com/apache/cloudstack/pull/3884/files --- server/src/com/cloud/server/StatsCollector.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/server/src/com/cloud/server/StatsCollector.java b/server/src/com/cloud/server/StatsCollector.java index b66fa5f0600d..87f1205a9a3c 100644 --- a/server/src/com/cloud/server/StatsCollector.java +++ b/server/src/com/cloud/server/StatsCollector.java @@ -906,10 +906,7 @@ protected void runInContext() { List volumes = _volsDao.findByPoolId(pool.getId(), null); List volumeLocators = new ArrayList(); for (VolumeVO volume: volumes){ - if (volume.getFormat() == ImageFormat.QCOW2) { - volumeLocators.add(volume.getUuid()); - } - else if (volume.getFormat() == ImageFormat.VHD){ + if (volume.getFormat() == ImageFormat.QCOW2 || volume.getFormat() == ImageFormat.VHD) { volumeLocators.add(volume.getPath()); } else if (volume.getFormat() == ImageFormat.OVA){