postgresql-charms-single-kernel 16.1.4__tar.gz → 16.1.5__tar.gz

{postgresql_charms_single_kernel-16.1.4 → postgresql_charms_single_kernel-16.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: postgresql-charms-single-kernel
-Version: 16.1.4
+Version: 16.1.5
 Summary: Shared and reusable code for PostgreSQL-related charms
 Author: Canonical Data Platform
 Author-email: Canonical Data Platform <data-platform@lists.launchpad.net>

{postgresql_charms_single_kernel-16.1.4 → postgresql_charms_single_kernel-16.1.5}/pyproject.toml

@@ -4,7 +4,7 @@
 [project]
 name = "postgresql-charms-single-kernel"
 description = "Shared and reusable code for PostgreSQL-related charms"
-version = "16.1.4"
+version = "16.1.5"
 readme = "README.md"
 license = {file = "LICENSE"}
 authors = [
@@ -31,15 +31,15 @@ lib = [
     "psycopg2>=2.9.10",
 ]
 format = [
-    "ruff==0.14.6"
+    "ruff==0.14.9"
 ]
 lint = [
     "codespell==2.4.1",
     "pyright==1.1.407"
 ]
 unit = [
-    "coverage[toml]==7.12.0; python_version >= '3.10'",
-    "pytest==9.0.1; python_version >= '3.10'"
+    "coverage[toml]==7.13.0; python_version >= '3.10'",
+    "pytest==9.0.2; python_version >= '3.10'"
 ]
 
 # Testing tools configuration

postgresql_charms_single_kernel-16.1.5/single_kernel_postgresql/utils/filesystem.py

@@ -0,0 +1,62 @@
+# Copyright 2025 Canonical Ltd.
+# See LICENSE file for licensing details.
+"""Filesystem utilities."""
+
+import os
+import pwd
+
+from ..config.literals import SNAP_USER
+
+
+def change_owner(path: str) -> None:
+    """Change the ownership of a file or a directory to the snap user.
+
+    Args:
+        path: path to a file or directory.
+    """
+    # Get the uid/gid for the snap user.
+    user_database = pwd.getpwnam(SNAP_USER)
+    # Set the correct ownership for the file or directory.
+    os.chown(path, uid=user_database.pw_uid, gid=user_database.pw_gid)
+
+
+def is_tmpfs(path: str) -> bool:
+    """Check if a path is on a tmpfs filesystem.
+
+    This function reads /proc/mounts to determine the filesystem type of the
+    mount point containing the given path.
+
+    Args:
+        path: Path to check.
+
+    Returns:
+        True if the path is on a tmpfs filesystem, False otherwise.
+        Returns False if /proc/mounts cannot be read (e.g., not on Linux).
+    """
+    try:
+        with open("/proc/mounts") as f:
+            mounts = f.readlines()
+    except (FileNotFoundError, PermissionError):
+        # Not on Linux or /proc not available, assume persistent storage
+        return False
+
+    # Get absolute path to handle relative paths and symlinks
+    abs_path = os.path.abspath(path)
+
+    # Find the longest matching mount point (most specific)
+    best_match_fs = None
+    best_match_len = 0
+
+    for line in mounts:
+        parts = line.split()
+        if len(parts) < 3:
+            continue
+        mount_point = parts[1]
+        fs_type = parts[2]
+
+        # Check if path is under this mount point and is more specific
+        if abs_path.startswith(mount_point) and len(mount_point) > best_match_len:
+            best_match_fs = fs_type
+            best_match_len = len(mount_point)
+
+    return best_match_fs == "tmpfs"

{postgresql_charms_single_kernel-16.1.4 → postgresql_charms_single_kernel-16.1.5}/single_kernel_postgresql/utils/postgresql.py

@@ -37,7 +37,7 @@ from ..config.literals import (
     SYSTEM_USERS,
     Substrates,
 )
-from .filesystem import change_owner
+from .filesystem import change_owner, is_tmpfs
 
 # Groups to distinguish HBA access
 ACCESS_GROUP_IDENTITY = "identity_access"
@@ -1107,8 +1107,64 @@ class PostgreSQL:
                 connection.close()
         return databases
 
+    def _handle_temp_tablespace_on_reboot(
+        self, cursor, temp_location: str, temp_tablespace_exists: bool
+    ) -> None:
+        """Handle temp tablespace when permissions need fixing after reboot.
+
+        Args:
+            cursor: Database cursor.
+            temp_location: Path to the temp tablespace location.
+            temp_tablespace_exists: Whether the temp tablespace already exists.
+        """
+        if not temp_tablespace_exists:
+            return
+
+        # Different handling based on storage type
+        if is_tmpfs(temp_location):
+            # tmpfs: Directory is empty after reboot, safe to rename and recreate
+            # Rename existing temp tablespace instead of dropping it.
+            # Timestamp collision is not possible: the charm ensures this code runs leader-only,
+            # and it executes within a single database transaction holding exclusive locks.
+            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
+            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),
+            )
+        else:
+            # Persistent storage: Tablespace is still valid, permissions already fixed
+            # Log that we fixed permissions but didn't recreate
+            logger.info(
+                "Fixed permissions on temp tablespace directory at %s (persistent storage), "
+                "existing tablespace remains valid",
+                temp_location,
+            )
+
     def set_up_database(self, temp_location: Optional[str] = None) -> None:
