Синхронизация с локальной веткой разработки

sergey grinko · sergey grinko · commit 26f31e3220a8 · 2023-09-25T14:55:53.000+03:00
Изменил --batch-size=50 на 10
Изменил режим создания INC бэкапов на PAGE
добавил скрипт выкладывания контейнеров на harbor сайт
diff --git a/12/docker-postgres/postgresql.conf b/12/docker-postgres/postgresql.conf
@@ -231,7 +231,7 @@ checkpoint_completion_target = 0.9	# checkpoint target duration, 0.0 - 1.0
 
 archive_mode = on		# enables archiving; off, on, or always
 				# (change requires restart)
-archive_command = 'if [ -f archive_pause.trigger ]; then exit 1; else if [ -f archive_active.trigger ]; then pg_probackup-12 archive-push -B /mnt/pgbak --instance 12 --wal-file-path %p --wal-file-name %f -j 4 --batch-size=50; else exit 0; fi; fi'		# command to use to archive a logfile segment
+archive_command = 'if [ -f archive_pause.trigger ]; then exit 1; else if [ -f archive_active.trigger ]; then pg_probackup-12 archive-push -B /mnt/pgbak --instance 12 --wal-file-path %p --wal-file-name %f -j 4 --batch-size=10; else exit 0; fi; fi'		# command to use to archive a logfile segment
 				# placeholders: %p = path of file to archive
 				#               %f = file name only
 				# e.g. 'test ! -f /mnt/server/archivedir/%f && cp %p /mnt/server/archivedir/%f'
@@ -242,7 +242,7 @@ archive_timeout = 1800s		# force a logfile segment switch after this
 
 # These are only used in recovery mode.
 
-restore_command = 'if [ -f archive_pause.trigger ]; then exit 1; else if [ -f archive_active.trigger ]; then pg_probackup-12 archive-push -B /mnt/pgbak --instance 12 --wal-file-path %p --wal-file-name %f -j 4 --batch-size=50; else exit 0; fi; fi'		# command to use to archive a logfile segment
+restore_command = 'if [ -f archive_pause.trigger ]; then exit 1; else if [ -f archive_active.trigger ]; then pg_probackup-12 archive-push -B /mnt/pgbak --instance 12 --wal-file-path %p --wal-file-name %f -j 4 --batch-size=10; else exit 0; fi; fi'		# command to use to archive a logfile segment
 				# placeholders: %p = path of file to restore
 				#               %f = file name only
 				# e.g. 'cp /mnt/server/archivedir/%f %p'
diff --git a/12/postgres-service.yml b/12/postgres-service.yml
@@ -35,5 +35,5 @@ services:
       EMAIL_SERVER: "mail.company.ru"
       EMAIL_HOSTNAME: "noreplay@myhost.ru"
       BACKUP_THREADS: "4"
-      BACKUP_MODE: "delta"
+      BACKUP_MODE: "page"
 
diff --git a/12/postgres-service_all.yml b/12/postgres-service_all.yml
@@ -35,7 +35,7 @@ services:
       EMAIL_SERVER: "mail.company.ru"
       EMAIL_HOSTNAME: "noreplay@myhost.ru"
       BACKUP_THREADS: "4"
-      BACKUP_MODE: "delta"
+      BACKUP_MODE: "page"
 
   pgbouncer:
 #    image: grufos/pgbouncer:1.17.0
diff --git a/12/postgres-service_pgb.yml b/12/postgres-service_pgb.yml
@@ -35,7 +35,7 @@ services:
       EMAIL_SERVER: "mail.company.ru"
       EMAIL_HOSTNAME: "noreplay@myhost.ru"
       BACKUP_THREADS: "4"
-      BACKUP_MODE: "delta"
+      BACKUP_MODE: "page"
 
   pgbouncer:
 #    image: grufos/pgbouncer:1.17.0
diff --git a/13/docker-postgres/postgresql.conf b/13/docker-postgres/postgresql.conf
@@ -235,7 +235,7 @@ checkpoint_completion_target = 0.9	# checkpoint target duration, 0.0 - 1.0
 
 archive_mode = on		# enables archiving; off, on, or always
 				# (change requires restart)
