postgresql-charms-single-kernel 16.0.0__tar.gz → 16.0.2__tar.gz

{postgresql_charms_single_kernel-16.0.0 → postgresql_charms_single_kernel-16.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: postgresql-charms-single-kernel
-Version: 16.0.0
+Version: 16.0.2
 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 → postgresql_charms_single_kernel-16.0.2}/postgresql_charms_single_kernel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: postgresql-charms-single-kernel
-Version: 16.0.0
+Version: 16.0.2
 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 → postgresql_charms_single_kernel-16.0.2}/pyproject.toml

@@ -4,7 +4,7 @@
 [project]
 name = "postgresql-charms-single-kernel"
 description = "Shared and reusable code for PostgreSQL-related charms"
-version = "16.0.0"
+version = "16.0.2"
 readme = "README.md"
 license = "Apache-2.0"
 authors = [
@@ -23,15 +23,15 @@ lib = [
     "psycopg2>=2.9.10",
 ]
 format = [
-    "ruff==0.12.11"
+    "ruff==0.13.1"
 ]
 lint = [
     "codespell==2.4.1",
     "pyright==1.1.405"
 ]
 unit = [
-    "coverage[toml]==7.9.1; python_version > '3.8'",
-    "pytest==8.4.1; python_version >= '3.9'"
+    "coverage[toml]==7.10.7; python_version > '3.8'",
+    "pytest==8.4.2; python_version >= '3.9'"
 ]
 
 # Testing tools configuration

{postgresql_charms_single_kernel-16.0.0 → postgresql_charms_single_kernel-16.0.2}/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 int(temp_location_stats.st_mode & 0o777) != 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}';")