Increase number of workers and configure resources (#121)

* parameterise uvicorn workers

* configure resources and replicas

* Fix tox config

Author: MaxHerbs

helm/daq-config-server/templates/deployment.yaml

@@ -73,10 +73,20 @@ spec:
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.affinity }}
       affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchExpressions:
+                  - key: app.kubernetes.io/name
+                    operator: In
+                    values:
+                      - daq-config-server
+                  - key: app.kubernetes.io/instance
+                    operator: In
+                    values:
+                      - {{ .Release.Name }}
+              topologyKey: "kubernetes.io/hostname"
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}

helm/daq-config-server/values.yaml

@@ -1,4 +1,4 @@
-replicaCount: 1
+replicaCount: 2
 
 image:
   repository: ghcr.io/diamondlightsource/daq-config-server
@@ -37,7 +37,13 @@ ingress:
      hosts:
        - daq-config.diamond.ac.uk
 
-resources: {}
+resources:
+  limits:
+    cpu: 1
+    memory: 2Gi
+  requests:
+    cpu: 500m
+    memory: 1Gi
 
 livenessProbe:
   httpGet:
@@ -50,6 +56,8 @@ readinessProbe:
 
 # Send logs to the dodal graylog stream for now until a more suitable stream exists
 config:
+  uvicorn_config:
+    workers: 2
   logging_config:
     graylog:
       enabled: true
@@ -63,4 +71,3 @@ volumeMounts: []
 volumes: []
 nodeSelector: {}
 tolerations: []
-affinity: {}

pyproject.toml

@@ -18,10 +18,10 @@ readme = "README.md"
 requires-python = ">=3.11"
 
 dependencies = [
-    "pyyaml",      
+    "pyyaml",
     "fastapi",
     "uvicorn",
-    "redis", 
+    "redis",
     "hiredis",
     "cachetools",
     "graypy",
@@ -78,8 +78,10 @@ markers = """
 """
 
 # https://iscinumpy.gitlab.io/post/bound-version-constraints/#watch-for-warnings
-filterwarnings = ["error",
-"ignore:Exception ignored in.*sqlite3.Connection:pytest.PytestUnraisableExceptionWarning"] #See https://github.com/pytest-dev/pytest-cov/issues/694
+filterwarnings = [
+    "error",
+    "ignore:Exception ignored in.*sqlite3.Connection:pytest.PytestUnraisableExceptionWarning",
+] #See https://github.com/pytest-dev/pytest-cov/issues/694
 
 # Doctest python code in docs, python code in src docstrings, test functions in tests
 testpaths = "docs src tests"
@@ -98,7 +100,7 @@ legacy_tox_ini = """
 [tox]
 skipsdist=True
 
-[testenv:{pre-commit,type-checking,unit_tests,docs}]
+[testenv:{pre-commit,type-checking,unit_tests,docs,system_tests}]
 # Don't create a virtualenv for the command, requires tox-direct plugin
 direct = True
 passenv = *

src/daq_config_server/app.py

@@ -177,4 +177,9 @@ def main():
 
     set_up_logging(config.logging_config)
 
-    uvicorn.run(app="daq_config_server.app:app", host="0.0.0.0", port=8555)
+    uvicorn.run(
+        app="daq_config_server.app:app",
+        host="0.0.0.0",
+        port=8555,
+        workers=config.uvicorn_config.workers,
+    )

src/daq_config_server/config.py

@@ -21,5 +21,10 @@ class LoggingConfig(BaseModel):
     stream_log: StreamLogConfig = StreamLogConfig()
 
 
+class UvicornConfig(BaseModel):
+    workers: int = 2
+
+
 class Config(BaseModel):
     logging_config: LoggingConfig = LoggingConfig()
+    uvicorn_config: UvicornConfig = UvicornConfig()