Adjust the unit startup mode

Author: bymoye

frameworks/Python/blacksheep/app.py

@@ -3,26 +3,27 @@
 import asyncpg
 import random
 import asyncio
-from operator import itemgetter
 import blacksheep as bs
 import jinja2
 import msgspec
 from pathlib import Path
+try:
+    import uvloop
+    asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
+except Exception:
+    ...
 
 READ_ROW_SQL = 'SELECT "id", "randomnumber" FROM "world" WHERE id = $1'
 WRITE_ROW_SQL = 'UPDATE "world" SET "randomnumber"=$1 WHERE id=$2'
 ADDITIONAL_ROW = [0, "Additional fortune added at request time."]
-MAX_POOL_SIZE = 1000 // multiprocessing.cpu_count()
-MIN_POOL_SIZE = max(int(MAX_POOL_SIZE / 2), 1)
+MAX_CONNECTIONS = 1900 
+CORE_COUNT = multiprocessing.cpu_count()
+WORKER_PROCESSES = CORE_COUNT
+MAX_POOL_SIZE = max(1, MAX_CONNECTIONS // WORKER_PROCESSES)
+MIN_POOL_SIZE = max(1, MAX_POOL_SIZE // 2)
 db_pool = None
 key = itemgetter(1)
 
-try:
-    import uvloop
-    asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
-except Exception:
-    ...
-
 async def setup_db(app):
     global db_pool
     db_pool = await asyncpg.create_pool(
@@ -33,8 +34,17 @@ async def setup_db(app):
         port=5432,
         min_size=MIN_POOL_SIZE,
         max_size=MAX_POOL_SIZE,
+        command_timeout=5,
+        max_inactive_connection_lifetime=60,
+        server_settings={'jit': 'off'},
     )
 
+async def shutdown_db(app):
+    """Close asyncpg connection pool for the current process."""
+    global db_pool
+    if db_pool is not None:
+        await db_pool.close()
+        db_pool = None
 
 def load_fortunes_template():
     with Path("templates/fortune.html").open("r") as f:
@@ -45,7 +55,7 @@ def load_fortunes_template():
 
 app = bs.Application()
 app.on_start += setup_db
-
+app.on_stop += shutdown_db
 
 def get_num_queries(request):
     try:
@@ -55,14 +65,9 @@ def get_num_queries(request):
         query_count = int(value[0])
     except (KeyError, IndexError, ValueError):
         return 1
-    if query_count < 1:
-        return 1
-    if query_count > 500:
-        return 500
-    return query_count
+    return min(max(query_count, 1), 500)
 
 ENCODER = msgspec.json.Encoder()
-DECODER = msgspec.json.Decoder()
 JSON_CONTENT_TYPE = b"application/json"
 def jsonify(
     data,
@@ -122,26 +127,22 @@ async def fortunes_test(request):
         fortunes = await db_conn.fetch("SELECT * FROM Fortune")
 
     fortunes.append(ADDITIONAL_ROW)
-    fortunes.sort(key = key)
+    fortunes.sort(key=lambda row: row[1])
     data = fortune_template.render(fortunes=fortunes)
     return bs.html(data)
 
 
 @bs.get('/updates')
 async def db_updates_test(request):
     num_queries = get_num_queries(request)
-    ids = sorted(random.sample(range(1, 10000 + 1), num_queries))
-    numbers = sorted(random.sample(range(1, 10000), num_queries))
-    updates = list(zip(ids, numbers))
-
-    # worlds = [ {"id": row_id, "randomNumber": number} for row_id, number in updates ]
+    updates = [(row_id, random.randint(1, 10000)) for row_id in random.sample(range(1, 10000), num_queries)]
     worlds = [Result(id=row_id, randomNumber=number) for row_id, number in updates]
+    # worlds = [ {"id": row_id, "randomNumber": number} for row_id, number in updates ]
     async with db_pool.acquire() as db_conn:
         statement = await db_conn.prepare(READ_ROW_SQL)
         for row_id, _ in updates:
             await statement.fetchval(row_id)
         await db_conn.executemany(WRITE_ROW_SQL, updates)
- 
     return jsonify(worlds)
 
 

frameworks/Python/blacksheep/blacksheep-nginx-unit.dockerfile

@@ -4,14 +4,20 @@ WORKDIR /blacksheep
 
 COPY ./ /blacksheep
 
-RUN pip3 install -U pip
-RUN pip3 install Cython==3.0.12
-RUN pip3 install -r /blacksheep/requirements.txt
-RUN pip3 install -r /blacksheep/requirements-uvicorn.txt
-
-RUN chmod +x start-unit.sh
+RUN pip3 install -U pip -q
+RUN pip3 install Cython==3.0.12 -q
+RUN pip3 install -r /blacksheep/requirements.txt -q
+RUN pip3 install -r /blacksheep/requirements-uvicorn.txt -q
 
 ENV PGSSLMODE=disable
+RUN CORE_COUNT=$(nproc) && \
+    MAX_PROCESSES=$((CORE_COUNT)) && \
+    sed -i "s|\"processes\": [0-9]*|\"processes\": $MAX_PROCESSES|g" /blacksheep/unit-config.json
+
+RUN unitd && \
+    curl -X PUT --data-binary @/blacksheep/unit-config.json --unix-socket \
+        /var/run/control.unit.sock http://localhost/config
 
+ENTRYPOINT []
 EXPOSE 8080
-CMD ["./start-unit.sh"]
+CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]

frameworks/Python/blacksheep/requirements.txt

@@ -1,4 +1,4 @@
 asyncpg==0.30.0
 Jinja2==3.1.6
-blacksheep==2.1.0
+blacksheep==2.2.0
 msgspec==0.19.0

frameworks/Python/blacksheep/start-unit.sh

@@ -12,7 +12,7 @@
             "protocol": "asgi",
             "module": "app",
             "callable": "app",
-            "processes": {{NPROC}}
+            "processes": 56
         }
     },
     "access_log": "/dev/null"