Fix race condition by setting download status early in S3 and Swift post-download handling

Author: Damans227

core/src/main/java/com/cloud/storage/template/S3TemplateDownloader.java

@@ -215,6 +215,8 @@ public void progressChanged(ProgressEvent progressEvent) {
         try {
             // Wait for the upload to complete.
             upload.waitForCompletion();
+            // Set status directly to avoid race condition.
+            status = Status.DOWNLOAD_FINISHED;
         } catch (InterruptedException e) {
             errorString = "Interruption occurred while waiting for upload of " + downloadUrl + " to complete";
             logger.warn(errorString);

services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/DownloadManagerImpl.java

@@ -316,6 +316,8 @@ public void setDownloadStatus(String jobId, Status status) {
                 // For S3 and Swift, which are considered "remote",
                 // as in the file cannot be accessed locally,
                 // we run the postRemoteDownload() method.
+                // Set early so status polls see DOWNLOADED; overridden on error below
+                td.setStatus(Status.POST_DOWNLOAD_FINISHED);
                 td.setDownloadError("Download success, starting install ");
                 String result = postRemoteDownload(jobId);
                 if (result != null) {
@@ -324,7 +326,6 @@ public void setDownloadStatus(String jobId, Status status) {
                     td.setDownloadError("Failed post download install: " + result);
                     ((S3TemplateDownloader) td).cleanupAfterError();
                 } else {
-                    td.setStatus(Status.POST_DOWNLOAD_FINISHED);
                     td.setDownloadError("Install completed successfully at " + new SimpleDateFormat().format(new Date()));
                 }
             } else {