undo some of the changes

Author: Krish

source/s3_client.c

@@ -192,9 +192,10 @@ void aws_s3_set_dns_ttl(size_t ttl) {
 
 /**
  * Determine how many connections are ideal by dividing target-throughput by throughput-per-connection.
- * TODO: we have begun altering the calculation behind this. get_ideal_connection_number no longer provides
- * the basis for the number of connections we use for a particular meta request. It will soon be removed
- * as part of future work towards moving to a dynamic connection allocation implementation.
+ * We have begun altering the calculation behind this. get_ideal_connection_number no longer provides
+ * the basis for the number of connections we use for a particular meta request. However, we may use lesser
+ * number of connections that the ideal_connection_count incase of endpoints which may have higher connection
+ * throughput allowing us to use the memory and connection more efficiently.
  **/
 static uint32_t s_get_ideal_connection_number_from_throughput(double throughput_gps) {
     double ideal_connection_count_double = throughput_gps / s_throughput_per_connection_gbps;
@@ -206,7 +207,7 @@ static uint32_t s_get_ideal_connection_number_from_throughput(double throughput_
 
 /* Returns the max number of connections allowed.
  *
- * When meta request is NULL, this will return the overall allowed number of connections based on the clinet
+ * When meta request is NULL, this will return the overall allowed number of connections based on the client
  * configurations.
  *
  * If meta_request is not NULL, this will return the number of connections allowed based on the meta request
@@ -217,7 +218,7 @@ uint32_t aws_s3_client_get_max_active_connections(
     struct aws_s3_meta_request *meta_request) {
     AWS_PRECONDITION(client);
 
-    uint32_t max_active_connections = g_max_num_connections;
+    uint32_t max_active_connections = client->ideal_connection_count;
     if (client->max_active_connections_override > 0 &&
         client->max_active_connections_override < max_active_connections) {
         max_active_connections = client->max_active_connections_override;

tests/s3_data_plane_tests.c

@@ -315,6 +315,7 @@ static int s_test_s3_client_get_max_active_connections(struct aws_allocator *all
 
     struct aws_s3_client *mock_client = aws_s3_tester_mock_client_new(&tester);
     *((uint32_t *)&mock_client->max_active_connections_override) = 0;
+    *((uint32_t *)&mock_client->ideal_connection_count) = 100;
     mock_client->client_bootstrap = &mock_client_bootstrap;
     mock_client->vtable->get_host_address_count = s_test_get_max_active_connections_host_address_count;
 
@@ -329,10 +330,25 @@ static int s_test_s3_client_get_max_active_connections(struct aws_allocator *all
 
     s_test_max_active_connections_host_count = 2;
 
+    /* Behavior should not be affected by max_active_connections_override since it is 0, and should just be in relation
+     * to ideal-connection-count. */
+    {
+        ASSERT_TRUE(aws_s3_client_get_max_active_connections(mock_client, NULL) == mock_client->ideal_connection_count);
+
+        for (size_t i = 0; i < AWS_S3_META_REQUEST_TYPE_MAX; ++i) {
+            ASSERT_TRUE(
+                aws_s3_client_get_max_active_connections(mock_client, mock_meta_requests[i]) ==
+                mock_client->ideal_connection_count);
+        }
+    }
+
     /* Max active connections override should now cap the calculated amount of active connections. */
     {
         *((uint32_t *)&mock_client->max_active_connections_override) = 3;
 
+        /* Assert that override is low enough to have effect */
+        ASSERT_TRUE(mock_client->max_active_connections_override < mock_client->ideal_connection_count);
+
         ASSERT_TRUE(
             aws_s3_client_get_max_active_connections(mock_client, NULL) ==
             mock_client->max_active_connections_override);
@@ -346,6 +362,24 @@ static int s_test_s3_client_get_max_active_connections(struct aws_allocator *all
         }
     }
 
+    /* Max active connections override should be ignored since the calculated amount of max connections is less. */
+    {
+        *((uint32_t *)&mock_client->max_active_connections_override) = 100000;
+
+        /* Assert that override is NOT low enough to have effect */
+        ASSERT_TRUE(mock_client->max_active_connections_override > mock_client->ideal_connection_count);
+
+        ASSERT_TRUE(aws_s3_client_get_max_active_connections(mock_client, NULL) == mock_client->ideal_connection_count);
+
+        for (size_t i = 0; i < AWS_S3_META_REQUEST_TYPE_MAX; ++i) {
+            ASSERT_TRUE(mock_client->max_active_connections_override > mock_client->ideal_connection_count);
+
+            ASSERT_TRUE(
+                aws_s3_client_get_max_active_connections(mock_client, mock_meta_requests[i]) ==
+                mock_client->ideal_connection_count);
+        }
+    }
+
     for (size_t i = 0; i < AWS_S3_META_REQUEST_TYPE_MAX; ++i) {
         mock_meta_requests[i] = aws_s3_meta_request_release(mock_meta_requests[i]);
     }