Commit 20961ce
committed
Make crash recovery ignore restore_command and recovery_end_command settings.
In v11 or before, those settings could not take effect in crash recovery
because they are specified in recovery.conf and crash recovery always
starts without recovery.conf. But commit 2dedf4d integrated
recovery.conf into postgresql.conf and which unexpectedly allowed
those settings to take effect even in crash recovery. This is definitely
not good behavior.
To fix the issue, this commit makes crash recovery always ignore
restore_command and recovery_end_command settings.
Back-patch to v12 where the issue was added.
Author: Fujii Masao
Reviewed-by: Peter Eisentraut
Discussion: https://postgr.es/m/e445616d-023e-a268-8aa1-67b8b335340c@pgmasters.net1 parent 06a367c commit 20961ce
2 files changed
+10
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7610 | 7610 | | |
7611 | 7611 | | |
7612 | 7612 | | |
| 7613 | + | |
7613 | 7614 | | |
| 7615 | + | |
| 7616 | + | |
7614 | 7617 | | |
7615 | 7618 | | |
7616 | 7619 | | |
7617 | 7620 | | |
7618 | 7621 | | |
7619 | 7622 | | |
7620 | 7623 | | |
7621 | | - | |
7622 | 7624 | | |
7623 | | - | |
7624 | | - | |
7625 | 7625 | | |
7626 | 7626 | | |
7627 | 7627 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
64 | 64 | | |
65 | 65 | | |
66 | 66 | | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
67 | 74 | | |
68 | 75 | | |
69 | 76 | | |
| |||
0 commit comments