-archive_command = 'if [ -f archive_pause.trigger ]; then exit 1; else if [ -f archive_active.trigger ]; then pg_probackup-13 archive-push -B /mnt/pgbak --instance 13 --wal-file-path %p --wal-file-name %f -j 4 --batch-size=50; else exit 0; fi; fi'		# command to use to archive a logfile segment
+archive_command = 'if [ -f archive_pause.trigger ]; then exit 1; else if [ -f archive_active.trigger ]; then pg_probackup-13 archive-push -B /mnt/pgbak --instance 13 --wal-file-path %p --wal-file-name %f -j 4 --batch-size=10; else exit 0; fi; fi'		# command to use to archive a logfile segment
 				# placeholders: %p = path of file to archive
 				#               %f = file name only
 				# e.g. 'test ! -f /mnt/server/archivedir/%f && cp %p /mnt/server/archivedir/%f'
diff --git a/13/postgres-service.yml b/13/postgres-service.yml
@@ -35,5 +35,5 @@ services:
       EMAIL_SERVER: "mail.company.ru"
       EMAIL_HOSTNAME: "noreplay@myhost.ru"
       BACKUP_THREADS: "4"
-      BACKUP_MODE: "delta"
+      BACKUP_MODE: "page"
 
diff --git a/13/postgres-service_all.yml b/13/postgres-service_all.yml
@@ -35,7 +35,7 @@ services:
       EMAIL_SERVER: "mail.company.ru"
       EMAIL_HOSTNAME: "noreplay@myhost.ru"
       BACKUP_THREADS: "4"
-      BACKUP_MODE: "delta"
+      BACKUP_MODE: "page"
 
   pgbouncer:
 #    image: grufos/pgbouncer:1.17.0
diff --git a/13/postgres-service_pgb.yml b/13/postgres-service_pgb.yml
@@ -35,7 +35,7 @@ services:
       EMAIL_SERVER: "mail.company.ru"
       EMAIL_HOSTNAME: "noreplay@myhost.ru"
       BACKUP_THREADS: "4"
-      BACKUP_MODE: "delta"
+      BACKUP_MODE: "page"
 
   pgbouncer:
 #    image: grufos/pgbouncer:1.17.0
diff --git a/14/docker-postgres/postgresql.conf b/14/docker-postgres/postgresql.conf
@@ -239,7 +239,7 @@ min_wal_size = 160MB
 
 archive_mode = on		# enables archiving; off, on, or always
 				# (change requires restart)
-archive_command = 'if [ -f archive_pause.trigger ]; then exit 1; else if [ -f archive_active.trigger ]; then pg_probackup-14 archive-push -B /mnt/pgbak --instance 14 --wal-file-path %p --wal-file-name %f -j 4 --batch-size=50; else exit 0; fi; fi'		# command to use to archive a logfile segment
+archive_command = 'if [ -f archive_pause.trigger ]; then exit 1; else if [ -f archive_active.trigger ]; then pg_probackup-14 archive-push -B /mnt/pgbak --instance 14 --wal-file-path %p --wal-file-name %f -j 4 --batch-size=10; else exit 0; fi; fi'		# command to use to archive a logfile segment
 				# placeholders: %p = path of file to archive
 				#               %f = file name only
 				# e.g. 'test ! -f /mnt/server/archivedir/%f && cp %p /mnt/server/archivedir/%f'
diff --git a/14/postgres-service.yml b/14/postgres-service.yml
@@ -35,5 +35,5 @@ services:
       EMAIL_SERVER: "mail.company.ru"
       EMAIL_HOSTNAME: "noreplay@myhost.ru"
       BACKUP_THREADS: "4"
-      BACKUP_MODE: "delta"
+      BACKUP_MODE: "page"
 
diff --git a/14/postgres-service_all.yml b/14/postgres-service_all.yml
@@ -35,7 +35,7 @@ services:
       EMAIL_SERVER: "mail.company.ru"
       EMAIL_HOSTNAME: "noreplay@myhost.ru"
       BACKUP_THREADS: "4"
-      BACKUP_MODE: "delta"
+      BACKUP_MODE: "page"
 
   pgbouncer:
 #    image: grufos/pgbouncer:1.17.0
diff --git a/14/postgres-service_pgb.yml b/14/postgres-service_pgb.yml
@@ -35,7 +35,7 @@ services:
       EMAIL_SERVER: "mail.company.ru"
       EMAIL_HOSTNAME: "noreplay@myhost.ru"
       BACKUP_THREADS: "4"
