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

Fix backport issue and retrying logic

This commit is contained in:
nvazquez 2018-02-28 11:37:09 -03:00
parent 12c1db7556
commit 5fb5890ea3
5 changed files with 42 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/src/com/cloud/agent/direct/download/DirectTemplateDownloaderImpl.java
View File

@ -195,9 +195,9 @@ public abstract class DirectTemplateDownloaderImpl implements DirectTemplateDown
boolean valid = false;
try {
while (!valid && retry > 0) {
retry--;
s_logger.info("Performing checksum validation for downloaded template " + templateId + ", retries left: " + retry);
valid = DigestHelper.check(checksum, new FileInputStream(downloadedFilePath));
retry--;
if (!valid && retry > 0) {
s_logger.info("Checksum validation failded, re-downloading template");
redownload = true;

8
core/src/org/apache/cloudstack/agent/directdownload/DirectDownloadAnswer.java
View File

@ -25,11 +25,13 @@ public class DirectDownloadAnswer extends Answer {
private Long templateSize;
private String installPath;
private boolean retryOnOtherHosts;
public DirectDownloadAnswer(final boolean result, final String msg) {
public DirectDownloadAnswer(final boolean result, final String msg, final boolean retry) {
super(null);
this.result = result;
this.details = msg;
this.retryOnOtherHosts = retry;
}
public DirectDownloadAnswer(final boolean result, final Long size, final String installPath) {
@ -46,4 +48,8 @@ public class DirectDownloadAnswer extends Answer {
public String getInstallPath() {
return installPath;
}
public boolean isRetryOnOtherHosts() {
return retryOnOtherHosts;
}
}

45
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
View File

@ -1322,7 +1322,7 @@ public class KVMStorageProcessor implements StorageProcessor {
public Answer handleDownloadTemplateToPrimaryStorage(DirectDownloadCommand cmd) {
final PrimaryDataStoreTO pool = cmd.getDestPool();
if (!pool.getPoolType().equals(StoragePoolType.NetworkFilesystem)) {
return new DirectDownloadAnswer(false, "Unsupported pool type " + pool.getPoolType().toString());
return new DirectDownloadAnswer(false, "Unsupported pool type " + pool.getPoolType().toString(), true);
}
KVMStoragePool destPool = storagePoolMgr.getStoragePool(pool.getPoolType(), pool.getUuid());
DirectTemplateDownloader downloader;
@ -1330,35 +1330,26 @@ public class KVMStorageProcessor implements StorageProcessor {
try {
downloader = getDirectTemplateDownloaderFromCommand(cmd, destPool);
} catch (IllegalArgumentException e) {
return new DirectDownloadAnswer(false, "Unable to create direct downloader: " + e.getMessage());
return new DirectDownloadAnswer(false, "Unable to create direct downloader: " + e.getMessage(), true);
}
int retries = 3;
boolean ok = false;
do {
try {
retries--;
s_logger.info("Trying to download template, retries left: " + retries);
if (!downloader.downloadTemplate()) {
s_logger.warn("Couldn't download template");
continue;
}
if (!downloader.validateChecksum()) {
s_logger.warn("Couldn't validate template checksum");
continue;
}
if (!downloader.extractAndInstallDownloadedTemplate()) {
s_logger.warn("Couldn't extract and install template");
continue;
}
ok = true;
} catch (CloudRuntimeException e) {
s_logger.warn("Error downloading template " + cmd.getTemplateId() + " due to: " + e.getMessage() + " retries left: " + retries);
try {
s_logger.info("Trying to download template");
if (!downloader.downloadTemplate()) {
s_logger.warn("Couldn't download template");
return new DirectDownloadAnswer(false, "Unable to download template", true);
}
} while (!ok && retries > 0);
if (!ok) {
return new DirectDownloadAnswer(false, "Unable to download template " + cmd.getTemplateId());
if (!downloader.validateChecksum()) {
s_logger.warn("Couldn't validate template checksum");
return new DirectDownloadAnswer(false, "Checksum validation failed", false);
}
if (!downloader.extractAndInstallDownloadedTemplate()) {
s_logger.warn("Couldn't extract and install template");
return new DirectDownloadAnswer(false, "Extraction and installation failed", false);
}
} catch (CloudRuntimeException e) {
s_logger.warn("Error downloading template " + cmd.getTemplateId() + " due to: " + e.getMessage());
return new DirectDownloadAnswer(false, "Unable to download template: " + e.getMessage(), true);
}
DirectTemplateInformation info = downloader.getTemplateInformation();

9
server/src/org/apache/cloudstack/direct/download/DirectDownloadManagerImpl.java
View File

@ -255,10 +255,15 @@ public class DirectDownloadManagerImpl extends ManagerBase implements DirectDown
int hostIndex = 0;
Answer answer = null;
Long hostToSendDownloadCmd = hostsToRetry[hostIndex];
while (!downloaded && retry > 0) {
boolean continueRetrying = true;
while (!downloaded && retry > 0 && continueRetrying) {
s_logger.debug("Sending Direct download command to host " + hostToSendDownloadCmd);
answer = agentManager.easySend(hostToSendDownloadCmd, cmd);
downloaded = answer != null && answer.getResult();
if (answer != null) {
DirectDownloadAnswer ans = (DirectDownloadAnswer)answer;
downloaded = answer.getResult();
continueRetrying = ans.isRetryOnOtherHosts();
}
hostToSendDownloadCmd = hostsToRetry[(hostIndex + 1) % hostsToRetry.length];
retry --;
}

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

@ -439,9 +439,16 @@ public class UriUtils {
HttpClient httpClient = getHttpClient();
GetMethod getMethod = new GetMethod(metalinkUrl);
List<String> urls = new ArrayList<>();
int status;
try {
if (httpClient.executeMethod(getMethod) == HttpStatus.SC_OK) {
InputStream is = getMethod.getResponseBodyAsStream();
status = httpClient.executeMethod(getMethod);
} catch (IOException e) {
s_logger.error("Error retrieving urls form metalink: " + metalinkUrl);
return null;
}
try {
InputStream is = getMethod.getResponseBodyAsStream();
if (status == HttpStatus.SC_OK) {
Map<String, List<String>> metalinkUrlsMap = getMultipleValuesFromXML(is, new String[] {"url"});
if (metalinkUrlsMap.containsKey("url")) {
List<String> metalinkUrls = metalinkUrlsMap.get("url");