upgrade pgpool to 3.6.6

[pgpool-online-recovery] / Makefile

diff --git a/Makefile b/Makefile
index 6c62104..0399166 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ all:
 init:
        sh -xe ./t/0-ssh-deploy.sh
        sh -xe ./t/1-init-cluster.sh
+       sh -xe ./t/2-init-pgpool.sh
 
 pull:
        exit 1
@@ -50,8 +51,8 @@ push-pg:
 restart:
        #ssh root@10.200.1.61 systemctl restart postgresql-9.6
        #ssh root@10.200.1.62 systemctl restart postgresql-9.6
-       ssh root@10.200.1.61 systemctl restart pgpool
-       ssh root@10.200.1.62 systemctl restart pgpool
+       ssh root@10.200.1.61 'systemctl stop pgpool ; rm -v /var/log/pgpool/pgpool_status /tmp/.s.PGSQL.9* ; systemctl start pgpool'
+       ssh root@10.200.1.62 'systemctl stop pgpool ; rm -v /var/log/pgpool/pgpool_status /tmp/.s.PGSQL.9* ; systemctl start pgpool'
 
 status:
        ssh root@10.200.1.61 systemctl status pgpool
@@ -60,13 +61,4 @@ status:
        ssh root@10.200.1.62 systemctl status postgresql-9.6
 
 fix:
-       ssh root@10.200.1.60 /etc/pgpool-II/online-recovery.sh
-
-clean:
-       ssh root@10.200.1.61 rm -Rfv /etc/pgpool-II/
-       ssh root@10.200.1.61 'yes | yum reinstall http://www.pgpool.net/yum/rpms/3.6/redhat/rhel-7-x86_64/pgpool-II-pg96-3.6.5-1pgdg.rhel7.x86_64.rpm'
-       ssh root@10.200.1.61 'systemctl enable pgpool'
-
-       ssh root@10.200.1.62 rm -Rfv /etc/pgpool-II/
-       ssh root@10.200.1.62 'yes | yum reinstall http://www.pgpool.net/yum/rpms/3.6/redhat/rhel-7-x86_64/pgpool-II-pg96-3.6.5-1pgdg.rhel7.x86_64.rpm'
-       ssh root@10.200.1.62 'systemctl enable pgpool'
+       ssh root@10.200.1.60 sudo -u postgres sh -xe /etc/pgpool-II/online-recovery.sh