CLOUDSTACK-5691: Fix for attaching an uploaded volume to instance running

devdeep · devdeep · commit 741634b87e72 · 2014-01-03T16:43:21.000+05:30
on hyperv. There were multiple issues here. Upload volume was actually
failing because the post download check for vhd on the cifs share was
unsuccessful. Also the agent code wasn't parsing the volume path correctly.
Fixed it too.
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs
@@ -173,7 +173,12 @@ public string FullFileName
                     {
                         fileName += @"\" + this.path;
                     }
-                    fileName = Utils.NormalizePath(fileName + @"\" + this.name);
+
+                    fileName = Utils.NormalizePath(fileName);
+                    if (Directory.Exists(fileName))
+                    {
+                        fileName = Utils.NormalizePath(fileName + @"\" + this.name);
+                    }
                 }
                 else
                 {
@@ -182,7 +187,7 @@ public string FullFileName
                     throw new InvalidDataException(errMsg);
                 }
 
-                if (this.format != null)
+                if (!Path.HasExtension(fileName) && this.format != null)
                 {
                     fileName = fileName + "." + this.format.ToLowerInvariant();
                 }
diff --git a/scripts/storage/secondary/createvolume.sh b/scripts/storage/secondary/createvolume.sh
@@ -111,6 +111,14 @@ uncompress() {
   return 0
 }
 
+isCifs() {
+   #TO:DO incase of multiple zone where cifs and nfs exists,
+   #then check if the template file is from cifs using df -P filename
+   #Currently only cifs is supported in hyperv zone.
+   mount | grep "type cifs" > /dev/null
+   echo $?
+}
+
 create_from_file() {
   local tmpltfs=$1
   local tmpltimg=$2
@@ -196,12 +204,15 @@ rollback_if_needed $tmpltfs $? "tar archives not supported\n"
 
 if [ ${tmpltname%.vhd} != ${tmpltname} ]
 then
-  if  which  vhd-util &>/dev/null
-  then 
-    vhd-util check -n ${tmpltimg2} > /dev/null
-    rollback_if_needed $tmpltfs $? "vhd check of $tmpltimg2 failed\n"
-    vhd-util set -n ${tmpltimg2} -f "hidden" -v "0" > /dev/null
-    rollback_if_needed $tmpltfs $? "vhd remove $tmpltimg2 hidden failed\n"
+  if [ isCifs -ne 0 ] ;
+  then
+    if  which  vhd-util &>/dev/null
+    then 
+      vhd-util check -n ${tmpltimg2} > /dev/null
+      rollback_if_needed $tmpltfs $? "vhd check of $tmpltimg2 failed\n"
+      vhd-util set -n ${tmpltimg2} -f "hidden" -v "0" > /dev/null
+      rollback_if_needed $tmpltfs $? "vhd remove $tmpltimg2 hidden failed\n"
+    fi
   fi
 fi
 
diff --git a/server/src/com/cloud/api/ApiDBUtils.java b/server/src/com/cloud/api/ApiDBUtils.java
@@ -958,8 +958,19 @@ public static HypervisorType getVolumeHyperType(long volumeId) {
         return _volumeDao.getHypervisorType(volumeId);
     }
 
-    public static HypervisorType getHypervisorTypeFromFormat(ImageFormat format){
-        return _storageMgr.getHypervisorTypeFromFormat(format);
+    public static HypervisorType getHypervisorTypeFromFormat(long dcId, ImageFormat format){
+        HypervisorType type = _storageMgr.getHypervisorTypeFromFormat(format);
+        if (format == ImageFormat.VHD) {
+            // Xenserver and Hyperv both support vhd format. Additionally hyperv is only supported
+            // in a dc/zone if there aren't any other hypervisor types present in the zone). If the
+            // format type is VHD check is any xenserver clusters are present. If not, we assume it
+            // is a hyperv zone and update the type.
+            List<ClusterVO> xenClusters = _clusterDao.listByDcHyType(dcId, HypervisorType.XenServer.toString());
+            if (xenClusters.isEmpty()) {
+                type = HypervisorType.Hyperv;
+            }
+        }
+        return type;
     }
 
 
diff --git a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
@@ -115,7 +115,7 @@ public VolumeResponse newVolumeResponse(VolumeJoinVO volume) {
             volResponse.setCreated(volume.getCreatedOnStore());
 
             if (caller.getType() == Account.ACCOUNT_TYPE_ADMIN || caller.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN)
-                volResponse.setHypervisor(ApiDBUtils.getHypervisorTypeFromFormat(volume.getFormat()).toString());
+                volResponse.setHypervisor(ApiDBUtils.getHypervisorTypeFromFormat(volume.getDataCenterId(), volume.getFormat()).toString());
             if (volume.getDownloadState() != Status.DOWNLOADED) {
                 String volumeStatus = "Processing";
                 if (volume.getDownloadState() == VMTemplateHostVO.Status.DOWNLOAD_IN_PROGRESS) {
@@ -180,7 +180,7 @@ public VolumeResponse newVolumeResponse(VolumeJoinVO volume) {
                 if (volume.getHypervisorType() != null) {
                     volResponse.setHypervisor(volume.getHypervisorType().toString());
                 } else {
-                    volResponse.setHypervisor(ApiDBUtils.getHypervisorTypeFromFormat(volume.getFormat()).toString());
+                    volResponse.setHypervisor(ApiDBUtils.getHypervisorTypeFromFormat(volume.getDataCenterId(), volume.getFormat()).toString());
                 }
             }
             Long poolId = volume.getPoolId();

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,12 @@ public string FullFileName`
`173`	`173`	`{`
`174`	`174`	`fileName += @"\" + this.path;`
`175`	`175`	`}`
`176`		`- fileName = Utils.NormalizePath(fileName + @"\" + this.name);`
	`176`	`+`
	`177`	`+ fileName = Utils.NormalizePath(fileName);`
	`178`	`+ if (Directory.Exists(fileName))`
	`179`	`+ {`
	`180`	`+ fileName = Utils.NormalizePath(fileName + @"\" + this.name);`
	`181`	`+ }`
`177`	`182`	`}`
`178`	`183`	`else`
`179`	`184`	`{`
`@@ -182,7 +187,7 @@ public string FullFileName`
`182`	`187`	`throw new InvalidDataException(errMsg);`
`183`	`188`	`}`
`184`	`189`
`185`		`- if (this.format != null)`
	`190`	`+ if (!Path.HasExtension(fileName) && this.format != null)`
`186`	`191`	`{`
`187`	`192`	`fileName = fileName + "." + this.format.ToLowerInvariant();`
`188`	`193`	`}`