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

Fix for metalink support on SSVM agents

This commit is contained in:
nvazquez 2018-01-18 01:40:45 -03:00
parent 6c60a0fb59
commit e9f2d982b6
2 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
core/src/com/cloud/storage/template/MetalinkTemplateDownloader.java
View File

@ -35,22 +35,41 @@ public class MetalinkTemplateDownloader extends TemplateDownloaderBase implement
super(storageLayer, downloadUrl, toDir, maxTemplateSize, callback);
String[] parts = _downloadUrl.split("/");
String filename = parts[parts.length - 1];
_callback = callback;
_toFile = toDir + File.separator + filename;
}
@Override
public long download(boolean resume, DownloadCompleteCallback callback) {
if (!status.equals(Status.NOT_STARTED)) {
// Only start downloading if we haven't started yet.
LOGGER.debug("Template download is already started, not starting again. Template: " + _downloadUrl);
if (_status == Status.ABORTED || _status == Status.UNRECOVERABLE_ERROR || _status == Status.DOWNLOAD_FINISHED) {
return 0;
}
LOGGER.info("Starting metalink download from: " + _downloadUrl);
_start = System.currentTimeMillis();
status = Status.IN_PROGRESS;
Script.runSimpleBashScript("aria2c " + _downloadUrl + " -d " + _toDir);
String metalinkFile = _toFile;
Script.runSimpleBashScript("rm -f " + metalinkFile);
String templateFileName = Script.runSimpleBashScript("ls " + _toDir);
String downloadedFile = _toDir + File.separator + templateFileName;
_toFile = _toDir + File.separator + "tmpdownld_";
Script.runSimpleBashScript("mv " + downloadedFile + " " + _toFile);
File file = new File(_toFile);
if (!file.exists()) {
_status = Status.UNRECOVERABLE_ERROR;
LOGGER.error("Error downloading template from: " + _downloadUrl);
return 0;
}
_totalBytes = file.length();
status = Status.DOWNLOAD_FINISHED;
String sizeResult = Script.runSimpleBashScript("ls -als " + _toFile + " | awk '{print $1}'");
long size = Long.parseLong(sizeResult);
return size;
_downloadTime = System.currentTimeMillis() - _start;
if (_callback != null) {
_callback.downloadComplete(status);
}
return _totalBytes;
}
@Override
@ -64,4 +83,13 @@ public class MetalinkTemplateDownloader extends TemplateDownloaderBase implement
}
}
@Override
public Status getStatus() {
return status;
}
@Override
public void setStatus(Status status) {
this.status = status;
}
}

6
utils/src/com/cloud/utils/UriUtils.java
View File

@ -436,7 +436,8 @@ public class UriUtils {
&& (!uripath.toLowerCase().endsWith("ova")
&& !uripath.toLowerCase().endsWith("ova.zip")
&& !uripath.toLowerCase().endsWith("ova.bz2")
&& !uripath.toLowerCase().endsWith("ova.gz")))
&& !uripath.toLowerCase().endsWith("ova.gz")
&& !uripath.toLowerCase().endsWith("metalink")))
|| (format.equalsIgnoreCase("tar")
&& (!uripath.toLowerCase().endsWith("tar")
&& !uripath.toLowerCase().endsWith("tar.zip")
@ -460,7 +461,8 @@ public class UriUtils {
&& (!uripath.toLowerCase().endsWith("iso")
&& !uripath.toLowerCase().endsWith("iso.zip")
&& !uripath.toLowerCase().endsWith("iso.bz2")
&& !uripath.toLowerCase().endsWith("iso.gz")))) {
&& !uripath.toLowerCase().endsWith("iso.gz"))
&& !uripath.toLowerCase().endsWith("metalink"))) {
throw new IllegalArgumentException("Please specify a valid URL. URL:" + uripath + " is an invalid for the format " + format.toLowerCase());
}