make sure there is no more data received

Author: TingDaoK

source/s3_meta_request.c

@@ -2016,7 +2016,7 @@ static void s_s3_meta_request_event_delivery_task(struct aws_task *task, void *a
 
             case AWS_S3_META_REQUEST_EVENT_RESPONSE_BODY: {
                 struct aws_s3_request *request = event.u.response_body.completed_request;
-                uint64_t bytes_delivered_for_request = event.u.response_body.bytes_delivered;
+                size_t bytes_delivered_for_request = event.u.response_body.bytes_delivered;
                 AWS_ASSERT(meta_request == request->meta_request);
                 bool delivery_incomplete = false;
                 struct aws_byte_cursor response_body = aws_byte_cursor_from_buf(&request->send_data.response_body);

tests/s3_data_plane_tests.c

@@ -1753,11 +1753,8 @@ static int s_apply_backpressure_until_meta_request_finish(
         size_t received_body_size_delta = aws_atomic_exchange_int(&test_results->received_body_size_delta, 0);
         accumulated_data_size += (uint64_t)received_body_size_delta;
 
-        /* Check that we haven't received more data than the window allows.
-         * TODO: Stop allowing "hacky wiggle room". The current implementation
-         *       may push more bytes to the user (up to 1 part) than they've asked for. */
-        uint64_t hacky_wiggle_room = part_size;
-        uint64_t max_data_allowed = accumulated_window_increments + hacky_wiggle_room;
+        /* Check that we haven't received more data than the window allows */
+        uint64_t max_data_allowed = accumulated_window_increments;
         ASSERT_TRUE(accumulated_data_size <= max_data_allowed, "Received more data than the read window allows");
 
         /* If we're done, we're done */
@@ -1891,7 +1888,7 @@ static int s_test_s3_get_object_backpressure_small_increments(struct aws_allocat
     size_t file_size = 1 * 1024 * 1024; /* Test downloads 1MB file */
     size_t part_size = file_size / 4;
     size_t window_initial_size = 1024;
-    uint64_t window_increment_size = part_size / 2;
+    uint64_t window_increment_size = part_size / 4;
     return s_test_s3_get_object_backpressure_helper(
         allocator, part_size, window_initial_size, window_increment_size, false);
 }