-        """Set up postgres database with the right permissions."""
+        """Set up postgres database with the right permissions.
+
+        This method configures the postgres database with appropriate permissions and
+        optionally creates a temporary tablespace.
+
+        Args:
+            temp_location: Optional path for the temp tablespace. If provided, the method
+                will ensure proper permissions and create the tablespace if it doesn't exist.
+
+        Behavior on reboot:
+            - For tmpfs storage: If permissions are incorrect after reboot, renames the old
+              tablespace and creates a new one (tmpfs directory is empty after reboot).
+            - For persistent storage: If permissions are incorrect after reboot, fixes
+              permissions but keeps the existing tablespace (directory contents persist).
+
+        Raises:
+            PostgreSQLDatabasesSetupError: If database setup fails.
+        """
         connection = None
         cursor = None
         try:
@@ -1116,30 +1172,23 @@ class PostgreSQL:
             cursor = connection.cursor()
 
             if temp_location is not None:
-                # Fix permissions on the temporary tablespace location when a reboot happens and tmpfs is being used.
+                # Fix permissions on the temporary tablespace location when a reboot happens.
                 temp_location_stats = os.stat(temp_location)
-                if self.substrate == Substrates.VM and (
+                permissions_need_fix = self.substrate == Substrates.VM and (
                     pwd.getpwuid(temp_location_stats.st_uid).pw_name != SNAP_USER
                     or int(temp_location_stats.st_mode & 0o777) != POSTGRESQL_STORAGE_PERMISSIONS
-                ):
+                )
+
+                if permissions_need_fix:
                     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),
-                        )
+                    # Check if temp tablespace exists and handle it appropriately
+                    cursor.execute("SELECT TRUE FROM pg_tablespace WHERE spcname='temp';")
+                    temp_tablespace_exists = cursor.fetchone() is not None
+                    self._handle_temp_tablespace_on_reboot(
+                        cursor, temp_location, temp_tablespace_exists
+                    )
 
                 # Ensure a fresh temp tablespace exists at the expected location.
                 cursor.execute("SELECT TRUE FROM pg_tablespace WHERE spcname='temp';")

postgresql_charms_single_kernel-16.1.4/single_kernel_postgresql/utils/filesystem.py

@@ -1,20 +0,0 @@
-# Copyright 2025 Canonical Ltd.
-# See LICENSE file for licensing details.
-"""Filesystem utilities."""
-
-import os
-import pwd
-
-from ..config.literals import SNAP_USER
-
-
-def change_owner(path: str) -> None:
-    """Change the ownership of a file or a directory to the snap user.
-
-    Args:
-        path: path to a file or directory.
-    """
-    # Get the uid/gid for the snap user.
-    user_database = pwd.getpwnam(SNAP_USER)
-    # Set the correct ownership for the file or directory.
-    os.chown(path, uid=user_database.pw_uid, gid=user_database.pw_gid)