diff options
| author | Simon Riggs <simon@2ndQuadrant.com> | 2013-04-24 12:21:18 +0100 |
|---|---|---|
| committer | Simon Riggs <simon@2ndQuadrant.com> | 2013-04-24 12:21:18 +0100 |
| commit | 2317a63328cd9d1c22d02218c6959f340b63d98f (patch) | |
| tree | 91109c6c87f15103a818219f798e69d3ae233ff6 /src/backend/access/transam/xlog.c | |
| parent | 173c252bb2d9549fa091f606264e8da65672d5f4 (diff) | |
| download | postgresql-2317a63328cd9d1c22d02218c6959f340b63d98f.tar.gz postgresql-2317a63328cd9d1c22d02218c6959f340b63d98f.zip | |
Make fast promotion the default promotion mode.
Continue to allow a request for synchronous
checkpoints as a mechanism in case of problems.
Diffstat (limited to 'src/backend/access/transam/xlog.c')
| -rw-r--r-- | src/backend/access/transam/xlog.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 3cb866f5306..5452ae139a2 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -9906,19 +9906,7 @@ CheckForStandbyTrigger(void) fast_promote = false; } - /* - * We only look for fast promote via the pg_ctl promote option. - * It would be possible to extend trigger file support for the - * fast promotion option but that wouldn't be backwards compatible - * anyway and we're looking to focus further work on the promote - * option as the right way to signal end of recovery. - */ - if (fast_promote) - ereport(LOG, - (errmsg("received fast promote request"))); - else - ereport(LOG, - (errmsg("received promote request"))); + ereport(LOG, (errmsg("received promote request"))); ResetPromoteTriggered(); triggered = true; @@ -9934,6 +9922,7 @@ CheckForStandbyTrigger(void) (errmsg("trigger file found: %s", TriggerFile))); unlink(TriggerFile); triggered = true; + fast_promote = true; return true; } return false; |