db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2026-05-22 10:15:16 +02:00
Code Issues Releases Activity

Fixed an issue where the db-port option specified on the backup server would not be properly passed to the remote unless it was from the first configured database.

Browse Source 
Reported by Michael Vitale.
This commit is contained in:
David Steele
2016-12-10 14:05:28 -05:00
parent 1a5fa920e6
commit b4884e5a0b
15 changed files with 75 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/expect/backup-full-005.log
+3 -3
View File
@@ -34,7 +34,7 @@ start-fast=y
-----------------------------------------------------------
[db]
db-path=[TEST_PATH]/db-standby/db/base
db-port=[PORT-1]
db-port=[PORT-2]
db-socket-path=[TEST_PATH]/db-standby/db
[global]
@@ -93,7 +93,7 @@ start-fast=y
-----------------------------------------------------------
[db]
db-path=[TEST_PATH]/db-standby/db/base
db-port=[PORT-1]
db-port=[PORT-2]
db-socket-path=[TEST_PATH]/db-standby/db
[db:restore]
@@ -144,7 +144,7 @@ start-fast=y
-----------------------------------------------------------
[db]
db-path=[TEST_PATH]/db-standby/db/base
db-port=[PORT-1]
db-port=[PORT-2]
db-socket-path=[TEST_PATH]/db-standby/db
[db:restore]
test/expect/backup-full-006.log
+3 -3
View File
@@ -29,7 +29,7 @@ repo-path=[TEST_PATH]/db-standby/repo
-----------------------------------------------------------
[db]
db-path=[TEST_PATH]/db-standby/db/base
db-port=[PORT-1]
db-port=[PORT-2]
db-socket-path=[TEST_PATH]/db-standby/db
db2-cmd=[BACKREST-BIN]
db2-config=[TEST_PATH]/db-master/pgbackrest.conf
@@ -88,7 +88,7 @@ repo-path=[TEST_PATH]/db-standby/repo
-----------------------------------------------------------
[db]
db-path=[TEST_PATH]/db-standby/db/base
db-port=[PORT-1]
db-port=[PORT-2]
db-socket-path=[TEST_PATH]/db-standby/db
db2-cmd=[BACKREST-BIN]
db2-config=[TEST_PATH]/db-master/pgbackrest.conf
@@ -139,7 +139,7 @@ repo-path=[TEST_PATH]/db-standby/repo
-----------------------------------------------------------
[db]
db-path=[TEST_PATH]/db-standby/db/base
db-port=[PORT-1]
db-port=[PORT-2]
db-socket-path=[TEST_PATH]/db-standby/db
db2-cmd=[BACKREST-BIN]
db2-config=[TEST_PATH]/db-master/pgbackrest.conf
test/expect/backup-full-007.log
+4
View File
@@ -88,6 +88,7 @@ db-cmd=[BACKREST-BIN]
db-config=[TEST_PATH]/db-master/pgbackrest.conf
db-host=db-master
db-path=[TEST_PATH]/db-master/db/base
db-port=[PORT-1]
db-user=[USER-2]
[global]
@@ -166,6 +167,7 @@ db-cmd=[BACKREST-BIN]
db-config=[TEST_PATH]/db-master/pgbackrest.conf
db-host=db-master
db-path=[TEST_PATH]/db-master/db/base
db-port=[PORT-1]
db-user=[USER-2]
[global]
@@ -232,6 +234,7 @@ db-cmd=[BACKREST-BIN]
db-config=[TEST_PATH]/db-master/pgbackrest.conf
db-host=db-master
db-path=[TEST_PATH]/db-master/db/base
db-port=[PORT-1]
db-user=[USER-2]
[global]
@@ -366,6 +369,7 @@ db-cmd=[BACKREST-BIN]
db-config=[TEST_PATH]/db-master/pgbackrest.conf
db-host=db-master
db-path=[TEST_PATH]/db-master/db/base
db-port=[PORT-1]
db-user=[USER-2]
[global]
test/expect/backup-full-008.log
+2
View File
@@ -31,6 +31,7 @@ db-cmd=[BACKREST-BIN]
db-config=[TEST_PATH]/db-master/pgbackrest.conf
db-host=db-master
db-path=[TEST_PATH]/db-master/db/base
db-port=[PORT-1]
db-user=[USER-2]
[global]
@@ -75,6 +76,7 @@ db-cmd=[BACKREST-BIN]
db-config=[TEST_PATH]/db-master/pgbackrest.conf
db-host=db-master
db-path=[TEST_PATH]/db-master/db/base
db-port=[PORT-1]
db-user=[USER-2]
[global]
test/expect/backup-full-009.log
+2
View File
@@ -36,6 +36,7 @@ db-cmd=[BACKREST-BIN]
db-config=[TEST_PATH]/db-master/pgbackrest.conf
db-host=db-master
db-path=[TEST_PATH]/db-master/db/base
db-port=[PORT-1]
db-user=[USER-2]
[global]
@@ -86,6 +87,7 @@ db-cmd=[BACKREST-BIN]
db-config=[TEST_PATH]/db-master/pgbackrest.conf
db-host=db-master
db-path=[TEST_PATH]/db-master/db/base
db-port=[PORT-1]
db-user=[USER-2]
[global]
test/expect/backup-full-010.log
+2
View File
@@ -35,6 +35,7 @@ db-cmd=[BACKREST-BIN]
db-config=[TEST_PATH]/db-master/pgbackrest.conf
db-host=db-master
db-path=[TEST_PATH]/db-master/db/base
db-port=[PORT-1]
db-user=[USER-2]
[global]
@@ -83,6 +84,7 @@ db-cmd=[BACKREST-BIN]
db-config=[TEST_PATH]/db-master/pgbackrest.conf
db-host=db-master
db-path=[TEST_PATH]/db-master/db/base
db-port=[PORT-1]
db-user=[USER-2]
[global]
test/expect/backup-full-011.log
+9 -3
View File
@@ -29,7 +29,7 @@ repo-path=[TEST_PATH]/backup/repo
-----------------------------------------------------------
[db]
db-path=[TEST_PATH]/db-standby/db/base
db-port=[PORT-1]
db-port=[PORT-2]
db-socket-path=[TEST_PATH]/db-standby/db
[global]
@@ -52,11 +52,13 @@ db1-cmd=[BACKREST-BIN]
db1-config=[TEST_PATH]/db-master/pgbackrest.conf
db1-host=db-master
db1-path=[TEST_PATH]/db-master/db/base
db1-port=[PORT-1]
db1-user=[USER-2]
db2-cmd=[BACKREST-BIN]
db2-config=[TEST_PATH]/db-standby/pgbackrest.conf
db2-host=db-standby
db2-path=[TEST_PATH]/db-standby/db/base
db2-port=[PORT-2]
db2-user=[USER-2]
[global]
@@ -110,7 +112,7 @@ repo-path=[TEST_PATH]/backup/repo
-----------------------------------------------------------
[db]
db-path=[TEST_PATH]/db-standby/db/base
db-port=[PORT-1]
db-port=[PORT-2]
db-socket-path=[TEST_PATH]/db-standby/db
[db:restore]
@@ -135,11 +137,13 @@ db1-cmd=[BACKREST-BIN]
db1-config=[TEST_PATH]/db-master/pgbackrest.conf
db1-host=db-master
db1-path=[TEST_PATH]/db-master/db/base
db1-port=[PORT-1]
db1-user=[USER-2]
db2-cmd=[BACKREST-BIN]
db2-config=[TEST_PATH]/db-standby/pgbackrest.conf
db2-host=db-standby
db2-path=[TEST_PATH]/db-standby/db/base
db2-port=[PORT-2]
db2-user=[USER-2]
[global]
@@ -183,7 +187,7 @@ repo-path=[TEST_PATH]/backup/repo
-----------------------------------------------------------
[db]
db-path=[TEST_PATH]/db-standby/db/base
db-port=[PORT-1]
db-port=[PORT-2]
db-socket-path=[TEST_PATH]/db-standby/db
[db:restore]
@@ -208,11 +212,13 @@ db1-cmd=[BACKREST-BIN]
db1-config=[TEST_PATH]/db-master/pgbackrest.conf
db1-host=db-master
db1-path=[TEST_PATH]/db-master/db/base
db1-port=[PORT-1]
db1-user=[USER-2]
db2-cmd=[BACKREST-BIN]
db2-config=[TEST_PATH]/db-standby/pgbackrest.conf
db2-host=db-standby
db2-path=[TEST_PATH]/db-standby/db/base
db2-port=[PORT-2]
db2-user=[USER-2]
[global]
test/expect/backup-synthetic-005.log
+3
View File
@@ -4260,3 +4260,6 @@ diff backup - protocol shutdown timeout (backup host)
P00 WARN: option retention-full is not set, the repository may run out of space
HINT: to retain full backups indefinitely (without warning), set option 'retention-full' to the maximum.
P00 TEST: PgBaCkReStTeSt-BACKUP-STOP-PgBaCkReStTeSt
P00 ERROR: [141]: remote process terminated on db-master host: unable to read line after 2 second(s)
P00 WARN: unable to shutdown protocol [141]: remote process terminated on db-master host: unable to read line after 2 second(s)
HINT: the process completed all operations successfully but protocol-timeout may need to be increased.