Skip to content

Commit 87036e8

Browse files
VonngVonng
committed
upgrade citus to v11
1 parent a9616e5 commit 87036e8

File tree

12 files changed

+93
-73
lines changed

12 files changed

+93
-73
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@ Please upgrade postgres to 14.4 ASAP.
88

99
### Software Upgrade
1010

11-
* upgrade postgres to 14.4
12-
* Upgrade haproxy to 2.6.0
13-
* Upgrade grafana to 9.0.0
11+
* upgrade postgres to 14.4 (important bug fix)
12+
* upgrade citus to 11.0-2 (with enterprise features)
13+
* upgrade timescaledb to 2.7 (more continuous aggregates)
14+
* Upgrade patroni to 2.1.4 (new sync health-check)
15+
* Upgrade haproxy to 2.6.0 (cli, reload, ssl,...)
16+
* Upgrade grafana to 9.0.0 (new ui)
1417
* Upgrade prometheus 2.36.0
15-
* Upgrade patroni to 2.1.4
18+
1619

1720
### Bug fix:
1821

@@ -21,10 +24,12 @@ Please upgrade postgres to 14.4 ASAP.
2124
* remove i686 packages when using repotrack under el7
2225
* Fix redis service systemctl enabled issue
2326
* Fix patroni systemctl service enabled=no by default issue
27+
* stop vip-manager when purging existing postgres
2428

2529
### API Changes
2630

2731
* Mark `grafana_database` and `grafana_pgurl` as obsolete
32+
* Add some new etcd & pgsql alias (optional)
2833

2934
### New Apps
3035

‎files/conf/pigsty-auto.yml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,11 @@ all:
197197
- name: timescaledb
198198
description: TimescaleDB for RHEL/CentOS $releasever - $basearch
199199
gpgcheck: no
200-
baseurl:
201-
- https://packagecloud.io/timescale/timescaledb/el/7/$basearch
200+
baseurl: https://packagecloud.io/timescale/timescaledb/el/$releasever/$basearch
201+
- name: citus
202+
description: Citus Community
203+
gpgcheck: no
204+
baseurl: https://repos.citusdata.com/community/el/$releasever/$basearch
202205
- name: centos-sclo
203206
description: CentOS-$releasever - SCLo
204207
gpgcheck: no
@@ -244,7 +247,7 @@ all:
244247
- python3 python3-psycopg2 python36-requests python3-etcd python3-consul python36-urllib3 python36-idna python36-pyOpenSSL python36-cryptography
245248
- patroni patroni-consul patroni-etcd pgbouncer pg_cli pgbadger pg_activity tail_n_mail # -- pgsql common - #
246249
- pgcenter boxinfo check_postgres emaj pgbconsole pg_bloat_check pgquarrel barman barman-cli pgloader pgFormatter pitrery pspg pgxnclient PyGreSQL
247-
- postgresql14* postgis32_14* citus_14* pglogical_14* timescaledb-2-postgresql-14 pg_repack_14 wal2json_14 # -- pg14 packages -#
250+
- postgresql14* postgis32_14* pglogical_14* citus110_14 timescaledb-2-postgresql-14 pg_repack_14 wal2json_14 # -- pg14 packages -#
248251
- pg_qualstats_14 pg_stat_kcache_14 pg_stat_monitor_14 pg_top_14 pg_track_settings_14 pg_wait_sampling_14 pg_probackup-std-14
249252
- pg_statement_rollback_14 system_stats_14 plproxy_14 plsh_14 pldebugger_14 plpgsql_check_14 pgmemcache_14 # plr_14
250253
- mysql_fdw_14 ogr_fdw_14 tds_fdw_14 sqlite_fdw_14 firebird_fdw_14 hdfs_fdw_14 mongo_fdw_14 osm_fdw_14 pgbouncer_fdw_14
@@ -513,16 +516,14 @@ all:
513516
pg_bin_dir: /usr/pgsql/bin # postgres binary dir, default is /usr/pgsql/bin, which use /usr/pgsql -> /usr/pgsql-{ver}
514517
pg_packages: # postgresql related packages. `${pg_version} will be replaced by `pg_version`
515518
- postgresql${pg_version}* # postgresql kernel packages
516-
- postgis32_${pg_version}* # postgis
517-
- citus_${pg_version}* # citus
518-
- timescaledb-2-postgresql-${pg_version} # timescaledb
519+
- postgis32_${pg_version}* citus110_${pg_version} timescaledb-2-postgresql-${pg_version}
519520
- pgbouncer pg_exporter pgbadger pg_activity node_exporter consul haproxy vip-manager
520521
- patroni patroni-consul patroni-etcd python3 python3-psycopg2 python36-requests python3-etcd
521522
- python3-consul python36-urllib3 python36-idna python36-pyOpenSSL python36-cryptography
522523
pg_extensions: # postgresql extensions, `${pg_version} will be replaced by actual `pg_version`
523524
- pg_repack_${pg_version} pg_qualstats_${pg_version} pg_stat_kcache_${pg_version} pg_stat_monitor_${pg_version} wal2json_${pg_version}
524525
# - ogr_fdw${pg_version} mysql_fdw_${pg_version} redis_fdw_${pg_version} mongo_fdw${pg_version} hdfs_fdw_${pg_version}
525-
# - count_distinct${version} ddlx_${version} geoip${version} orafce${version}
526+
# - count_distinct${version} ddlx_${version} geoip${version} orafce${version} pg_ivm_${version} multicorm2_${version}
526527
# - hypopg_${version} ip4r${version} jsquery_${version} logerrors_${version} periods_${version} pg_auto_failover_${version} pg_catcheck${version}
527528
# - pg_fkpart${version} pg_jobmon${version} pg_partman${version} pg_prioritize_${version} pg_track_settings${version} pgaudit15_${version}
528529
# - pgcryptokey${version} pgexportdoc${version} pgimportdoc${version} pgmemcache-${version} pgmp${version} pgq-${version} pgquarrel pgrouting_${version}

