Merge ~troyanov/maas:temporal-use-maasdb into maas:master

[Anton Troyanov]

feat(temporal): use postgresql database

numHistoryShards is set to 4 and connection related params (maxConns, maxIdleConns) are taken from Temporal defaults [0] for PostgreSQL

[0]: https://github.com/temporalio/temporal/blob/main/config/development-postgres12.yaml

[MAAS Lander (maas-lander)]

UNIT TESTS
-b temporal-use-maasdb lp:~troyanov/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 5168de642931a82f8333f218dab0fb348c39632e

review: Approve

[Alberto Donato (ack)]

+1

Not for this branch, but given that the config template is getting some logic, I would consider dropping it and just dumping the config struct from python to YAML, so that all the logic is in one place.

review: Approve

diff --git a/src/maasserver/regiondservices/temporal.py b/src/maasserver/regiondservices/temporal.py
index 5db857b..3e30a77 100644
--- a/src/maasserver/regiondservices/temporal.py
+++ b/src/maasserver/regiondservices/temporal.py
@@ -10,11 +10,13 @@ import sys
 from twisted.application.service import Service
 from twisted.internet.defer import inlineCallbacks
 
+from maasserver.config import RegionConfiguration
+from maasserver.djangosettings.settings import _get_default_db_config
 from maasserver.service_monitor import service_monitor
 from maasserver.utils import load_template
-from maasserver.utils.threads import deferToDatabase
 from provisioningserver.logger import LegacyLogger
 from provisioningserver.path import get_tentative_data_path
+from provisioningserver.utils.env import MAAS_ID
 from provisioningserver.utils.fs import atomic_write, snap
 
 log = LegacyLogger()
@@ -24,24 +26,44 @@ class RegionTemporalService(Service):
     def __init__(self):
         super().__init__()
 
-    @inlineCallbacks
     def startService(self):
-        config = yield deferToDatabase(self._getConfiguration)
-        self._configure(config)
-        yield self._reload_service()
+        self._configure()
         super().startService()
 
     def stopService(self):
-        return super().stopService()
-
-    def _getConfiguration(self):
-        return None
+        super().stopService()
 
-    def _configure(self, configuration):
-        """Update the HTTP configuration for the region proxy service."""
+    def _configure(self):
+        """Update the Temporal configuration for the Temporal service."""
         template = load_template("temporal", "production.yaml.template")
-        environ = {}
+
+        with RegionConfiguration.open() as config:
+            dbconf = _get_default_db_config(config)
+
+        connection_attributes = {}
+        host = dbconf["HOST"]
+        if host.startswith("/"):
+            connection_attributes["host"] = host
+
+            # If the host name starts with @, it is taken as a Unix-domain socket
+            # in the abstract namespace (currently supported on Linux and Windows).
+            # https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-PARAMKEYWORDS
+            host = "@"
+
+        maas_id = MAAS_ID.get() or "NO_ID"
+        application_name = f"maas-temporal-{maas_id}"
+        connection_attributes["application_name"] = application_name
+
+        environ = {
+            "database": dbconf["NAME"],
+            "user": dbconf.get("USER", ""),
+            "password": dbconf.get("PASSWORD", ""),
+            "address": f"{host}:{dbconf['PORT']}",
+            "connect_attributes": connection_attributes,
+        }
+
         rendered = template.substitute(environ).encode()
+
         target_path = Path(
             os.path.join(get_temporal_config_dir(), "production.yaml")
         )
diff --git a/src/maasserver/templates/temporal/production.yaml.template b/src/maasserver/templates/temporal/production.yaml.template
index 03a542a..41bb15b 100644
--- a/src/maasserver/templates/temporal/production.yaml.template
+++ b/src/maasserver/templates/temporal/production.yaml.template
@@ -3,53 +3,45 @@ log:
   level: info
 
 persistence:
-  defaultStore: sqlite-default
-  visibilityStore: sqlite-visibility
-  numHistoryShards: 1
+  defaultStore: default
+  visibilityStore: visibility
+  numHistoryShards: 4
   datastores:
-    sqlite-default:
+    default:
       sql:
-        user: ""
-        password: ""
-        pluginName: "sqlite"
-        databaseName: "default"
-        connectAddr: "localhost"
+        user: {{ user }}
+        password: {{ password }}
+        pluginName: "postgres12"
+        databaseName: {{ database }}
+        connectAddr: {{ address | repr }}
         connectProtocol: "tcp"
         connectAttributes:
-          mode: "memory"
-          cache: "private"
-        maxConns: 1
-        maxIdleConns: 1
+          search_path: "temporal"
+        {{ for k, v in connect_attributes.items() }}
+          {{ k }}: {{ v | repr }}
+        {{ endfor }}
+        maxConns: 20
+        maxIdleConns: 20
         maxConnLifetime: "1h"
-        tls:
-          enabled: false
-          caFile: ""
-          certFile: ""
-          keyFile: ""
-          enableHostVerification: false
-          serverName: ""
 
-    sqlite-visibility:
+    visibility:
       sql:
-        user: ""
-        password: ""
-        pluginName: "sqlite"
-        databaseName: "default"
-        connectAddr: "localhost"
+        user: {{ user }}
+        password: {{ password }}
+        pluginName: "postgres12"
+        databaseName: {{ database }}
+        connectAddr: {{ address | repr }}
         connectProtocol: "tcp"
         connectAttributes:
-          mode: "memory"
-          cache: "private"
-        maxConns: 1
-        maxIdleConns: 1
+          search_path: "temporal_visibility"
+        {{ for k, v in connect_attributes.items() }}
+          {{ k }}: {{ v | repr }}
+        {{ endfor }}
+
+        maxConns: 2
+        maxIdleConns: 2
         maxConnLifetime: "1h"
-        tls:
-          enabled: false
-          caFile: ""
-          certFile: ""
-          keyFile: ""
-          enableHostVerification: false
-          serverName: ""
+
 global:
   membership:
     maxJoinDuration: 30s