more comments

Author: DmitriyMusatkin

include/aws/s3/s3_buffer_pool.h

@@ -49,7 +49,11 @@ struct aws_s3_buffer_pool_reserve_meta {
     /* size of the buffer to reserve. */
     size_t size;
 
-    /* whether not granting the reservation can block. */
+    /* whether not granting reservation can result in request pipeline being blocked.
+     * Note: blocking is currently a terminal condition and that cannot be recovered from,
+     * i.e. meta request will be stuck and not make any process.
+     * As such buffer pool should either grant or error out reservation in sync.
+     * This scenario currently only occurs in the async_write flows. */
     bool can_block;
 };
 

source/s3_auto_ranged_put.c

@@ -560,9 +560,6 @@ static bool s_s3_auto_ranged_put_update(
             }
 
             if (should_create_next_part_request) {
-
-                AWS_LOGF_DEBUG(0, "Creating next part");
-
                 struct aws_s3_buffer_ticket *ticket = NULL;
                 if (meta_request->synced_data.async_write.ready_to_send) {
                     /* Async-write already has a ticket, take ownership */

source/s3_client.c

@@ -360,7 +360,11 @@ struct aws_s3_client *aws_s3_client_new(
     }
 
     struct aws_s3_buffer_pool_config buffer_pool_config = {
-        .client = client, .part_size = part_size, .memory_limit = mem_limit, .max_part_size = max_part_size};
+        .client = client,
+        .part_size = part_size,
+        .memory_limit = mem_limit,
+        .max_part_size = max_part_size,
+    };
 
     if (client_config->buffer_pool_factory_fn) {
         client->buffer_pool = client_config->buffer_pool_factory_fn(allocator, buffer_pool_config);
@@ -1808,8 +1812,6 @@ static void s_s3_prepare_acquire_mem_callback_and_destroy(
     struct aws_s3_meta_request *meta_request = payload->request->meta_request;
     AWS_PRECONDITION(meta_request);
 
-    ++payload->request->num_times_prepared;
-
     if (error_code) {
         AWS_LOGF_ERROR(
             AWS_LS_S3_META_REQUEST,

tests/s3_data_plane_tests.c

@@ -5,6 +5,7 @@
 
 #include "aws/s3/private/s3_checksums.h"
 #include "aws/s3/private/s3_client_impl.h"
+#include "aws/s3/private/s3_default_buffer_pool.h"
 #include "aws/s3/private/s3_meta_request_impl.h"
 #include "aws/s3/private/s3_util.h"
 #include "aws/s3/s3_client.h"
@@ -2323,17 +2324,17 @@ static int s_test_s3_put_object_buffer_pool_trim(struct aws_allocator *allocator
 
     ASSERT_SUCCESS(aws_s3_tester_send_meta_request_with_options(&tester, &put_options, NULL));
 
-    /** TODO: */
-    /*struct aws_s3_buffer_pool_usage_stats usage_before = aws_s3_buffer_pool_get_usage(client->buffer_pool);
+    struct aws_s3_default_buffer_pool_usage_stats usage_before =
+        aws_s3_default_buffer_pool_get_usage((struct aws_s3_default_buffer_pool *)client->buffer_pool->impl);
 
     ASSERT_TRUE(0 != usage_before.primary_num_blocks);
 
     aws_thread_current_sleep(aws_timestamp_convert(6, AWS_TIMESTAMP_SECS, AWS_TIMESTAMP_NANOS, NULL));
 
-    struct aws_s3_buffer_pool_usage_stats usage_after = aws_s3_buffer_pool_get_usage(client->buffer_pool);
+    struct aws_s3_default_buffer_pool_usage_stats usage_after =
+        aws_s3_default_buffer_pool_get_usage(client->buffer_pool);
 
     ASSERT_INT_EQUALS(0, usage_after.primary_num_blocks);
-    */
 
     client = aws_s3_client_release(client);