‎files/conf/pigsty-citus.yml‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ all:
6565
pg_cluster: pg-meta
6666
vip_address: 10.10.10.2
6767
pg_users: [ { name: citus , password: citus , pgbouncer: true , roles: [ dbrole_admin ] } ]
68-
pg_databases: [ { name: meta , owner: citus , extensions: [ { name: citus } ] } ]
68+
pg_databases: [ { name: meta , owner: citus , extensions: [ { name: citus }, { name: postgis, schema: public } ] } ]
6969

7070
#----------------------------------#
7171
# cluster: citus data nodes
@@ -77,7 +77,7 @@ all:
7777
pg_cluster: pg-node1
7878
vip_address: 10.10.10.3
7979
pg_users: [ { name: citus , password: citus , pgbouncer: true , roles: [ dbrole_admin ] } ]
80-
pg_databases: [ { name: meta , owner: citus , extensions: [ { name: citus } ] } ]
80+
pg_databases: [ { name: meta , owner: citus , extensions: [ { name: citus }, { name: postgis, schema: public } ] } ]
8181

8282
pg-node2:
8383
hosts:
@@ -86,7 +86,7 @@ all:
8686
pg_cluster: pg-node2
8787
vip_address: 10.10.10.4
8888
pg_users: [ { name: citus , password: citus , pgbouncer: true , roles: [ dbrole_admin ] } ]
89-
pg_databases: [ { name: meta , owner: citus , extensions: [ { name: citus } ] } ]
89+
pg_databases: [ { name: meta , owner: citus , extensions: [ { name: citus }, { name: postgis, schema: public } ] } ]
9090

