Update default S3 CRT client config

Author: SergeyRyabinin

generated/src/aws-cpp-sdk-s3-crt/include/aws/s3-crt/S3CrtClientConfiguration.h

@@ -90,24 +90,29 @@ namespace Aws
             std::shared_ptr<Aws::Crt::Io::ClientBootstrap> clientBootstrap;
 
             /** Size of parts the files will be downloaded or uploaded in. Useful for Put/GetObject APIs
-             *  defaults to 5MB, if user set it to be less than 5MB, SDK will set it to 5MB.
+             *  defaults to 8MB, if user set it to be less than 5MB, CRT will set it to 5MB.
              */
-            size_t partSize = 5 * 1024 * 1024;
+            size_t partSize = 8 * 1024 * 1024;
 
             /** TLS Options to be used for each connection.
              *  If scheme is Https and tlsConnectionOptions is null, SDK will create a default one for you.
              */
             std::shared_ptr<Aws::Crt::Io::TlsConnectionOptions> tlsConnectionOptions;
 
             /* Throughput target in Gbps that we are trying to reach. Normally it's the NIC's throughput */
-            double throughputTargetGbps = 2.0;
+            double throughputTargetGbps = 10.0;
 
             /** Control the maximum memory used by downloads.
              *  When set to a value > 0, the SDK uses flow control to bring the memory usage very close
              *  to the specified window. Without this cap, memory usage grows proportional to file size.
              */
             size_t downloadMemoryUsageWindow = 0;
 
+            /**
+             * How much memory S3 CRT implementation will use. This will be capped to SIZE_MAX (max platform value of size_t)
+             */
+            uint64_t memoryLimitBytes = 0;
+
             /* Callback and associated user data for when the client has completed its shutdown process. */
             std::function<void(void*)> clientShutdownCallback;
             void *shutdownCallbackUserData = nullptr;

generated/src/aws-cpp-sdk-s3-crt/source/S3CrtClient.cpp

@@ -318,6 +318,9 @@ void S3CrtClient::init(const S3Crt::ClientConfiguration& config,
   s3CrtConfig.enable_read_backpressure = (config.downloadMemoryUsageWindow > 0);
   s3CrtConfig.initial_read_window = config.downloadMemoryUsageWindow;
 
+  // Memory usage config:
+  s3CrtConfig.memory_limit_in_bytes = config.memoryLimitBytes;
+
   aws_s3_tcp_keep_alive_options tcp_keep_alive_options;
   if (config.enableTcpKeepAlive) {
     uint16_t configKeepAliveS = static_cast<uint16_t>(std::min(static_cast<unsigned long>(std::numeric_limits<uint16_t>::max()), config.tcpKeepAliveIntervalMs / 1000ul));
@@ -376,7 +379,7 @@ void S3CrtClient::init(const S3Crt::ClientConfiguration& config,
   m_s3CrtSigningConfig.flags.use_double_uri_encode = false;
   s3CrtConfig.signing_config = &m_s3CrtSigningConfig;
 
-  static const size_t DEFAULT_PART_SIZE = 5 * 1024 * 1024; // 5MB
+  static const size_t DEFAULT_PART_SIZE = 8 * 1024 * 1024; // 8MB
   s3CrtConfig.part_size = config.partSize < DEFAULT_PART_SIZE ? DEFAULT_PART_SIZE : config.partSize;
 
   Aws::Crt::Io::TlsConnectionOptions *rawPTlsConnectionOptions = nullptr;

tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/s3-crt/S3CrtClientConfigHeader.vm

@@ -23,24 +23,29 @@
             std::shared_ptr<Aws::Crt::Io::ClientBootstrap> clientBootstrap;
 
             /** Size of parts the files will be downloaded or uploaded in. Useful for Put/GetObject APIs
-             *  defaults to 5MB, if user set it to be less than 5MB, SDK will set it to 5MB.
+             *  defaults to 8MB, if user set it to be less than 5MB, CRT will set it to 5MB.
              */
-            size_t partSize = 5 * 1024 * 1024;
+            size_t partSize = 8 * 1024 * 1024;
 
             /** TLS Options to be used for each connection.
              *  If scheme is Https and tlsConnectionOptions is null, SDK will create a default one for you.
              */
             std::shared_ptr<Aws::Crt::Io::TlsConnectionOptions> tlsConnectionOptions;
 
             /* Throughput target in Gbps that we are trying to reach. Normally it's the NIC's throughput */
-            double throughputTargetGbps = 2.0;
+            double throughputTargetGbps = 10.0;
 
             /** Control the maximum memory used by downloads.
              *  When set to a value > 0, the SDK uses flow control to bring the memory usage very close
              *  to the specified window. Without this cap, memory usage grows proportional to file size.
              */
             size_t downloadMemoryUsageWindow = 0;
 
+            /**
+             * How much memory S3 CRT implementation will use. This will be capped to SIZE_MAX (max platform value of size_t)
+             */
+            uint64_t memoryLimitBytes = 0;
+
             /* Callback and associated user data for when the client has completed its shutdown process. */
             std::function<void(void*)> clientShutdownCallback;
             void *shutdownCallbackUserData = nullptr;

tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/s3-crt/S3CrtServiceClientSourceInit.vm

@@ -345,6 +345,9 @@ void ${className}::init(const ${clientConfigurationNamespace}::ClientConfigurati
   s3CrtConfig.enable_read_backpressure = (config.downloadMemoryUsageWindow > 0);
   s3CrtConfig.initial_read_window = config.downloadMemoryUsageWindow;
 
+  // Memory usage config:
+  s3CrtConfig.memory_limit_in_bytes = config.memoryLimitBytes;
+
   aws_s3_tcp_keep_alive_options tcp_keep_alive_options;
   if (config.enableTcpKeepAlive) {
     uint16_t configKeepAliveS = static_cast<uint16_t>(std::min(static_cast<unsigned long>(std::numeric_limits<uint16_t>::max()), config.tcpKeepAliveIntervalMs / 1000ul));
@@ -403,7 +406,7 @@ void ${className}::init(const ${clientConfigurationNamespace}::ClientConfigurati
   m_s3CrtSigningConfig.flags.use_double_uri_encode = false;
   s3CrtConfig.signing_config = &m_s3CrtSigningConfig;
 
-  static const size_t DEFAULT_PART_SIZE = 5 * 1024 * 1024; // 5MB
+  static const size_t DEFAULT_PART_SIZE = 8 * 1024 * 1024; // 8MB
   s3CrtConfig.part_size = config.partSize < DEFAULT_PART_SIZE ? DEFAULT_PART_SIZE : config.partSize;
 
   Aws::Crt::Io::TlsConnectionOptions *rawPTlsConnectionOptions = nullptr;