From: Rafael dos Santos Silva Date: Tue, 12 May 2020 15:25:53 +0000 (-0300) Subject: PostgreSQL 12 (#462) X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4cdd4c8ab272b9f24cdab45150400ba09df3c2cd;p=discourse_docker.git PostgreSQL 12 (#462) --- diff --git a/image/base/Dockerfile b/image/base/Dockerfile index fa5bcdb..694dd26 100644 --- a/image/base/Dockerfile +++ b/image/base/Dockerfile @@ -2,7 +2,7 @@ # VERSION: release FROM debian:buster-slim -ENV PG_MAJOR 10 +ENV PG_MAJOR 12 ENV RUBY_ALLOCATOR /usr/lib/libjemalloc.so.1 ENV RAILS_ENV production diff --git a/templates/postgres.12.template.yml b/templates/postgres.12.template.yml new file mode 100644 index 0000000..20cd5d8 --- /dev/null +++ b/templates/postgres.12.template.yml @@ -0,0 +1,173 @@ +params: + db_synchronous_commit: "off" + db_shared_buffers: "256MB" + db_work_mem: "10MB" + db_default_text_search_config: "pg_catalog.english" + db_name: discourse + db_user: discourse + db_wal_level: minimal + db_max_wal_senders: 0 + db_checkpoint_segments: 6 + db_logging_collector: off + db_log_min_duration_statement: 100 + +hooks: + before_code: + - replace: + filename: /etc/service/unicorn/run + from: "# postgres" + to: sv start postgres || exit 1 + +run: + - exec: mkdir -p /shared/postgres_run + - exec: chown postgres:postgres /shared/postgres_run + - exec: chmod 775 /shared/postgres_run + - exec: rm -fr /var/run/postgresql + - exec: ln -s /shared/postgres_run /var/run/postgresql + - exec: socat /dev/null UNIX-CONNECT:/shared/postgres_run/.s.PGSQL.5432 || exit 0 && echo postgres already running stop container ; exit 1 + - exec: rm -fr /shared/postgres_run/.s* + - exec: rm -fr /shared/postgres_run/*.pid + - exec: mkdir -p /shared/postgres_run/12-main.pg_stat_tmp + - exec: chown postgres:postgres /shared/postgres_run/12-main.pg_stat_tmp + - file: + path: /etc/service/postgres/run + chmod: "+x" + contents: | + #!/bin/sh + exec 2>&1 + HOME=/var/lib/postgresql USER=postgres exec chpst -u postgres:postgres:ssl-cert -U postgres:postgres:ssl-cert /usr/lib/postgresql/12/bin/postmaster -D /etc/postgresql/12/main + + - file: + path: /etc/runit/3.d/99-postgres + chmod: "+x" + contents: | + #!/bin/bash + sv stop postgres + + - exec: + cmd: + - chown -R root /var/lib/postgresql/12/main + - "[ ! -e /shared/postgres_data ] && install -d -m 0755 -o postgres -g postgres /shared/postgres_data && sudo -E -u postgres /usr/lib/postgresql/12/bin/initdb -D /shared/postgres_data || exit 0" + - chown -R postgres:postgres /shared/postgres_data + - chown -R postgres:postgres /var/run/postgresql + + - replace: + filename: "/etc/postgresql/12/main/postgresql.conf" + from: "data_directory = '/var/lib/postgresql/12/main'" + to: "data_directory = '/shared/postgres_data'" + + # listen on all interfaces + - replace: + filename: "/etc/postgresql/12/main/postgresql.conf" + from: /#?listen_addresses *=.*/ + to: "listen_addresses = '*'" + + # sync commit off is faster and less spiky, also marginally less safe + - replace: + filename: "/etc/postgresql/12/main/postgresql.conf" + from: /#?synchronous_commit *=.*/ + to: "synchronous_commit = $db_synchronous_commit" + + # default is 128MB which is way too small + - replace: + filename: "/etc/postgresql/12/main/postgresql.conf" + from: /#?shared_buffers *=.*/ + to: "shared_buffers = $db_shared_buffers" + + # default is 1MB which is too small + - replace: + filename: "/etc/postgresql/12/main/postgresql.conf" + from: /#?work_mem *=.*/ + to: "work_mem = $db_work_mem" + + # allow for other + - replace: + filename: "/etc/postgresql/12/main/postgresql.conf" + from: /#?default_text_search_config *=.*/ + to: "default_text_search_config = '$db_default_text_search_config'" + + # Necessary to enable backups + - exec: + cmd: + - install -d -m 0755 -o postgres -g postgres /shared/postgres_backup + + - replace: + filename: "/etc/postgresql/12/main/postgresql.conf" + from: /#?max_wal_senders *=.*/ + to: "max_wal_senders = $db_max_wal_senders" + + - replace: + filename: "/etc/postgresql/12/main/postgresql.conf" + from: /#?wal_level *=.*/ + to: "wal_level = $db_wal_level" + + - replace: + filename: "/etc/postgresql/12/main/postgresql.conf" + from: /#?checkpoint_segments *=.*/ + to: "checkpoint_segments = $db_checkpoint_segments" + + - replace: + filename: "/etc/postgresql/12/main/postgresql.conf" + from: /#?logging_collector *=.*/ + to: "logging_collector = $db_logging_collector" + + - replace: + filename: "/etc/postgresql/12/main/postgresql.conf" + from: /#?log_min_duration_statement *=.*/ + to: "log_min_duration_statement = $db_log_min_duration_statement" + + - replace: + filename: "/etc/postgresql/12/main/pg_hba.conf" + from: /^#local +replication +postgres +peer$/ + to: "local replication postgres peer" + + # allow all to connect in with md5 auth + - replace: + filename: "/etc/postgresql/12/main/pg_hba.conf" + from: /^host.*all.*all.*127.*$/ + to: "host all all 0.0.0.0/0 md5" + + - exec: + background: true + # use fast shutdown for pg + stop_signal: INT + cmd: HOME=/var/lib/postgresql USER=postgres exec chpst -u postgres:postgres:ssl-cert -U postgres:postgres:ssl-cert /usr/lib/postgresql/12/bin/postmaster -D /etc/postgresql/12/main + + # give db a few secs to start up + - exec: "sleep 5" + + - exec: su postgres -c 'createdb $db_name' || true + - exec: su postgres -c 'psql $db_name -c "create user $db_user;"' || true + - exec: su postgres -c 'psql $db_name -c "grant all privileges on database $db_name to $db_user;"' || true + - exec: su postgres -c 'psql $db_name -c "alter schema public owner to $db_user;"' + - exec: su postgres -c 'psql template1 -c "create extension if not exists hstore;"' + - exec: su postgres -c 'psql template1 -c "create extension if not exists pg_trgm;"' + - exec: su postgres -c 'psql $db_name -c "create extension if not exists hstore;"' + - exec: su postgres -c 'psql $db_name -c "create extension if not exists pg_trgm;"' + - exec: + stdin: | + update pg_database set encoding = pg_char_to_encoding('UTF8') where datname = '$db_name' AND encoding = pg_char_to_encoding('SQL_ASCII'); + cmd: sudo -u postgres psql $db_name + raise_on_fail: false + + - file: + path: /var/lib/postgresql/take-database-backup + chown: postgres:postgres + chmod: "+x" + contents: | + #!/bin/bash + ID=db-$(date +%F_%T) + FILENAME=/shared/postgres_backup/$ID.tar.gz + pg_basebackup --format=tar --pgdata=- --xlog --gzip --label=$ID > $FILENAME + echo $FILENAME + + - file: + path: /var/spool/cron/crontabs/postgres + contents: | + # m h dom mon dow command + #MAILTO=? + #0 */4 * * * /var/lib/postgresql/take-database-backup + + - exec: + hook: postgres + cmd: "echo postgres installed!" diff --git a/templates/postgres.template.yml b/templates/postgres.template.yml index 681551c..6731da0 100644 --- a/templates/postgres.template.yml +++ b/templates/postgres.template.yml @@ -28,15 +28,15 @@ run: - exec: socat /dev/null UNIX-CONNECT:/shared/postgres_run/.s.PGSQL.5432 || exit 0 && echo postgres already running stop container ; exit 1 - exec: rm -fr /shared/postgres_run/.s* - exec: rm -fr /shared/postgres_run/*.pid - - exec: mkdir -p /shared/postgres_run/10-main.pg_stat_tmp - - exec: chown postgres:postgres /shared/postgres_run/10-main.pg_stat_tmp + - exec: mkdir -p /shared/postgres_run/12-main.pg_stat_tmp + - exec: chown postgres:postgres /shared/postgres_run/12-main.pg_stat_tmp - file: path: /etc/service/postgres/run chmod: "+x" contents: | #!/bin/sh exec 2>&1 - HOME=/var/lib/postgresql USER=postgres exec thpoff chpst -u postgres:postgres:ssl-cert -U postgres:postgres:ssl-cert /usr/lib/postgresql/10/bin/postmaster -D /etc/postgresql/10/main + HOME=/var/lib/postgresql USER=postgres exec thpoff chpst -u postgres:postgres:ssl-cert -U postgres:postgres:ssl-cert /usr/lib/postgresql/12/bin/postmaster -D /etc/postgresql/12/main - file: path: /etc/service/postgres/log/run @@ -60,8 +60,8 @@ run: #!/bin/bash PG_MAJOR_OLD=`cat /shared/postgres_data/PG_VERSION` - if [ ! "10" = "$PG_MAJOR_OLD" ]; then - echo Upgrading PostgreSQL from version ${PG_MAJOR_OLD} to 10 + if [ ! "12" = "$PG_MAJOR_OLD" ]; then + echo Upgrading PostgreSQL from version ${PG_MAJOR_OLD} to 12 free_disk=$(df /shared | tail -n 1 | awk '{print $4}') required=$(($(du -s /shared/postgres_data | awk '{print $1}') * 2)) @@ -69,15 +69,15 @@ run: echo "WARNING: Upgrading PostgresSQL would require an addtional $(numfmt --to=si $(($required - $free_disk))) of disk space" echo "Please free up some space, or expand your disk, before continuing." echo '' - echo 'To avoid upgrading change "templates/postgres.template.yml" TO "templates/postgres.9.5.template.yml" in containers/app.yml' + echo 'To avoid upgrading change "templates/postgres.template.yml" TO "templates/postgres.10.template.yml" in containers/app.yml' exit 1 fi rm -fr /shared/postgres_data_new - install -d -m 0755 -o postgres -g postgres /shared/postgres_data_new && sudo -u postgres /usr/lib/postgresql/10/bin/initdb -D /shared/postgres_data_new || exit 0 + install -d -m 0755 -o postgres -g postgres /shared/postgres_data_new && sudo -u postgres /usr/lib/postgresql/12/bin/initdb -D /shared/postgres_data_new || exit 0 apt-get update apt-get install -y postgresql-${PG_MAJOR_OLD} - chown -R postgres:postgres /var/lib/postgresql/10 + chown -R postgres:postgres /var/lib/postgresql/12 /etc/init.d/postgresql stop rm -fr /shared/postgres_data/postmaster.pid cd ~postgres @@ -85,7 +85,7 @@ run: echo >> /shared/postgres_data/postgresql.conf echo "data_directory = '/shared/postgres_data'" >> /shared/postgres_data/postgresql.conf SUCCESS=true - sudo -u postgres /usr/lib/postgresql/10/bin/pg_upgrade -d /shared/postgres_data -D /shared/postgres_data_new -b /usr/lib/postgresql/${PG_MAJOR_OLD}/bin -B /usr/lib/postgresql/10/bin || SUCCESS=false + sudo -u postgres /usr/lib/postgresql/12/bin/pg_upgrade -d /shared/postgres_data -D /shared/postgres_data_new -b /usr/lib/postgresql/${PG_MAJOR_OLD}/bin -B /usr/lib/postgresql/12/bin || SUCCESS=false if [[ "$SUCCESS" == 'false' ]]; then echo ------------------------------------------------------------------------------------- @@ -94,8 +94,8 @@ run: echo You are going to need to export your data and import into a clean instance: echo - if [ "$PG_MAJOR_OLD" = "9.5" ]; then - echo 'In containers/app.yml: Change "templates/postgres.template.yml" TO "templates/postgres.9.5.template.yml"' + if [ "$PG_MAJOR_OLD" = "10" ]; then + echo 'In containers/app.yml: Change "templates/postgres.template.yml" TO "templates/postgres.10.template.yml"' echo fi @@ -103,11 +103,11 @@ run: echo echo When your instance is running: echo Run "./launcher enter app" - echo "Run apt-get remove postgresql-client-9.5 && apt-get install postgresql-client-10" + echo "Run apt-get remove postgresql-client-10 && apt-get install postgresql-client-12" echo Run "cd /shared/postgres_backup && sudo -u postgres pg_dump discourse > backup.db" echo - if [ "$PG_MAJOR_OLD" = "9.5" ]; then + if [ "$PG_MAJOR_OLD" = "10" ]; then echo Undo the base_image in your container config fi @@ -144,8 +144,8 @@ run: - exec: cmd: - - chown -R root /var/lib/postgresql/10/main - - "[ ! -e /shared/postgres_data ] && install -d -m 0755 -o postgres -g postgres /shared/postgres_data && sudo -E -u postgres /usr/lib/postgresql/10/bin/initdb -D /shared/postgres_data || exit 0" + - chown -R root /var/lib/postgresql/12/main + - "[ ! -e /shared/postgres_data ] && install -d -m 0755 -o postgres -g postgres /shared/postgres_data && sudo -E -u postgres /usr/lib/postgresql/12/bin/initdb -D /shared/postgres_data || exit 0" - chown -R postgres:postgres /shared/postgres_data - chown -R postgres:postgres /var/run/postgresql @@ -153,37 +153,37 @@ run: - exec: rm /root/upgrade_postgres - replace: - filename: "/etc/postgresql/10/main/postgresql.conf" - from: "data_directory = '/var/lib/postgresql/10/main'" + filename: "/etc/postgresql/12/main/postgresql.conf" + from: "data_directory = '/var/lib/postgresql/12/main'" to: "data_directory = '/shared/postgres_data'" # listen on all interfaces - replace: - filename: "/etc/postgresql/10/main/postgresql.conf" + filename: "/etc/postgresql/12/main/postgresql.conf" from: /#?listen_addresses *=.*/ to: "listen_addresses = '*'" # sync commit off is faster and less spiky, also marginally less safe - replace: - filename: "/etc/postgresql/10/main/postgresql.conf" + filename: "/etc/postgresql/12/main/postgresql.conf" from: /#?synchronous_commit *=.*/ to: "synchronous_commit = $db_synchronous_commit" # default is 128MB which is way too small - replace: - filename: "/etc/postgresql/10/main/postgresql.conf" + filename: "/etc/postgresql/12/main/postgresql.conf" from: /#?shared_buffers *=.*/ to: "shared_buffers = $db_shared_buffers" # default is 1MB which is too small - replace: - filename: "/etc/postgresql/10/main/postgresql.conf" + filename: "/etc/postgresql/12/main/postgresql.conf" from: /#?work_mem *=.*/ to: "work_mem = $db_work_mem" # allow for other - replace: - filename: "/etc/postgresql/10/main/postgresql.conf" + filename: "/etc/postgresql/12/main/postgresql.conf" from: /#?default_text_search_config *=.*/ to: "default_text_search_config = '$db_default_text_search_config'" @@ -193,38 +193,38 @@ run: - install -d -m 0755 -o postgres -g postgres /shared/postgres_backup - replace: - filename: "/etc/postgresql/10/main/postgresql.conf" + filename: "/etc/postgresql/12/main/postgresql.conf" from: /#?max_wal_senders *=.*/ to: "max_wal_senders = $db_max_wal_senders" - replace: - filename: "/etc/postgresql/10/main/postgresql.conf" + filename: "/etc/postgresql/12/main/postgresql.conf" from: /#?wal_level *=.*/ to: "wal_level = $db_wal_level" - replace: - filename: "/etc/postgresql/10/main/postgresql.conf" + filename: "/etc/postgresql/12/main/postgresql.conf" from: /#?checkpoint_segments *=.*/ to: "checkpoint_segments = $db_checkpoint_segments" - replace: - filename: "/etc/postgresql/10/main/postgresql.conf" + filename: "/etc/postgresql/12/main/postgresql.conf" from: /#?logging_collector *=.*/ to: "logging_collector = $db_logging_collector" - replace: - filename: "/etc/postgresql/10/main/postgresql.conf" + filename: "/etc/postgresql/12/main/postgresql.conf" from: /#?log_min_duration_statement *=.*/ to: "log_min_duration_statement = $db_log_min_duration_statement" - replace: - filename: "/etc/postgresql/10/main/pg_hba.conf" + filename: "/etc/postgresql/12/main/pg_hba.conf" from: /^#local +replication +postgres +peer$/ to: "local replication postgres peer" # allow all to connect in with md5 auth - replace: - filename: "/etc/postgresql/10/main/pg_hba.conf" + filename: "/etc/postgresql/12/main/pg_hba.conf" from: /^host.*all.*all.*127.*$/ to: "host all all 0.0.0.0/0 md5" @@ -232,7 +232,7 @@ run: background: true # use fast shutdown for pg stop_signal: INT - cmd: HOME=/var/lib/postgresql USER=postgres exec chpst -u postgres:postgres:ssl-cert -U postgres:postgres:ssl-cert /usr/lib/postgresql/10/bin/postmaster -D /etc/postgresql/10/main + cmd: HOME=/var/lib/postgresql USER=postgres exec chpst -u postgres:postgres:ssl-cert -U postgres:postgres:ssl-cert /usr/lib/postgresql/12/bin/postmaster -D /etc/postgresql/12/main # give db a few secs to start up - exec: "sleep 5"