9191
pg-node3:
9292
hosts:
@@ -95,7 +95,7 @@ all:
9595
pg_cluster: pg-node3
9696
vip_address: 10.10.10.5
9797
pg_users: [ { name: citus , password: citus , pgbouncer: true , roles: [ dbrole_admin ] } ]
98-
pg_databases: [ { name: meta , owner: citus , extensions: [ { name: citus } ] } ]
98+
pg_databases: [ { name: meta , owner: citus , extensions: [ { name: citus }, { name: postgis, schema: public } ] } ]
9999

100100

101101
####################################################################
@@ -217,8 +217,11 @@ all:
217217
- name: timescaledb
218218
description: TimescaleDB for RHEL/CentOS $releasever - $basearch
219219
gpgcheck: no
220-
baseurl:
221-
- https://packagecloud.io/timescale/timescaledb/el/7/$basearch
220+
baseurl: https://packagecloud.io/timescale/timescaledb/el/$releasever/$basearch
221+
- name: citus
222+
description: Citus Community
223+
gpgcheck: no
224+
baseurl: https://repos.citusdata.com/community/el/$releasever/$basearch
222225
- name: centos-sclo
223226
description: CentOS-$releasever - SCLo
224227
gpgcheck: no
@@ -264,7 +267,7 @@ all:
264267
- python3 python3-psycopg2 python36-requests python3-etcd python3-consul python36-urllib3 python36-idna python36-pyOpenSSL python36-cryptography
265268
- patroni patroni-consul patroni-etcd pgbouncer pg_cli pgbadger pg_activity tail_n_mail # -- pgsql common - #
266269
- pgcenter boxinfo check_postgres emaj pgbconsole pg_bloat_check pgquarrel barman barman-cli pgloader pgFormatter pitrery pspg pgxnclient PyGreSQL
267-
- postgresql14* postgis32_14* citus_14* pglogical_14* timescaledb-2-postgresql-14 pg_repack_14 wal2json_14 # -- pg14 packages -#
270+
- postgresql14* postgis32_14* pglogical_14* citus110_14 timescaledb-2-postgresql-14 pg_repack_14 wal2json_14 # -- pg14 packages -#
268271
- pg_qualstats_14 pg_stat_kcache_14 pg_stat_monitor_14 pg_top_14 pg_track_settings_14 pg_wait_sampling_14 pg_probackup-std-14
269272
- pg_statement_rollback_14 system_stats_14 plproxy_14 plsh_14 pldebugger_14 plpgsql_check_14 pgmemcache_14 # plr_14
270273
- mysql_fdw_14 ogr_fdw_14 tds_fdw_14 sqlite_fdw_14 firebird_fdw_14 hdfs_fdw_14 mongo_fdw_14 osm_fdw_14 pgbouncer_fdw_14
@@ -389,8 +392,9 @@ all:
389392
# NODE_DNS
390393
#-----------------------------------------------------------------
391394
node_etc_hosts_default: # static dns records in /etc/hosts
392-
- 10.10.10.10 meta pigsty c.pigsty g.pigsty l.pigsty p.pigsty a.pigsty cli.pigsty lab.pigsty api.pigsty
393-
node_etc_hosts:
395+
- 10.10.10.10 meta pigsty p.pigsty g.pigsty a.pigsty c.pigsty l.pigsty
396+
- 10.10.10.10 api.pigsty adm.pigsty cli.pigsty ddl.pigsty lab.pigsty git.pigsty sss.pigsty
397+
node_etc_hosts: # extra static dns records in /etc/hosts
394398
- 10.10.10.10 meta
395399
- 10.10.10.11 node-1
396400
- 10.10.10.12 node-2
@@ -556,16 +560,14 @@ all:
556560
pg_bin_dir: /usr/pgsql/bin # postgres binary dir, default is /usr/pgsql/bin, which use /usr/pgsql -> /usr/pgsql-{ver}
557561
pg_packages: # postgresql related packages. `${pg_version} will be replaced by `pg_version`
558562
- postgresql${pg_version}* # postgresql kernel packages
559-
- postgis32_${pg_version}* # postgis
560-
- citus_${pg_version}* # citus
561-
- timescaledb-2-postgresql-${pg_version} # timescaledb
563+
- postgis32_${pg_version}* citus110_${pg_version} timescaledb-2-postgresql-${pg_version}
562564
- pgbouncer pg_exporter pgbadger pg_activity node_exporter consul haproxy vip-manager
563565
- patroni patroni-consul patroni-etcd python3 python3-psycopg2 python36-requests python3-etcd
564566
- python3-consul python36-urllib3 python36-idna python36-pyOpenSSL python36-cryptography
565567
pg_extensions: # postgresql extensions, `${pg_version} will be replaced by actual `pg_version`
566568
- pg_repack_${pg_version} pg_qualstats_${pg_version} pg_stat_kcache_${pg_version} pg_stat_monitor_${pg_version} wal2json_${pg_version}
567569
# - ogr_fdw${pg_version} mysql_fdw_${pg_version} redis_fdw_${pg_version} mongo_fdw${pg_version} hdfs_fdw_${pg_version}
568-
# - count_distinct${version} ddlx_${version} geoip${version} orafce${version}
570+
# - count_distinct${version} ddlx_${version} geoip${version} orafce${version} pg_ivm_${version} multicorm2_${version}
569571
# - hypopg_${version} ip4r${version} jsquery_${version} logerrors_${version} periods_${version} pg_auto_failover_${version} pg_catcheck${version}
570572
# - pg_fkpart${version} pg_jobmon${version} pg_partman${version} pg_prioritize_${version} pg_track_settings${version} pgaudit15_${version}
571573
# - pgcryptokey${version} pgexportdoc${version} pgimportdoc${version} pgmemcache-${version} pgmp${version} pgq-${version} pgquarrel pgrouting_${version}

