postgresql-charms-single-kernel 16.0.0__py3-none-any.whl → 16.0.1__py3-none-any.whl

{postgresql_charms_single_kernel-16.0.0.dist-info → postgresql_charms_single_kernel-16.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: postgresql-charms-single-kernel
-Version: 16.0.0
+Version: 16.0.1
 Summary: Shared and reusable code for PostgreSQL-related charms
 Author-email: Canonical Data Platform <data-platform@lists.launchpad.net>
 License-Expression: Apache-2.0

{postgresql_charms_single_kernel-16.0.0.dist-info → postgresql_charms_single_kernel-16.0.1.dist-info}/RECORD

@@ -4,8 +4,8 @@ single_kernel_postgresql/config/__init__.py,sha256=k9Ud5ZZNd3l0nn8xi8AIlT45oZk8h
 single_kernel_postgresql/config/literals.py,sha256=4EpAnoxCEMfOCPpFD5dyAU_0h2OwAHgEX9OjTWNcaQg,527
 single_kernel_postgresql/utils/__init__.py,sha256=VwAEW3wYjs99q38bid47aS6Os4s3catK4H5HfdPkp94,121
 single_kernel_postgresql/utils/filesystem.py,sha256=CJ2iXqFPKM0NfqqZSTDlENOrM0RW7rmTmcuzwV0bR9A,552
-single_kernel_postgresql/utils/postgresql.py,sha256=DX97VTTU73lgxe-XD1vDt72Eflxr5_sfDwRdqJf32ZE,74505
-postgresql_charms_single_kernel-16.0.0.dist-info/METADATA,sha256=ITQ_tJx-VDpTAaNp3-GkLClq1zmK2NBUd-WIRD3MkPQ,484
-postgresql_charms_single_kernel-16.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-postgresql_charms_single_kernel-16.0.0.dist-info/top_level.txt,sha256=fH85HKyfDV3--1JuYe-rWJmN5XTlXVXGOBO5iNA36Rk,25
-postgresql_charms_single_kernel-16.0.0.dist-info/RECORD,,
+single_kernel_postgresql/utils/postgresql.py,sha256=bM57IUWPX4x0u7yL68zYdlPcBs7SIDRKj28zzeMXXeI,75950
+postgresql_charms_single_kernel-16.0.1.dist-info/METADATA,sha256=CcN0WZUEcOdlf2ho3l_K60JTq8qMhzanZ5NW73EcMc4,484
+postgresql_charms_single_kernel-16.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+postgresql_charms_single_kernel-16.0.1.dist-info/top_level.txt,sha256=fH85HKyfDV3--1JuYe-rWJmN5XTlXVXGOBO5iNA36Rk,25
+postgresql_charms_single_kernel-16.0.1.dist-info/RECORD,,

single_kernel_postgresql/utils/postgresql.py

@@ -21,14 +21,16 @@ Any charm using this library should import the `psycopg2` or `psycopg2-binary` d
 
 import logging
 import os
+import pwd
 from collections import OrderedDict
+from datetime import datetime, timezone
 from typing import Dict, List, Optional, Set, Tuple
 
 import psycopg2
 from ops import ConfigData
 from psycopg2.sql import SQL, Identifier, Literal
 
-from ..config.literals import BACKUP_USER, POSTGRESQL_STORAGE_PERMISSIONS, SYSTEM_USERS
+from ..config.literals import BACKUP_USER, POSTGRESQL_STORAGE_PERMISSIONS, SNAP_USER, SYSTEM_USERS
 from .filesystem import change_owner
 
 # Groups to distinguish HBA access
@@ -1074,9 +1076,31 @@ class PostgreSQL:
 
             if temp_location is not None:
                 # Fix permissions on the temporary tablespace location when a reboot happens and tmpfs is being used.
-                change_owner(temp_location)
-                os.chmod(temp_location, POSTGRESQL_STORAGE_PERMISSIONS)
+                temp_location_stats = os.stat(temp_location)
+                if (
+                    pwd.getpwuid(temp_location_stats.st_uid).pw_name != SNAP_USER
+                    or temp_location_stats.st_mode != POSTGRESQL_STORAGE_PERMISSIONS
+                ):
+                    change_owner(temp_location)
+                    os.chmod(temp_location, POSTGRESQL_STORAGE_PERMISSIONS)
+                    # Rename existing temp tablespace if it exists, instead of dropping it.
+                    cursor.execute("SELECT TRUE FROM pg_tablespace WHERE spcname='temp';")
+                    if cursor.fetchone() is not None:
+                        new_name = f"temp_{datetime.now(timezone.utc).strftime('%Y%m%d%H%M%S')}"
+                        cursor.execute(f"ALTER TABLESPACE temp RENAME TO {new_name};")
+
+                        # List temp tablespaces with suffix for operator follow-up cleanup and log them.
+                        cursor.execute(
+                            "SELECT spcname FROM pg_tablespace WHERE spcname LIKE 'temp_%';"
+                        )
+                        temp_tbls = sorted([row[0] for row in cursor.fetchall()])
+                        logger.info(
+                            "There are %d temp tablespaces that should be checked and removed: %s",
+                            len(temp_tbls),
+                            ", ".join(temp_tbls),
+                        )
 
+                # Ensure a fresh temp tablespace exists at the expected location.
                 cursor.execute("SELECT TRUE FROM pg_tablespace WHERE spcname='temp';")
                 if cursor.fetchone() is None:
                     cursor.execute(f"CREATE TABLESPACE temp LOCATION '{temp_location}';")