From 35ddbd9f2087df0a59b9372c04d594173992319d Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Sun, 7 Mar 2021 17:07:35 +0100
Subject: [PATCH] Upgrade Stolon

---
 app/postgres/deploy/postgres.hcl | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/postgres/deploy/postgres.hcl b/app/postgres/deploy/postgres.hcl
index 55a8144..db62522 100644
--- a/app/postgres/deploy/postgres.hcl
+++ b/app/postgres/deploy/postgres.hcl
@@ -4,8 +4,12 @@ job "postgres" {
   priority = 90
 
   update {
-    max_parallel     = 1
-    stagger = "2m"
+    max_parallel = 1
+    health_check = "checks"
+    min_healthy_time  = "2m"
+    healthy_deadline  = "5m"
+    progress_deadline = "10m"
+    auto_revert = true
   }
 
   group "postgres" {
@@ -18,7 +22,7 @@ job "postgres" {
       driver = "docker"
 
       config {
-        image = "superboum/amd64_postgres:v3"
+        image = "superboum/amd64_postgres:v4"
         network_mode = "host" 
         readonly_rootfs = false
         command = "/usr/local/bin/stolon-sentinel"
@@ -37,7 +41,7 @@ job "postgres" {
       driver = "docker"
 
       config {
-        image = "superboum/amd64_postgres:v3"
+        image = "superboum/amd64_postgres:v4"
         network_mode = "host" 
         readonly_rootfs = false
         command = "/usr/local/bin/stolon-proxy"
@@ -47,7 +51,8 @@ job "postgres" {
           "--store-endpoints", "http://consul.service.2.cluster.deuxfleurs.fr:8500",
           "--port", "${NOMAD_PORT_psql_proxy_port}",
           "--listen-address", "0.0.0.0",
-          "--stop-listening", "false"
+          "--stop-listening", "false",
+          "--store-timeout", "120s"
         ]
         ports = [ "psql_proxy_port" ]
       }
@@ -79,7 +84,7 @@ job "postgres" {
       driver = "docker"
 
       config {
-        image = "superboum/amd64_postgres:v3"
+        image = "superboum/amd64_postgres:v4"
         network_mode = "host" 
         readonly_rootfs = false
         command = "/usr/local/bin/stolon-keeper"
@@ -121,12 +126,6 @@ job "postgres" {
           port = "psql_port"
           interval = "60s"
           timeout = "5s"
-
-        //  check_restart {
-        //    limit = 3
-        //    grace = "60m"
-        //    ignore_warnings = false
-        //  }
         }
       }
     }