‎files/conf/pigsty-dcs3.yml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,11 @@ all:
224224
- name: timescaledb
225225
description: TimescaleDB for RHEL/CentOS $releasever - $basearch
226226
gpgcheck: no
227-
baseurl:
228-
- https://packagecloud.io/timescale/timescaledb/el/7/$basearch
227+
baseurl: https://packagecloud.io/timescale/timescaledb/el/$releasever/$basearch
228+
- name: citus
229+
description: Citus Community
230+
gpgcheck: no
231+
baseurl: https://repos.citusdata.com/community/el/$releasever/$basearch
229232
- name: centos-sclo
230233
description: CentOS-$releasever - SCLo
231234
gpgcheck: no
@@ -271,7 +274,7 @@ all:
271274
- python3 python3-psycopg2 python36-requests python3-etcd python3-consul python36-urllib3 python36-idna python36-pyOpenSSL python36-cryptography
272275
- patroni patroni-consul patroni-etcd pgbouncer pg_cli pgbadger pg_activity tail_n_mail # -- pgsql common - #
273276
- pgcenter boxinfo check_postgres emaj pgbconsole pg_bloat_check pgquarrel barman barman-cli pgloader pgFormatter pitrery pspg pgxnclient PyGreSQL
274-
- postgresql14* postgis32_14* citus_14* pglogical_14* timescaledb-2-postgresql-14 pg_repack_14 wal2json_14 # -- pg14 packages -#
277+
- postgresql14* postgis32_14* pglogical_14* citus110_14 timescaledb-2-postgresql-14 pg_repack_14 wal2json_14 # -- pg14 packages -#
275278
- pg_qualstats_14 pg_stat_kcache_14 pg_stat_monitor_14 pg_top_14 pg_track_settings_14 pg_wait_sampling_14 pg_probackup-std-14
276279
- pg_statement_rollback_14 system_stats_14 plproxy_14 plsh_14 pldebugger_14 plpgsql_check_14 pgmemcache_14 # plr_14
277280
- mysql_fdw_14 ogr_fdw_14 tds_fdw_14 sqlite_fdw_14 firebird_fdw_14 hdfs_fdw_14 mongo_fdw_14 osm_fdw_14 pgbouncer_fdw_14
@@ -333,9 +336,6 @@ all:
333336
grafana_endpoint: http://10.10.10.10:3000 # grafana endpoint url
334337
grafana_admin_username: admin # default grafana admin username
335338
grafana_admin_password: pigsty # default grafana admin password
336-
grafana_database: sqlite3 # default grafana database type: sqlite3|postgres
337-
grafana_pgurl: postgres://dbuser_grafana:DBUser.Grafana@meta:5436/grafana
338-
339339
grafana_plugin_method: install # none|install|always, none will skip plugin install
340340
grafana_plugin_cache: /www/pigsty/plugins.tgz # path to grafana plugins cache tarball
341341
grafana_plugin_list: # plugins that will be downloaded via grafana-cli
@@ -548,16 +548,14 @@ all:
548548
pg_bin_dir: /usr/pgsql/bin # postgres binary dir, default is /usr/pgsql/bin, which use /usr/pgsql -> /usr/pgsql-{ver}
549549
pg_packages: # postgresql related packages. `${pg_version} will be replaced by `pg_version`
550550
- postgresql${pg_version}* # postgresql kernel packages
551-
- postgis32_${pg_version}* # postgis
552-
- citus_${pg_version}* # citus
553-
- timescaledb-2-postgresql-${pg_version} # timescaledb
551+
- postgis32_${pg_version}* citus110_${pg_version} timescaledb-2-postgresql-${pg_version}
554552
- pgbouncer pg_exporter pgbadger pg_activity node_exporter consul haproxy vip-manager
555553
- patroni patroni-consul patroni-etcd python3 python3-psycopg2 python36-requests python3-etcd
556554
- python3-consul python36-urllib3 python36-idna python36-pyOpenSSL python36-cryptography
557555
pg_extensions: # postgresql extensions, `${pg_version} will be replaced by actual `pg_version`
558556
- pg_repack_${pg_version} pg_qualstats_${pg_version} pg_stat_kcache_${pg_version} pg_stat_monitor_${pg_version} wal2json_${pg_version}
559557
# - ogr_fdw${pg_version} mysql_fdw_${pg_version} redis_fdw_${pg_version} mongo_fdw${pg_version} hdfs_fdw_${pg_version}
560-
# - count_distinct${version} ddlx_${version} geoip${version} orafce${version}
558+
# - count_distinct${version} ddlx_${version} geoip${version} orafce${version} pg_ivm_${version} multicorm2_${version}
561559
# - hypopg_${version} ip4r${version} jsquery_${version} logerrors_${version} periods_${version} pg_auto_failover_${version} pg_catcheck${version}
562560
# - pg_fkpart${version} pg_jobmon${version} pg_partman${version} pg_prioritize_${version} pg_track_settings${version} pgaudit15_${version}
563561
# - pgcryptokey${version} pgexportdoc${version} pgimportdoc${version} pgmemcache-${version} pgmp${version} pgq-${version} pgquarrel pgrouting_${version}

