diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2010-01-15 09:19:10 +0000 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2010-01-15 09:19:10 +0000 |
| commit | 40f908bdcdc726fc11912cd95dfd2f89603d1f37 (patch) | |
| tree | fcbbda839e58184fc284d261cc5a0f5e8ac921f3 /src/backend/executor/execMain.c | |
| parent | 4cbe473938779ec414d90c2063c4398e68a70838 (diff) | |
| download | postgresql-40f908bdcdc726fc11912cd95dfd2f89603d1f37.tar.gz postgresql-40f908bdcdc726fc11912cd95dfd2f89603d1f37.zip | |
Introduce Streaming Replication.
This includes two new kinds of postmaster processes, walsenders and
walreceiver. Walreceiver is responsible for connecting to the primary server
and streaming WAL to disk, while walsender runs in the primary server and
streams WAL from disk to the client.
Documentation still needs work, but the basics are there. We will probably
pull the replication section to a new chapter later on, as well as the
sections describing file-based replication. But let's do that as a separate
patch, so that it's easier to see what has been added/changed. This patch
also adds a new section to the chapter about FE/BE protocol, documenting the
protocol used by walsender/walreceivxer.
Bump catalog version because of two new functions,
pg_last_xlog_receive_location() and pg_last_xlog_replay_location(), for
monitoring the progress of replication.
Fujii Masao, with additional hacking by me
Diffstat (limited to 'src/backend/executor/execMain.c')
| -rw-r--r-- | src/backend/executor/execMain.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 8d7adfffbb6..557ecc7e15c 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -26,7 +26,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.341 2010/01/08 02:44:00 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.342 2010/01/15 09:19:02 heikki Exp $ * *------------------------------------------------------------------------- */ @@ -2213,11 +2213,11 @@ OpenIntoRel(QueryDesc *queryDesc) myState->rel = intoRelationDesc; /* - * We can skip WAL-logging the insertions, unless PITR is in use. We can - * skip the FSM in any case. + * We can skip WAL-logging the insertions, unless PITR or streaming + * replication is in use. We can skip the FSM in any case. */ myState->hi_options = HEAP_INSERT_SKIP_FSM | - (XLogArchivingActive() ? 0 : HEAP_INSERT_SKIP_WAL); + (XLogIsNeeded() ? 0 : HEAP_INSERT_SKIP_WAL); myState->bistate = GetBulkInsertState(); /* Not using WAL requires rd_targblock be initially invalid */ |