Merge branch 'develop' into md5_sum_file_chunks

CHANGELOG.rst

@@ -6,6 +6,7 @@ Brewtils Changelog
 TBD
 
 - Apply MD5 Check Sum of chunked files to ensure files are loaded into memory properly
+- Updated Plugin `max_concurrent` to support -1 to utilize the default formula that `concurrent.futures.ThreadPoolExecutor` supports `min(32, os.cpu_count() + 4)`
 - Updated SystemClient to utilize the local Garden name for default Namespace if none can be determined
 
 3.27.2

brewtils/config.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import json
 import logging
+import os
 from argparse import ArgumentParser
 
 from yapconf import YapconfSpec
@@ -155,6 +156,9 @@ def load_config(
     if "bg_url_prefix" in config:
         config.bg_url_prefix = normalize_url_prefix(config.bg_url_prefix)
 
+    if "max_concurrent" not in config or config.max_concurrent < 0:
+        config.max_concurrent = min(32, os.cpu_count() + 4)
+
     return config
 
 

brewtils/specification.py

@@ -209,8 +209,11 @@ def _is_json_dict(s):
     },
     "max_concurrent": {
         "type": "int",
-        "description": "Maximum number of requests to process concurrently",
-        "default": 5,
+        "description": (
+            "Maximum number of requests to process concurrently,"
+            " -1 will default max concurrent to min(32, os.cpu_count() + 4)"
+        ),
+        "default": -1,
     },
     "worker_shutdown_timeout": {
         "type": "int",

test/config_test.py

@@ -38,6 +38,25 @@ def params():
     }
 
 
+class TestMaxConcurrent(object):
+
+    def test_negative_max_concurrent(self, monkeypatch, params):
+        monkeypatch.setattr(os, "cpu_count", Mock(return_value=2))
+
+        cli_args = ["--bg-host", "the_host", "--max-concurrent", "-1"]
+        config = load_config(cli_args=cli_args)
+
+        assert config["max_concurrent"] == 6
+
+    def test_positive_max_concurrent(self, monkeypatch, params):
+        monkeypatch.setattr(os, "cpu_count", Mock(return_value=2))
+
+        cli_args = ["--bg-host", "the_host", "--max-concurrent", "3"]
+        config = load_config(cli_args=cli_args)
+
+        assert config["max_concurrent"] == 3
+
+
 class TestGetConnectionInfo(object):
     def test_kwargs(self, params):
         assert params == get_connection_info(**params)