marcaurele commented on a change in pull request #2379: CLOUDSTACK-10146: Bypass Secondary Storage for KVM templates URL: https://github.com/apache/cloudstack/pull/2379#discussion_r159648592
########## File path: agent/src/com/cloud/agent/direct/download/HttpDirectTemplateDownloader.java ########## @@ -0,0 +1,158 @@ +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// +package com.cloud.agent.direct.download; + +import com.cloud.utils.exception.CloudRuntimeException; +import org.apache.commons.httpclient.Header; +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.HttpMethod; +import org.apache.commons.httpclient.HttpMethodRetryHandler; +import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager; +import org.apache.commons.httpclient.NoHttpResponseException; +import org.apache.commons.httpclient.methods.GetMethod; +import org.apache.commons.httpclient.params.HttpMethodParams; +import org.apache.log4j.Logger; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.RandomAccessFile; +import java.util.Map; + +public class HttpDirectTemplateDownloader extends DirectTemplateDownloaderImpl { + + private HttpClient client; + private static final MultiThreadedHttpConnectionManager s_httpClientManager = new MultiThreadedHttpConnectionManager(); + private static final int CHUNK_SIZE = 1024 * 1024; //1M + private final HttpMethodRetryHandler myretryhandler; + public static final Logger s_logger = Logger.getLogger(HttpDirectTemplateDownloader.class.getName()); + private GetMethod request; + private long remoteSize; + + public HttpDirectTemplateDownloader(String url, Long templateId, String destPoolPath, String checksum, Map<String, String> headers) { + super(url, destPoolPath, templateId, checksum); + client = new HttpClient(s_httpClientManager); + myretryhandler = createRetryTwiceHandler(); + request = createRequest(url, headers); + String downloadDir = getDirectDownloadTempPath(templateId); + createTemporaryDirectoryAndFile(downloadDir); + } + + private void createTemporaryDirectoryAndFile(String downloadDir) { + createFolder(getDestPoolPath() + File.separator + downloadDir); + File f = new File(getDestPoolPath() + File.separator + downloadDir + File.separator + getFileNameFromUrl()); + setDownloadedFilePath(f.getAbsolutePath()); + } + + private GetMethod createRequest(String downloadUrl, Map<String, String> headers) { + GetMethod request = new GetMethod(downloadUrl); + request.getParams().setParameter(HttpMethodParams.RETRY_HANDLER, myretryhandler); + request.setFollowRedirects(true); + for (String key : headers.keySet()) { + request.setRequestHeader(key, headers.get(key)); + } + return request; + } + + private long getRemoteSize(GetMethod request) { + Header contentLengthHeader = request.getResponseHeader("Content-Length"); + long reportedRemoteSize = 0; + if (contentLengthHeader == null) { + Header chunkedHeader = request.getResponseHeader("Transfer-Encoding"); + if (chunkedHeader == null || !"chunked".equalsIgnoreCase(chunkedHeader.getValue())) { + throw new CloudRuntimeException("Error template remote size"); + } + } else { + reportedRemoteSize = Long.parseLong(contentLengthHeader.getValue()); + } + return reportedRemoteSize; + } + + private HttpMethodRetryHandler createRetryTwiceHandler() { + return new HttpMethodRetryHandler() { + @Override + public boolean retryMethod(final HttpMethod method, final IOException exception, int executionCount) { + if (executionCount >= 2) { + // Do not retry if over max retry count + return false; + } + if (exception instanceof NoHttpResponseException) { + // Retry if the server dropped connection on us + return true; + } + if (!method.isRequestSent()) { + // Retry if the request has not been sent fully or + // if it's OK to retry methods that have been sent + return true; + } + // otherwise do not retry + return false; + } + }; + } + + @Override + public boolean downloadTemplate() { + InputStream in = null; + RandomAccessFile out = null; + try { + client.executeMethod(request); + remoteSize = getRemoteSize(request); Review comment: Since you're using this info in the `copyBytes` method, this is overkill. It can even throw an exception but having the filesize isn't mandatory to download it. This information, if present in the header, should be used as a *nice to have* but the download **must work** without this info as @wido pointed that some servers don't send this information in the header (https://github.com/apache/cloudstack/pull/1934#issuecomment-347784289). So it must be changed ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
