go back to what we had

Author: jphenow

Dockerfile

@@ -1,5 +1,8 @@
 FROM percona/percona-postgresql-operator:2.6.0-ppg16.8-postgres
 
+# Switch to root user temporarily to gain necessary privileges for setup
+USER 0
+
 COPY postgres-oom-adjuster.sh /usr/local/bin/
 COPY entrypoint-wrapper.sh /usr/local/bin/
 

entrypoint-wrapper.sh

@@ -2,23 +2,34 @@
 set -e
 
 # For Percona PostgreSQL Operator, we need to focus on protecting the postmaster process
+# Original user in the Percona PostgreSQL Operator image
+ORIGINAL_USER=26
 ORIGINAL_ENTRYPOINT="/opt/crunchy/bin/postgres-ha/bootstrap-postgres-ha.sh"
 
-# Try to set OOM score adjustment if possible, but don't fail if we can't
-if command -v sudo >/dev/null 2>&1; then
-  # If sudo is available, use it to set OOM score
-  sudo -n sh -c 'echo -900 > /proc/self/oom_score_adj' >/dev/null 2>&1 || true
-  echo "Attempted to set OOM score adjustment using sudo"
-elif command -v setcap >/dev/null 2>&1; then
-  # Try to give the oom-adjuster script the capability to adjust OOM scores
-  setcap 'cap_sys_resource=+ep' /usr/local/bin/postgres-oom-adjuster.sh >/dev/null 2>&1 || true
-  echo "Attempted to grant capabilities to OOM adjuster"
+# Set OOM score adjustment for our own process (will be inherited)
+if [ -f "/proc/self/oom_score_adj" ]; then
+    echo -900 > /proc/self/oom_score_adj
+    echo "Set OOM score adjustment to -900 for pid 1"
+else
+    echo "WARNING: Cannot set OOM score adjustment (file not found)"
 fi
 
-# Start a background process to monitor and adjust PostgreSQL if possible
+# Start the OOM adjuster in the background
 nohup /usr/local/bin/postgres-oom-adjuster.sh >> /tmp/postgres-oom-adjuster.log 2>&1 &
 echo "Started postmaster OOM adjuster in background"
 
-# Execute the original entrypoint
-echo "Executing original entrypoint: $ORIGINAL_ENTRYPOINT $@"
-exec "$ORIGINAL_ENTRYPOINT" "$@"
+# Set environment variables for PostgreSQL child processes
+export PG_OOM_ADJUST_FILE=/proc/self/oom_score_adj
+export PG_OOM_ADJUST_VALUE=0
+
+# Switching to the original user and executing original entrypoint
+echo "Switching to user $ORIGINAL_USER and executing original entrypoint: $ORIGINAL_ENTRYPOINT $@"
+
+# Check which user-switching command is available
+if command -v runuser >/dev/null 2>&1; then
+    # Use runuser (available on RHEL/CentOS/Fedora)
+    exec runuser -u "#$ORIGINAL_USER" -- "$ORIGINAL_ENTRYPOINT" "$@"
+else
+    # Fall back to su
+    exec su -s /bin/bash $ORIGINAL_USER -c "$ORIGINAL_ENTRYPOINT $*"
+fi