switch to checking req type

Author: DmitriyMusatkin

include/aws/s3/private/s3_request.h

@@ -22,7 +22,6 @@ enum aws_s3_request_flags {
     AWS_S3_REQUEST_FLAG_RECORD_RESPONSE_HEADERS = 0x00000001,
     AWS_S3_REQUEST_FLAG_ALWAYS_SEND = 0x00000002,
     AWS_S3_REQUEST_FLAG_ALLOCATE_BUFFER_FROM_POOL = 0x00000004,
-    AWS_S3_REQUEST_FLAG_RESPONSE_ALLOCATED_FROM_POOL = 0x00000008,
 };
 
 /**
@@ -258,9 +257,6 @@ struct aws_s3_request {
 
     /* When true, this request has already been uploaded. we still prepare the request to check the durability. */
     uint32_t was_previously_uploaded : 1;
-
-    /* When true, this request has buffer allocated to response */
-    uint32_t has_buffer_ticket_for_response : 1;
 };
 
 AWS_EXTERN_C_BEGIN

source/s3_auto_ranged_get.c

@@ -252,8 +252,7 @@ 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);
                         ++auto_ranged_get->synced_data.num_parts_requested;
 
                         break;
@@ -294,8 +293,7 @@ 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);
                         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;
@@ -346,7 +344,7 @@ static bool s_s3_auto_ranged_get_update(
                     AWS_S3_AUTO_RANGE_GET_REQUEST_TYPE_GET_OBJECT_WITH_RANGE,
                     AWS_S3_REQUEST_TYPE_GET_OBJECT,
                     auto_ranged_get->synced_data.num_parts_requested + 1 /*part_number*/,
-                    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_calculate_auto_ranged_get_part_range(
                     auto_ranged_get->synced_data.object_range_start,

source/s3_meta_request.c

@@ -1428,7 +1428,8 @@ 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) {
+        /* Make sure that request is get, since puts can also have ticket allocated, which is used for request body. */
+        if (request->request_type == AWS_S3_REQUEST_TYPE_GET_OBJECT && 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;
@@ -1851,7 +1852,7 @@ static struct aws_s3_request_metrics *s_s3_request_finish_up_and_release_metrics
     struct aws_s3_meta_request *meta_request) {
 
     if (metrics != NULL) {
-        /* Request is done streaming the body,  the metrics for the request now. */
+        /* Request is done streaming the body, complete the metrics for the request now. */
 
         if (metrics->time_metrics.end_timestamp_ns == -1) {
             aws_high_res_clock_get_ticks((uint64_t *)&metrics->time_metrics.end_timestamp_ns);
@@ -2397,7 +2398,7 @@ struct aws_s3_meta_request_poll_write_result aws_s3_meta_request_poll_write(
                         aws_s3_buffer_ticket_claim(meta_request->synced_data.async_write.buffered_data_ticket);
                 }
             } else {
-                AWS_LOGF_TRACE(
+                AWS_LOGF_ERROR(
                     AWS_LS_S3_META_REQUEST,
                     "id=%p: Illegal call to write(). Failed to acquire buffer memory.",
                     (void *)meta_request);
@@ -2424,7 +2425,7 @@ struct aws_s3_meta_request_poll_write_result aws_s3_meta_request_poll_write(
                 ready_to_send = true;
             }
 
-            AWS_LOGF_DEBUG(
+            AWS_LOGF_TRACE(
                 AWS_LS_S3_META_REQUEST,
                 "id=%p: write(data=%zu, eof=%d) processed=%zu remainder:%zu previously-buffered=%zu. %s"
                 "part...",