You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2019/03/29 09:25:13 UTC

[cloudstack] branch master updated: fix incorrect iscsi path stat for managed storage (#3181)

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/master by this push:
     new beb0422  fix incorrect iscsi path stat for managed storage (#3181)
beb0422 is described below

commit beb0422dd54bb288b12b07c9f7d9689df38fb599
Author: skattoju3 <45...@users.noreply.github.com>
AuthorDate: Fri Mar 29 05:25:01 2019 -0400

    fix incorrect iscsi path stat for managed storage (#3181)
    
    ## Description
    The issue was that an Incorrect iscsi path was being passed for managed storage pools when collecting volume stats. Storage pools normally have a UUID based path while managed storage pools require an IQN based path
---
 server/src/main/java/com/cloud/server/StatsCollector.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/src/main/java/com/cloud/server/StatsCollector.java b/server/src/main/java/com/cloud/server/StatsCollector.java
index 8e2bc7e..80b745e 100644
--- a/server/src/main/java/com/cloud/server/StatsCollector.java
+++ b/server/src/main/java/com/cloud/server/StatsCollector.java
@@ -928,7 +928,11 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc
                     List<String> volumeLocators = new ArrayList<String>();
                     for (VolumeVO volume : volumes) {
                         if (volume.getFormat() == ImageFormat.QCOW2) {
-                            volumeLocators.add(volume.getUuid());
+                            if (pool.isManaged()) {
+                                volumeLocators.add(volume.getPath());
+                            } else {
+                                volumeLocators.add(volume.getUuid());
+                            }
                         } else if (volume.getFormat() == ImageFormat.VHD) {
                             volumeLocators.add(volume.getPath());
                         } else if (volume.getFormat() == ImageFormat.OVA) {