Skip to content

Increase download and upload buffers. #2945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
coryan merged 1 commit into from
Aug 7, 2019
Merged

Increase download and upload buffers. #2945

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions google/cloud/storage/client_options.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,15 @@ std::size_t DefaultConnectionPoolSize() {
return 4 * nthreads;
}

// There is nothing special about the buffer sizes here. They are relatively
// small, because we do not want to consume too much memory from the
// application. They are larger than the typical socket buffer size (64KiB), to
// be able to read the full buffer into userspace if it happens to be full.
#ifndef GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_BUFFER_SIZE
#define GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_BUFFER_SIZE (128 * 1024)
// This magic number was obtained by experimentation summarized in #2657
#ifndef GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_UPLOAD_BUFFER_SIZE
#define GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_UPLOAD_BUFFER_SIZE (8 * 1024 * 1024)
#endif // GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_BUFFER_SIZE

// This magic number was obtained by experimentation summarized in #2657
#ifndef GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_DOWNLOAD_BUFFER_SIZE
#define GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_DOWNLOAD_BUFFER_SIZE \
(3 * 1024 * 1024 / 2)
#endif // GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_BUFFER_SIZE

// The documentation recommends uploads below "5MiB" to use simple uploads:
Expand Down Expand Up @@ -77,8 +80,9 @@ ClientOptions::ClientOptions(std::shared_ptr<oauth2::Credentials> credentials)
enable_http_tracing_(false),
enable_raw_client_tracing_(false),
connection_pool_size_(DefaultConnectionPoolSize()),
download_buffer_size_(GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_BUFFER_SIZE),
upload_buffer_size_(GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_BUFFER_SIZE),
download_buffer_size_(
GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_DOWNLOAD_BUFFER_SIZE),
upload_buffer_size_(GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_UPLOAD_BUFFER_SIZE),
maximum_simple_upload_size_(
GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_MAXIMUM_SIMPLE_UPLOAD_SIZE) {
auto emulator =
Expand Down Expand Up @@ -126,7 +130,8 @@ void ClientOptions::SetupFromEnvironment() {

ClientOptions& ClientOptions::SetDownloadBufferSize(std::size_t size) {
if (size == 0) {
download_buffer_size_ = GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_BUFFER_SIZE;
download_buffer_size_ =
GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_DOWNLOAD_BUFFER_SIZE;
} else {
download_buffer_size_ = size;
}
Expand All @@ -135,7 +140,7 @@ ClientOptions& ClientOptions::SetDownloadBufferSize(std::size_t size) {

ClientOptions& ClientOptions::SetUploadBufferSize(std::size_t size) {
if (size == 0) {
upload_buffer_size_ = GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_BUFFER_SIZE;
upload_buffer_size_ = GOOGLE_CLOUD_CPP_STORAGE_DEFAULT_UPLOAD_BUFFER_SIZE;
} else {
upload_buffer_size_ = size;
}
Expand Down