NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitfd5942c

committed

Use the regular main processing loop also in walsenders.

The regular backend's main loop handles signal handling and error recoverybetter than the current WAL sender command loop does. For example, if theclient hangs and a SIGTERM is received before starting streaming, thewalsender will now terminate immediately, rather than hang until theconnection times out.

1 parent1997f34 commitfd5942cCopy full SHA for fd5942c

File tree

4 files changed

+109

-232

lines changed

src
- backend
  - replication
    - basebackup.c
    - walsender.c
  - tcop
    - postgres.c
- include/replication
  - walsender.h

4 files changed

+109

-232

lines changed

`‎src/backend/replication/basebackup.c`

Lines changed: 2 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`#include"lib/stringinfo.h"`
`23`	`23`	`#include"libpq/libpq.h"`
`24`	`24`	`#include"libpq/pqformat.h"`
	`25`	`+#include"miscadmin.h"`
`25`	`26`	`#include"nodes/pg_list.h"`
`26`	`27`	`#include"replication/basebackup.h"`
`27`	`28`	`#include"replication/walsender.h"`
`@@ -30,7 +31,6 @@`
`30`	`31`	`#include"storage/ipc.h"`
`31`	`32`	`#include"utils/builtins.h"`
`32`	`33`	`#include"utils/elog.h"`
`33`		`-#include"utils/memutils.h"`
`34`	`34`	`#include"utils/ps_status.h"`
`35`	`35`
`36`	`36`	`typedefstruct`
`@@ -370,19 +370,10 @@ void`
`370`	`370`	`SendBaseBackup(BaseBackupCmd*cmd)`
`371`	`371`	`{`
`372`	`372`	`DIR*dir;`
`373`		`-MemoryContextbackup_context;`
`374`		`-MemoryContextold_context;`
`375`	`373`	`basebackup_optionsopt;`
`376`	`374`
`377`	`375`	`parse_basebackup_options(cmd->options,&opt);`
`378`	`376`
`379`		`-backup_context=AllocSetContextCreate(CurrentMemoryContext,`
`380`		`-"Streaming base backup context",`
`381`		`-ALLOCSET_DEFAULT_MINSIZE,`
`382`		`-ALLOCSET_DEFAULT_INITSIZE,`
`383`		`-ALLOCSET_DEFAULT_MAXSIZE);`
`384`		`-old_context=MemoryContextSwitchTo(backup_context);`
`385`		`-`
`386`	`377`	`WalSndSetState(WALSNDSTATE_BACKUP);`
`387`	`378`
`388`	`379`	`if (update_process_title)`
`@@ -403,9 +394,6 @@ SendBaseBackup(BaseBackupCmd *cmd)`
`403`	`394`	`perform_base_backup(&opt,dir);`
`404`	`395`
`405`	`396`	`FreeDir(dir);`
`406`		`-`
`407`		`-MemoryContextSwitchTo(old_context);`
`408`		`-MemoryContextDelete(backup_context);`
`409`	`397`	`}`
`410`	`398`
`411`	`399`	`staticvoid`
`@@ -606,7 +594,7 @@ sendDir(char *path, int basepathlen, bool sizeonly)`
`606`	`594`	`* error in that case. The error handler further up will call`
`607`	`595`	`* do_pg_abort_backup() for us.`
`608`	`596`	`*/`
`609`		`-if (walsender_shutdown_requested\|\|walsender_ready_to_stop)`
	`597`	`+if (ProcDiePending\|\|walsender_ready_to_stop)`
`610`	`598`	`ereport(ERROR,`
`611`	`599`	`(errmsg("shutdown requested, aborting active base backup")));`
`612`	`600`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitfd5942c

File tree

4 files changed

4 files changed

`‎src/backend/replication/basebackup.c`

0 commit comments