-      BACKUP_MODE: "delta"
+      BACKUP_MODE: "page"
 
   pgbouncer:
 #    image: grufos/pgbouncer:1.17.0
diff --git a/15/bin/harbor_push.sh b/15/bin/harbor_push.sh
@@ -0,0 +1,91 @@
+#!/bin/bash
+VERSION=15
+MINOR=4
+PROJECT=dba_postgres
+URL=harbor.company.ru
+
+set -euo pipefail
+
+# pgbouncer
+echo "========="
+echo "pgbouncer"
+echo "========="
+if ! docker image ls | grep "${URL}/${PROJECT}/pgbouncer" ; then
+    echo "    push ..."
+    docker tag ${VERSION}_pgbouncer:latest ${URL}/${PROJECT}/pgbouncer:latest
+    docker push ${URL}/${PROJECT}/pgbouncer:latest
+    docker tag ${URL}/${PROJECT}/pgbouncer:latest  ${URL}/${PROJECT}/pgbouncer:1.20.1
+    docker push ${URL}/${PROJECT}/pgbouncer:1.20.1
+fi
+
+# postgres
+echo "========"
+echo "postgres"
+echo "========"
+if ! docker image ls | grep "${URL}/${PROJECT}/postgres" ; then
+    echo "    push ..."
+    docker tag ${VERSION}_postgres:latest ${URL}/${PROJECT}/postgres:latest
+    docker push ${URL}/${PROJECT}/postgres:latest
+    docker tag ${URL}/${PROJECT}/postgres:latest ${URL}/${PROJECT}/postgres:${VERSION}.${MINOR}
+    docker push ${URL}/${PROJECT}/postgres:${VERSION}.${MINOR}
+fi
+
+# pgupgrade
+echo "========="
+echo "pgupgrade"
+echo "========="
+if ! docker image ls | grep "${URL}/${PROJECT}/pgupgrade" ; then
+    echo "    push ..."
+    docker tag ${VERSION}_pgupgrade:latest ${URL}/${PROJECT}/pgupgrade:latest
+    docker push ${URL}/${PROJECT}/pgupgrade:latest
+    docker tag ${URL}/${PROJECT}/pgupgrade:latest ${URL}/${PROJECT}/pgupgrade:${VERSION}.${MINOR}
+    docker push ${URL}/${PROJECT}/pgupgrade:${VERSION}.${MINOR}
+fi
+
+# pganalyze
+echo "========="
+echo "pganalyze"
+echo "========="
+if ! docker image ls | grep "${URL}/${PROJECT}/pganalyze" ; then
+    echo "    push ..."
+    docker tag ${VERSION}_analyze:latest ${URL}/${PROJECT}/pganalyze:latest
+    docker push ${URL}/${PROJECT}/pganalyze:latest
+    docker tag ${URL}/${PROJECT}/pganalyze:latest ${URL}/${PROJECT}/pganalyze:${VERSION}.${MINOR}
+    docker push ${URL}/${PROJECT}/pganalyze:${VERSION}.${MINOR}
+fi
+
+# pgprobackup
+echo "==========="
+echo "pgprobackup"
+echo "==========="
+if ! docker image ls | grep "${URL}/${PROJECT}/pgprobackup" ; then
+    echo "    push ..."
+    docker tag ${VERSION}_pgprobackup_backup:latest ${URL}/${PROJECT}/pgprobackup:latest
+    docker push ${URL}/${PROJECT}/pgprobackup:latest
+    docker tag ${URL}/${PROJECT}/pgprobackup:latest ${URL}/${PROJECT}/pgprobackup:${VERSION}.${MINOR}_2.5.12
+    docker push ${URL}/${PROJECT}/pgprobackup:${VERSION}.${MINOR}_2.5.12
+fi
+
+# pgprorestore
+echo "============"
+echo "pgprorestore"
+echo "============"
+if ! docker image ls | grep "${URL}/${PROJECT}/pgprorestore" ; then
+    echo "    push ..."
+    docker tag ${VERSION}_pgprobackup_restore:latest ${URL}/${PROJECT}/pgprorestore:latest
+    docker push ${URL}/${PROJECT}/pgprorestore:latest
+    docker tag ${URL}/${PROJECT}/pgprorestore:latest ${URL}/${PROJECT}/pgprorestore:${VERSION}.${MINOR}_2.5.12
+    docker push ${URL}/${PROJECT}/pgprorestore:${VERSION}.${MINOR}_2.5.12
+fi
+
+# mamonsu
+echo "======="
+echo "mamonsu"
+echo "======="
+if ! docker image ls | grep "${URL}/${PROJECT}/mamonsu" ; then
+    echo "    push ..."
+    docker tag ${VERSION}_mamonsu:latest ${URL}/${PROJECT}/mamonsu:latest
+    docker push ${URL}/${PROJECT}/mamonsu:latest
+    docker tag ${URL}/${PROJECT}/mamonsu:latest ${URL}/${PROJECT}/mamonsu:${VERSION}_3.5.5
+    docker push ${URL}/${PROJECT}/mamonsu:${VERSION}_3.5.5
+fi
diff --git a/15/docker-pgupgrade/postgresql.conf b/15/docker-pgupgrade/postgresql.conf
@@ -253,7 +253,7 @@ archive_mode = on		# enables archiving; off, on, or always
 #archive_library = ''		# library to use to archive a logfile segment
 				# (empty string indicates archive_command should
 				# be used)
