test

Author: DmitriyMusatkin

source/s3_auto_ranged_get.c

@@ -252,8 +252,8 @@ static bool s_s3_auto_ranged_get_update(
                             AWS_S3_REQUEST_TYPE_GET_OBJECT,
                             1 /*part_number*/,
                             AWS_S3_REQUEST_FLAG_RECORD_RESPONSE_HEADERS |
-                            AWS_S3_REQUEST_FLAG_ALLOCATE_BUFFER_FROM_POOL | 
-                            AWS_S3_REQUEST_FLAG_RESPONSE_ALLOCATED_FROM_POOL);
+                                AWS_S3_REQUEST_FLAG_ALLOCATE_BUFFER_FROM_POOL |
+                                AWS_S3_REQUEST_FLAG_RESPONSE_ALLOCATED_FROM_POOL);
                         ++auto_ranged_get->synced_data.num_parts_requested;
 
                         break;
@@ -294,8 +294,8 @@ static bool s_s3_auto_ranged_get_update(
                             AWS_S3_REQUEST_TYPE_GET_OBJECT,
                             1 /*part_number*/,
                             AWS_S3_REQUEST_FLAG_RECORD_RESPONSE_HEADERS |
-                            AWS_S3_REQUEST_FLAG_ALLOCATE_BUFFER_FROM_POOL |
-                            AWS_S3_REQUEST_FLAG_RESPONSE_ALLOCATED_FROM_POOL);
+                                AWS_S3_REQUEST_FLAG_ALLOCATE_BUFFER_FROM_POOL |
+                                AWS_S3_REQUEST_FLAG_RESPONSE_ALLOCATED_FROM_POOL);
                         request->part_range_start = part_range_start;
                         request->part_range_end = part_range_start + first_part_size - 1; /* range-end is inclusive */
                         ++auto_ranged_get->synced_data.num_parts_requested;

source/s3_meta_request.c

@@ -1428,15 +1428,16 @@ static int s_s3_meta_request_incoming_body(
     }
 
     if (request->send_data.response_body.capacity == 0) {
-        if (/*request->has_buffer_ticket_for_response &&*/ request->ticket != NULL) {
+        if (request->has_buffer_ticket_for_response && request->ticket != NULL) {
             request->send_data.response_body = aws_s3_buffer_ticket_claim(request->ticket);
         } else {
             size_t buffer_size = s_dynamic_body_initial_buf_size;
             aws_byte_buf_init(&request->send_data.response_body, meta_request->allocator, buffer_size);
         }
     }
 
-    AWS_FATAL_ASSERT(request->send_data.response_body.len == 0);
+    /* Sanity checking that we somehow haven't reused the same buffer for both upload and download*/
+    AWS_FATAL_ASSERT(request->send_data.response_body.buffer != request->request_body.buffer);
 
     /* Note: not having part sized response body means the buffer is dynamic and
      * can grow. */
@@ -2370,8 +2371,8 @@ struct aws_s3_meta_request_poll_write_result aws_s3_meta_request_poll_write(
 
             struct aws_future_s3_buffer_ticket *buffered_ticket_future;
             /* NOTE: we acquire a forced-buffer because there's a risk of deadlock if we
-            * waited for a normal ticket reservation, respecting the pool's memory limit.
-            * (See "test_s3_many_async_uploads_without_data" for description of deadlock scenario) */
+             * waited for a normal ticket reservation, respecting the pool's memory limit.
+             * (See "test_s3_many_async_uploads_without_data" for description of deadlock scenario) */
 
             struct aws_s3_buffer_pool_reserve_meta meta = {
                 .size = meta_request->part_size,
@@ -2394,7 +2395,6 @@ struct aws_s3_meta_request_poll_write_result aws_s3_meta_request_poll_write(
 
                     meta_request->synced_data.async_write.buffered_data =
                         aws_s3_buffer_ticket_claim(meta_request->synced_data.async_write.buffered_data_ticket);
-                    
                 }
             } else {
                 AWS_LOGF_TRACE(
@@ -2404,7 +2404,7 @@ struct aws_s3_meta_request_poll_write_result aws_s3_meta_request_poll_write(
                 illegal_usage_terminate_meta_request = true;
                 aws_future_s3_buffer_ticket_release(buffered_ticket_future);
             }
-        }   
+        }
 
         if (!illegal_usage_terminate_meta_request) {
             /* Copy as much data as we can into the buffer */

tests/s3_mock_server_tests.c

@@ -466,10 +466,20 @@ TEST_CASE(multipart_upload_checksum_with_retry_mock_server) {
         .mock_server = true,
     };
 
-    ASSERT_SUCCESS(aws_s3_tester_send_meta_request_with_options(&tester, &put_options, NULL));
+    struct aws_s3_meta_request_test_results meta_request_test_results;
+    aws_s3_meta_request_test_results_init(&meta_request_test_results, allocator);
+
+    ASSERT_SUCCESS(aws_s3_tester_send_meta_request_with_options(&tester, &put_options, &meta_request_test_results));
+
+    ASSERT_INT_EQUALS(meta_request_test_results.upload_review.part_count, 2);
+    /* Note: the data we currently generate is always the same,
+     * so make sure that retry does not mangle the data by checking the checksum value */
+    ASSERT_STR_EQUALS("7/xUXw==", aws_string_c_str(meta_request_test_results.upload_review.part_checksums_array[0]));
+    ASSERT_STR_EQUALS("PCOjcw==", aws_string_c_str(meta_request_test_results.upload_review.part_checksums_array[1]));
 
     aws_s3_client_release(client);
     aws_s3_tester_clean_up(&tester);
+    aws_s3_meta_request_test_results_clean_up(&meta_request_test_results);
 
     return AWS_OP_SUCCESS;
 }