etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-5462: Hyperv agent confused by existing volume of different 

image type. Works by avoiding volume image format inference errors and
removing existing files with same name, but different format.
This commit is contained in:
Donal Lafferty 2013-12-12 21:31:14 +05:30 committed by Devdeep Singh
parent bdbc5f2ae3
commit ffd1a078d4
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
View File

@ -1232,13 +1232,19 @@ namespace HypervResource
}
}
// Already exists?
// Template already downloaded?
if (destFile != null && File.Exists(destFile) &&
!String.IsNullOrEmpty(destTemplateObjectTO.checksum))
{
// TODO: checksum fails us, because it is of the compressed image.
// ASK: should we store the compressed or uncompressed version or is the checksum not calculated correctly?
logger.Debug(CloudStackTypes.CopyCommand + " calling VerifyChecksum to see if we already have the file at " + destFile);
result = VerifyChecksum(destFile, destTemplateObjectTO.checksum);
if (!result)
{
result = true;
logger.Debug(CloudStackTypes.CopyCommand + " existing file has different checksum " + destFile);
}
}
// Do we have to create a new one?
@ -1320,25 +1326,30 @@ namespace HypervResource
// Create volume from a template?
else if (srcTemplateObjectTO != null && destVolumeObjectTO != null)
{
if (destVolumeObjectTO.format == null)
// VolumeObjectTO guesses file extension based on existing files
// this can be wrong if the previous file had a different file type
var guessedDestFile = destVolumeObjectTO.FullFileName;
if (File.Exists(guessedDestFile))
{
destVolumeObjectTO.format = srcTemplateObjectTO.format;
logger.Info("Deleting existing file " + guessedDestFile);
File.Delete(guessedDestFile);
}
destFile = destVolumeObjectTO.FullFileName;
string srcFile = srcTemplateObjectTO.FullFileName;
destVolumeObjectTO.format = srcTemplateObjectTO.format;
destFile = destVolumeObjectTO.FullFileName;
if (File.Exists(destFile))
{
logger.Info("Deleting existing file " + destFile);
File.Delete(destFile);
}
string srcFile = srcTemplateObjectTO.FullFileName;
if (!File.Exists(srcFile))
{
details = "Local template file missing from " + srcFile;
}
else
{
if (File.Exists(destFile))
{
logger.Info("Deleting existing file " + destFile);
File.Delete(destFile);
}
// TODO: thin provision instead of copying the full file.
File.Copy(srcFile, destFile);
newData = cmd.destTO;
@ -1377,7 +1388,7 @@ namespace HypervResource
{
return true;
}
return true;
return false;
}
/// <summary>