nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-04-15 13:47:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix S3 not interruptting

Browse Source
This commit is contained in:
Tristan Ross 2025-03-13 21:51:41 -07:00
parent e9af7a0749
commit bb6c7d4169
No known key found for this signature in database
GPG Key ID: B09C422035669AF8
1 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/libstore/s3-binary-cache-store.cc
View File

@ -17,8 +17,12 @@
#include <aws/core/auth/AWSCredentialsProviderChain.h>
#include <aws/core/client/ClientConfiguration.h>
#include <aws/core/client/DefaultRetryStrategy.h>
#include <aws/core/http/standard/StandardHttpResponse.h>
#include <aws/core/http/standard/StandardHttpRequest.h>
#include <aws/core/http/HttpClient.h>
#include <aws/core/utils/logging/FormattedLogSystem.h>
#include <aws/core/utils/logging/LogMacros.h>
#include <aws/core/utils/ratelimiter/RateLimiterInterface.h>
#include <aws/core/utils/threading/Executor.h>
#include <aws/s3/S3Client.h>
#include <aws/s3/model/GetObjectRequest.h>
@ -56,6 +60,49 @@ R && checkAws(std::string_view s, Aws::Utils::Outcome<R, E> && outcome)
return outcome.GetResultWithOwnership();
}
class AwsHttpClient : public Aws::Http::HttpClient
{
public:
AwsHttpClient(const Aws::Client::ClientConfiguration& clientConfig) : HttpClient() {}
std::shared_ptr<Aws::Http::HttpResponse> MakeRequest(const std::shared_ptr<Aws::Http::HttpRequest>& request,
Aws::Utils::RateLimits::RateLimiterInterface* readLimiter = nullptr,
Aws::Utils::RateLimits::RateLimiterInterface* writeLimiter = nullptr) const override {
Aws::Http::URI uri = request->GetUri();
Aws::String url = uri.GetURIString();
debug("Making request %s", url);
std::shared_ptr<Aws::Http::Standard::StandardHttpResponse> response = std::make_shared<Aws::Http::Standard::StandardHttpResponse>(request);
if (writeLimiter != nullptr) {
writeLimiter->ApplyAndPayForCost(request->GetSize());
}
FileTransferRequest ftr = FileTransferRequest(url);
getFileTransfer()->download(ftr);
return response;
}
};
class AwsHttpClientFactory : public Aws::Http::HttpClientFactory
{
public:
std::shared_ptr<Aws::Http::HttpClient> CreateHttpClient(const Aws::Client::ClientConfiguration& clientConfiguration) const override {
return std::make_shared<AwsHttpClient>(clientConfiguration);
}
std::shared_ptr<Aws::Http::HttpRequest> CreateHttpRequest(const Aws::String& uri, Aws::Http::HttpMethod method, const Aws::IOStreamFactory& streamFactory) const override {
return CreateHttpRequest(Aws::Http::URI(uri), method, streamFactory);
}
std::shared_ptr<Aws::Http::HttpRequest> CreateHttpRequest(const Aws::Http::URI& uri, Aws::Http::HttpMethod method, const Aws::IOStreamFactory& streamFactory) const override {
auto request = std::make_shared<Aws::Http::Standard::StandardHttpRequest>(uri, method);
request->SetResponseStreamFactory(streamFactory);
return request;
}
};
class AwsLogger : public Aws::Utils::Logging::FormattedLogSystem
{
using Aws::Utils::Logging::FormattedLogSystem::FormattedLogSystem;
@ -80,6 +127,10 @@ static void initAWS()
shared.cc), so don't let aws-sdk-cpp override it. */
options.cryptoOptions.initAndCleanupOpenSSL = false;
options.httpOptions.httpClientFactory_create_fn = []() {
return std::make_shared<AwsHttpClientFactory>();
};
if (verbosity >= lvlDebug) {
options.loggingOptions.logLevel =
verbosity == lvlDebug