Making changes to have osm2pgsql connections go through pgBouncer

Author: rustprooflabs

Dockerfile

@@ -74,3 +74,6 @@ WORKDIR /app
 COPY . ./
 
 RUN pip install --upgrade pip && pip install -r requirements.txt
+
+# Expose pgBouncer port
+EXPOSE 6432

docker/db.py

@@ -96,8 +96,10 @@ def get_db_conn_string() -> str:
     conn_string : str
     """
     if os.environ['USE_PGBOUNCER'] == 'true':
+        LOGGER.debug('Using pgBouncer connection string')
         conn_string = os.environ['PGOSM_CONN_PGBOUNCER']
     else:
+        LOGGER.debug('Using direct to Postgres connection string (non-admin)')
         conn_string = os.environ['PGOSM_CONN']
 
     return conn_string

docker/osm2pgsql_recommendation.py

@@ -89,7 +89,7 @@ def get_recommended_script(system_ram_gb: float,
     LOGGER.debug(f'Generic command to run: {osm2pgsql_cmd}')
 
     # Replace generic connection string with specific conn string
-    conn_string = db.connection_string()
+    conn_string = db.get_db_conn_string()
     osm2pgsql_cmd = osm2pgsql_cmd.replace('-d $PGOSM_CONN', f'-d {conn_string}')
     # Warning: Do not print() this string any more! Includes password
     return osm2pgsql_cmd

docker/pgbouncer.py

@@ -22,10 +22,11 @@
 auth_file = /etc/pgbouncer/userlist.txt
 logfile = /var/log/pgbouncer/pgbouncer.log
 pidfile = /var/run/pgbouncer/pgbouncer.pid
-admin_users = postgres
+admin_users = {pg_user}
 max_client_conn = 300
 default_pool_size = {pgbouncer_pool_size}
 max_prepared_statements = 500
+pool_mode = transaction
 """
 """str : Shell of pgbouncer.ini used to configure pgBouncer."""
 
@@ -59,6 +60,7 @@ def setup(pgbouncer_pool_size: int):
     pgbouncer_ini = PGBOUNCER_INI_TEMPLATE.format(pg_host=db_parts['pg_host'],
                                                   pg_port=db_parts['pg_port'],
                                                   pg_db=db_parts['pg_db'],
+                                                  pg_user=db_parts['pg_user'],
                                                   pgbouncer_pool_size=pgbouncer_pool_size
                                                   )