Fix retrying logic

Author: nvazquez

agent/src/com/cloud/agent/direct/download/DirectTemplateDownloaderImpl.java

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

core/src/org/apache/cloudstack/agent/directdownload/DirectDownloadAnswer.java

@@ -24,11 +24,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) {
@@ -45,4 +47,8 @@ public long getTemplateSize() {
     public String getInstallPath() {
         return installPath;
     }
+
+    public boolean isRetryOnOtherHosts() {
+        return retryOnOtherHosts;
+    }
 }

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

@@ -1617,43 +1617,34 @@ private DirectTemplateDownloader getDirectTemplateDownloaderFromCommand(DirectDo
     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;
 
         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();

server/src/org/apache/cloudstack/direct/download/DirectDownloadManagerImpl.java

@@ -252,10 +252,15 @@ private Answer sendDirectDownloadCommand(DirectDownloadCommand cmd, VMTemplateVO
         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 --;
         }