-archive_command = 'if [ -f archive_pause.trigger ]; then exit 1; else if [ -f archive_active.trigger ]; then pg_probackup-15 archive-push -B /mnt/pgbak --instance 15 --wal-file-path %p --wal-file-name %f -j 4 --batch-size=50; else exit 0; fi; fi'		# command to use to archive a logfile segment
+archive_command = 'if [ -f archive_pause.trigger ]; then exit 1; else if [ -f archive_active.trigger ]; then pg_probackup-15 archive-push -B /mnt/pgbak --instance 15 --wal-file-path %p --wal-file-name %f -j 4 --batch-size=10; else exit 0; fi; fi'		# command to use to archive a logfile segment
 				# placeholders: %p = path of file to archive
 				#               %f = file name only
 				# e.g. 'test ! -f /mnt/server/archivedir/%f && cp %p /mnt/server/archivedir/%f'
diff --git a/15/docker-postgres/postgresql.conf b/15/docker-postgres/postgresql.conf
@@ -253,7 +253,7 @@ archive_mode = on		# enables archiving; off, on, or always
 #archive_library = ''		# library to use to archive a logfile segment
 				# (empty string indicates archive_command should
 				# be used)
-archive_command = 'if [ -f archive_pause.trigger ]; then exit 1; else if [ -f archive_active.trigger ]; then pg_probackup-15 archive-push -B /mnt/pgbak --instance 15 --wal-file-path %p --wal-file-name %f -j 4 --batch-size=50; else exit 0; fi; fi'		# command to use to archive a logfile segment
+archive_command = 'if [ -f archive_pause.trigger ]; then exit 1; else if [ -f archive_active.trigger ]; then pg_probackup-15 archive-push -B /mnt/pgbak --instance 15 --wal-file-path %p --wal-file-name %f -j 4 --batch-size=10; else exit 0; fi; fi'		# command to use to archive a logfile segment
 				# placeholders: %p = path of file to archive
 				#               %f = file name only
 				# e.g. 'test ! -f /mnt/server/archivedir/%f && cp %p /mnt/server/archivedir/%f'
diff --git a/README.md b/README.md
@@ -227,7 +227,7 @@ $ docker exec 15_postgres_1 /bin/bash -c 'su - postgres -c "echo ALTER DATABASE
 
 ```
 archive_command:
-if [ -f archive_pause.trigger ]; then exit 1; else if [ -f archive_active.trigger ]; then pg_probackup-15 archive-push -B /mnt/pgbak --instance 15 --wal-file-path %p --wal-file-name %f -j 4 --batch-size=50; else exit 0; fi; fi
+if [ -f archive_pause.trigger ]; then exit 1; else if [ -f archive_active.trigger ]; then pg_probackup-15 archive-push -B /mnt/pgbak --instance 15 --wal-file-path %p --wal-file-name %f -j 4 --batch-size=10; else exit 0; fi; fi
 
 restore_command:
 if [ -f archive_active.trigger ]; then pg_probackup-15 archive-get -B /mnt/pgbak --instance 15 --wal-file-path %p --wal-file-name %f; else exit 0; fi
