ref(api): add server settings, allow self-hosted overrides through env

snuba/cli/api.py

@@ -11,17 +11,17 @@
 @click.option("--bind", help="Address to listen on.")
 @click.option("--debug", is_flag=True)
 @click.option("--log-level", help="Logging level to use.")
-@click.option("--processes", type=click.IntRange(1), default=1)
+@click.option("--processes", type=click.IntRange(1))
 @click.option("--threads", type=click.IntRange(1))
-@click.option("--backlog", type=click.IntRange(128), default=128)
+@click.option("--backlog", type=click.IntRange(128))
 def api(
     *,
     bind: Optional[str],
     debug: bool,
     log_level: Optional[str],
-    processes: int,
+    processes: Optional[int],
     threads: Optional[int],
-    backlog: int,
+    backlog: Optional[int],
 ) -> None:
     from snuba import settings
 
@@ -35,6 +35,9 @@ def api(
     else:
         host, port = settings.HOST, settings.PORT
 
+    processes = processes or settings.API_WORKERS or 1
+    threads = threads or settings.API_THREADS
+
     if debug:
         if processes > 1 or (threads or 1) > 1:
             raise click.ClickException("processes/threads can only be 1 in debug")
@@ -51,11 +54,17 @@ def api(
         if log_level:
             os.environ["LOG_LEVEL"] = log_level
 
+        lifetime = settings.API_WORKERS_LIFETIME
+        max_rss = settings.API_WORKERS_MAX_RSS
+        backlog = backlog or max(128, 64 * processes)
+
         server.serve(
             "snuba.web.wsgi:application",
             f"{host}:{port}",
             processes=processes,
             threads=threads,
             backlog=backlog,
+            lifetime=lifetime,
+            max_rss=max_rss,
             name="snuba-api",
         )

snuba/settings/__init__.py

@@ -70,6 +70,19 @@
 # End Admin Settings #
 ######################
 
+################
+# Api Settings #
+################
+
+API_WORKERS = 1
+API_THREADS = None
+API_WORKERS_LIFETIME = None
+API_WORKERS_MAX_RSS = None
+
+####################
+# End Api Settings #
+####################
+
 MAX_MIGRATIONS_REVERT_TIME_WINDOW_HRS = 24
 
 ENABLE_DEV_FEATURES = os.environ.get("ENABLE_DEV_FEATURES", False)

snuba/settings/settings_self_hosted.py

@@ -12,6 +12,15 @@
 VALID_RETENTION_DAYS = set([int(env("SENTRY_EVENT_RETENTION_DAYS", 90)), 30, 60])
 LOWER_RETENTION_DAYS = min(DEFAULT_RETENTION_DAYS, 30)
 
+API_WORKERS = int(env("SNUBA_API_WORKERS", 1))
+API_THREADS = int(env("SNUBA_API_THREADS", 8))
+API_WORKERS_LIFETIME = (
+    int(env("SNUBA_API_WORKERS_LIFETIME")) if env("SNUBA_API_WORKERS_LIFETIME") else None  # type: ignore
+)
+API_WORKERS_MAX_RSS = (
+    int(env("SNUBA_API_WORKERS_MAX_RSS")) if env("SNUBA_API_WORKERS_MAX_RSS") else None  # type: ignore
+)
+
 REDIS_HOST = env("REDIS_HOST", "127.0.0.1")
 REDIS_PORT = int(env("REDIS_PORT", 6379))
 REDIS_PASSWORD = env("REDIS_PASSWORD")

snuba/utils/server.py

@@ -15,6 +15,7 @@ def serve(
     reload: bool = False,
     name: str | None = None,
     lifetime: int | None = None,
+    max_rss: int | None = None,
 ) -> None:
     host, port = bind.rsplit(":", maxsplit=1)
     server = Granian(
@@ -25,6 +26,7 @@ def serve(
         backlog=backlog,
         workers=processes,
         workers_lifetime=lifetime,
+        workers_max_rss=max_rss,
         workers_kill_timeout=30,
         blocking_threads=threads,
         respawn_failed_workers=True,