ISSUE-144 (#159)

paunin · May 28, 2018 · 3e88b95 · 3e88b95
1 parent d5fa120
commit 3e88b95
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 9 deletions.
diff --git a/src/Postgres-10-Repmgr-3.2.Dockerfile b/src/Postgres-10-Repmgr-3.2.Dockerfile
@@ -98,7 +98,7 @@ ENV REPMGR_DEGRADED_MONITORING_TIMEOUT 1
 ENV REPMGR_PID_FILE /tmp/repmgrd.pid
 ENV STOPPING_LOCK_FILE /tmp/stop.pid
 ENV MASTER_SYNC_LOCK_FILE /tmp/replication
-ENV STOPPING_TIMEOUT 15
+ENV STOPPING_TIMEOUT 5
 ENV CONNECT_TIMEOUT 2
 ENV RECONNECT_ATTEMPTS 3
 ENV RECONNECT_INTERVAL 5

diff --git a/src/Postgres-9.5-Repmgr-3.2.Dockerfile b/src/Postgres-9.5-Repmgr-3.2.Dockerfile
@@ -98,7 +98,7 @@ ENV REPMGR_DEGRADED_MONITORING_TIMEOUT 1
 ENV REPMGR_PID_FILE /tmp/repmgrd.pid
 ENV STOPPING_LOCK_FILE /tmp/stop.pid
 ENV MASTER_SYNC_LOCK_FILE /tmp/replication
-ENV STOPPING_TIMEOUT 15
+ENV STOPPING_TIMEOUT 5
 ENV CONNECT_TIMEOUT 2
 ENV RECONNECT_ATTEMPTS 3
 ENV RECONNECT_INTERVAL 5

diff --git a/src/Postgres-9.6-Repmgr-3.2.Dockerfile b/src/Postgres-9.6-Repmgr-3.2.Dockerfile
@@ -98,7 +98,7 @@ ENV REPMGR_DEGRADED_MONITORING_TIMEOUT 1
 ENV REPMGR_PID_FILE /tmp/repmgrd.pid
 ENV STOPPING_LOCK_FILE /tmp/stop.pid
 ENV MASTER_SYNC_LOCK_FILE /tmp/replication
-ENV STOPPING_TIMEOUT 15
+ENV STOPPING_TIMEOUT 5
 ENV CONNECT_TIMEOUT 2
 ENV RECONNECT_ATTEMPTS 3
 ENV RECONNECT_INTERVAL 5

diff --git a/src/Postgres-extended-10-Repmgr-3.2.Dockerfile b/src/Postgres-extended-10-Repmgr-3.2.Dockerfile
@@ -98,7 +98,7 @@ ENV REPMGR_DEGRADED_MONITORING_TIMEOUT 1
 ENV REPMGR_PID_FILE /tmp/repmgrd.pid
 ENV STOPPING_LOCK_FILE /tmp/stop.pid
 ENV MASTER_SYNC_LOCK_FILE /tmp/replication
-ENV STOPPING_TIMEOUT 15
+ENV STOPPING_TIMEOUT 5
 ENV CONNECT_TIMEOUT 2
 ENV RECONNECT_ATTEMPTS 3
 ENV RECONNECT_INTERVAL 5

diff --git a/src/Postgres-extended-9.5-Repmgr-3.2.Dockerfile b/src/Postgres-extended-9.5-Repmgr-3.2.Dockerfile
@@ -98,7 +98,7 @@ ENV REPMGR_DEGRADED_MONITORING_TIMEOUT 1
 ENV REPMGR_PID_FILE /tmp/repmgrd.pid
 ENV STOPPING_LOCK_FILE /tmp/stop.pid
 ENV MASTER_SYNC_LOCK_FILE /tmp/replication
-ENV STOPPING_TIMEOUT 15
+ENV STOPPING_TIMEOUT 5
 ENV CONNECT_TIMEOUT 2
 ENV RECONNECT_ATTEMPTS 3
 ENV RECONNECT_INTERVAL 5

diff --git a/src/Postgres-extended-9.6-Repmgr-3.2.Dockerfile b/src/Postgres-extended-9.6-Repmgr-3.2.Dockerfile
@@ -98,7 +98,7 @@ ENV REPMGR_DEGRADED_MONITORING_TIMEOUT 1
 ENV REPMGR_PID_FILE /tmp/repmgrd.pid
 ENV STOPPING_LOCK_FILE /tmp/stop.pid
 ENV MASTER_SYNC_LOCK_FILE /tmp/replication
-ENV STOPPING_TIMEOUT 15
+ENV STOPPING_TIMEOUT 5
 ENV CONNECT_TIMEOUT 2
 ENV RECONNECT_ATTEMPTS 3
 ENV RECONNECT_INTERVAL 5

diff --git a/src/_Postgres-10.2-Repmgr-4.0.Dockerfile b/src/_Postgres-10.2-Repmgr-4.0.Dockerfile
@@ -86,7 +86,7 @@ ENV REPMGR_DEGRADED_MONITORING_TIMEOUT 1
 ENV REPMGR_PID_FILE /tmp/repmgrd.pid
 ENV STOPPING_LOCK_FILE /tmp/stop.pid
 ENV MASTER_SYNC_LOCK_FILE /tmp/replication
-ENV STOPPING_TIMEOUT 15
+ENV STOPPING_TIMEOUT 5
 ENV CONNECT_TIMEOUT 2
 ENV RECONNECT_ATTEMPTS 3
 ENV RECONNECT_INTERVAL 5

diff --git a/src/includes/dockerfile/Postgres-9.5-10-Repmgr-3.2.part.Dockerfile b/src/includes/dockerfile/Postgres-9.5-10-Repmgr-3.2.part.Dockerfile
@@ -92,7 +92,7 @@ ENV REPMGR_DEGRADED_MONITORING_TIMEOUT 1
 ENV REPMGR_PID_FILE /tmp/repmgrd.pid
 ENV STOPPING_LOCK_FILE /tmp/stop.pid
 ENV MASTER_SYNC_LOCK_FILE /tmp/replication
-ENV STOPPING_TIMEOUT 15
+ENV STOPPING_TIMEOUT 5
 ENV CONNECT_TIMEOUT 2
 ENV RECONNECT_ATTEMPTS 3
 ENV RECONNECT_INTERVAL 5

diff --git a/src/pgsql/bin/functions/system_exit b/src/pgsql/bin/functions/system_exit
@@ -8,7 +8,8 @@ if [ -f "$STOPPING_LOCK_FILE" ]; then
         echo ">>>>>> Will wait $TRIES second(s) more"
         TRIES=`expr "$TRIES" - 1`
         if [[ "$TRIES" == "0" ]]; then
-            echo ">>>>>> Can't wait any more. Quiting now!"
+            echo ">>>>>> Can't wait any more. Stopping postgres in Fast mode..."
+            gosu postgres pg_ctl stop -m fast
             break
         fi
         sleep 1;