lix-project/lix
20
57
Fork 31
Code Issues 347 Code Review (Gerrit) Projects 3 Releases Wiki Activity

libstore: make acceptRanges a function

Browse source 
we don't need to keep this as state. it's only used for retries anyway.

Change-Id: I807f161a516a226567972757ec07ff91b3cf0899
This commit is contained in:
eldritch horrors 2024-11-09 01:17:28 +01:00
parent 90536e27e1
commit 40cf413a48
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/libstore/filetransfer.cc
View file

@ -79,8 +79,6 @@ struct curlFileTransfer : public FileTransfer
struct curl_slist * requestHeaders = 0; struct curl_slist * requestHeaders = 0;
bool acceptRanges = false;
curl_off_t writtenToSink = 0; curl_off_t writtenToSink = 0;
inline static const std::set<long> successfulStatuses {200, 201, 204, 206, 304, 0 /* other protocol */}; inline static const std::set<long> successfulStatuses {200, 201, 204, 206, 304, 0 /* other protocol */};
@ -143,6 +141,18 @@ struct curlFileTransfer : public FileTransfer
} }
} }
bool acceptsRanges()
{
curl_header * h;
if (curl_easy_header(req, "accept-ranges", 0, CURLH_HEADER, -1, &h)) {
// treat any error as the remote not accepting range requests. the only
// interesting local error is out-of-memory, which we can't even handle
return false;
}
return toLower(trim(h->value)) == "bytes";
}
void failEx(std::exception_ptr ex) void failEx(std::exception_ptr ex)
{ {
assert(phase != transferComplete); assert(phase != transferComplete);
@ -232,7 +242,6 @@ struct curlFileTransfer : public FileTransfer
downloadData.clear(); downloadData.clear();
bodySize = 0; bodySize = 0;
statusMsg = trim(match.str(1)); statusMsg = trim(match.str(1));
acceptRanges = false;
} else { } else {
auto i = line.find(':'); auto i = line.find(':');
if (i != std::string::npos) { if (i != std::string::npos) {
@ -248,9 +257,6 @@ struct curlFileTransfer : public FileTransfer
result.etag = std::move(etag); result.etag = std::move(etag);
} }
else if (name == "accept-ranges" && toLower(trim(line.substr(i + 1))) == "bytes")
acceptRanges = true;
else if (name == "link" || name == "x-amz-meta-link") { else if (name == "link" || name == "x-amz-meta-link") {
auto value = trim(line.substr(i + 1)); auto value = trim(line.substr(i + 1));
static std::regex linkRegex("<([^>]*)>; rel=\"immutable\"", std::regex::extended | std::regex::icase); static std::regex linkRegex("<([^>]*)>; rel=\"immutable\"", std::regex::extended | std::regex::icase);
@ -490,7 +496,7 @@ struct curlFileTransfer : public FileTransfer
&& attempt < tries && attempt < tries
&& (!this->dataCallback && (!this->dataCallback
|| writtenToSink == 0 || writtenToSink == 0
|| acceptRanges)) || acceptsRanges()))
{ {
int ms = fileTransfer.baseRetryTimeMs * std::pow(2.0f, attempt - 1 + std::uniform_real_distribution<>(0.0, 0.5)(fileTransfer.mt19937)); int ms = fileTransfer.baseRetryTimeMs * std::pow(2.0f, attempt - 1 + std::uniform_real_distribution<>(0.0, 0.5)(fileTransfer.mt19937));
if (writtenToSink) if (writtenToSink)