‎files/conf/pigsty-demo.yml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,11 @@ all:
335335
- name: timescaledb
336336
description: TimescaleDB for RHEL/CentOS $releasever - $basearch
337337
gpgcheck: no
338-
baseurl:
339-
- https://packagecloud.io/timescale/timescaledb/el/7/$basearch
338+
baseurl: https://packagecloud.io/timescale/timescaledb/el/$releasever/$basearch
339+
- name: citus
340+
description: Citus Community
341+
gpgcheck: no
342+
baseurl: https://repos.citusdata.com/community/el/$releasever/$basearch
340343
- name: centos-sclo
341344
description: CentOS-$releasever - SCLo
342345
gpgcheck: no
@@ -382,7 +385,7 @@ all:
382385
- python3 python3-psycopg2 python36-requests python3-etcd python3-consul python36-urllib3 python36-idna python36-pyOpenSSL python36-cryptography
383386
- patroni patroni-consul patroni-etcd pgbouncer pg_cli pgbadger pg_activity tail_n_mail # -- pgsql common - #
384387
- pgcenter boxinfo check_postgres emaj pgbconsole pg_bloat_check pgquarrel barman barman-cli pgloader pgFormatter pitrery pspg pgxnclient PyGreSQL
385-
- postgresql14* postgis32_14* citus_14* pglogical_14* timescaledb-2-postgresql-14 pg_repack_14 wal2json_14 # -- pg14 packages -#
388+
- postgresql14* postgis32_14* pglogical_14* citus110_14 timescaledb-2-postgresql-14 pg_repack_14 wal2json_14 # -- pg14 packages -#
386389
- pg_qualstats_14 pg_stat_kcache_14 pg_stat_monitor_14 pg_top_14 pg_track_settings_14 pg_wait_sampling_14 pg_probackup-std-14
387390
- pg_statement_rollback_14 system_stats_14 plproxy_14 plsh_14 pldebugger_14 plpgsql_check_14 pgmemcache_14 # plr_14
388391
- mysql_fdw_14 ogr_fdw_14 tds_fdw_14 sqlite_fdw_14 firebird_fdw_14 hdfs_fdw_14 mongo_fdw_14 osm_fdw_14 pgbouncer_fdw_14
@@ -656,16 +659,14 @@ all:
656659
pg_bin_dir: /usr/pgsql/bin # postgres binary dir, default is /usr/pgsql/bin, which use /usr/pgsql -> /usr/pgsql-{ver}
657660
pg_packages: # postgresql related packages. `${pg_version} will be replaced by `pg_version`
658661
- postgresql${pg_version}* # postgresql kernel packages
659-
- postgis32_${pg_version}* # postgis
660-
- citus_${pg_version}* # citus
661-
- timescaledb-2-postgresql-${pg_version} # timescaledb
662+
- postgis32_${pg_version}* citus110_${pg_version} timescaledb-2-postgresql-${pg_version}
662663
- pgbouncer pg_exporter pgbadger pg_activity node_exporter consul haproxy vip-manager
663664
- patroni patroni-consul patroni-etcd python3 python3-psycopg2 python36-requests python3-etcd
664665
- python3-consul python36-urllib3 python36-idna python36-pyOpenSSL python36-cryptography
665666
pg_extensions: # postgresql extensions, `${pg_version} will be replaced by actual `pg_version`
666667
- pg_repack_${pg_version} pg_qualstats_${pg_version} pg_stat_kcache_${pg_version} pg_stat_monitor_${pg_version} wal2json_${pg_version}
667668
# - ogr_fdw${pg_version} mysql_fdw_${pg_version} redis_fdw_${pg_version} mongo_fdw${pg_version} hdfs_fdw_${pg_version}
668-
# - count_distinct${version} ddlx_${version} geoip${version} orafce${version}
669+
# - count_distinct${version} ddlx_${version} geoip${version} orafce${version} pg_ivm_${version} multicorm2_${version}
669670
# - hypopg_${version} ip4r${version} jsquery_${version} logerrors_${version} periods_${version} pg_auto_failover_${version} pg_catcheck${version}
670671
# - pg_fkpart${version} pg_jobmon${version} pg_partman${version} pg_prioritize_${version} pg_track_settings${version} pgaudit15_${version}
671672
# - pgcryptokey${version} pgexportdoc${version} pgimportdoc${version} pgmemcache-${version} pgmp${version} pgq-${version} pgquarrel pgrouting_${version}
@@ -780,7 +781,7 @@ all:
780781
- host all +dbrole_offline 172.16.0.0/12 md5
781782
- host all +dbrole_offline 192.168.0.0/16 md5
782783

783-
pgbouncer_hba_rules: # pgbouncer host-based authentication rules
784+
pgbouncer_hba_rules: # pgbouncer host-based authentication rules
784785
- title: local password access
785786
role: common
786787
rules:

0 commit comments

Comments
 (0)