diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2012-10-31 11:05:28 -0300 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2012-10-31 11:05:28 -0300 |
| commit | 9b8dd7e8aa19e6145a996cfc881b5617f497632d (patch) | |
| tree | 8a487c4d23552ce45b9a382a834cd8d4f9a7e09b /src | |
| parent | 04f28bdb8477ad48c7f9987950595764eae3218e (diff) | |
| download | postgresql-9b8dd7e8aa19e6145a996cfc881b5617f497632d.tar.gz postgresql-9b8dd7e8aa19e6145a996cfc881b5617f497632d.zip | |
Fix erroneous choices of segNo variables
Commit dfda6eba (which changed segment numbers to use a single 64 bit
variable instead of log/seg) introduced a couple of bogus choices of
exactly which log segment number variable to use in each case.
This is currently pretty harmless; in one place, the bogus number was
only being used in an error message for a pretty unlikely condition
(failure to fsync a WAL segment file). In the other, it was using a
global variable instead of the local variable; but all callsites were
passing the value of the global variable anyway.
No need to backpatch because that commit is not on earlier branches.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/access/transam/xlog.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index d251d08b190..3cee540ac49 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -8175,7 +8175,7 @@ assign_xlog_sync_method(int new_sync_method, void *extra) ereport(PANIC, (errcode_for_file_access(), errmsg("could not fsync log segment %s: %m", - XLogFileNameP(curFileTLI, readSegNo)))); + XLogFileNameP(curFileTLI, openLogSegNo)))); if (get_sync_bit(sync_method) != get_sync_bit(new_sync_method)) XLogFileClose(); } @@ -8199,7 +8199,7 @@ issue_xlog_fsync(int fd, XLogSegNo segno) ereport(PANIC, (errcode_for_file_access(), errmsg("could not fsync log file %s: %m", - XLogFileNameP(ThisTimeLineID, openLogSegNo)))); + XLogFileNameP(ThisTimeLineID, segno)))); break; #ifdef HAVE_FSYNC_WRITETHROUGH case SYNC_METHOD_FSYNC_WRITETHROUGH: @@ -8207,7 +8207,7 @@ issue_xlog_fsync(int fd, XLogSegNo segno) ereport(PANIC, (errcode_for_file_access(), errmsg("could not fsync write-through log file %s: %m", - XLogFileNameP(ThisTimeLineID, openLogSegNo)))); + XLogFileNameP(ThisTimeLineID, segno)))); break; #endif #ifdef HAVE_FDATASYNC @@ -8216,7 +8216,7 @@ issue_xlog_fsync(int fd, XLogSegNo segno) ereport(PANIC, (errcode_for_file_access(), errmsg("could not fdatasync log file %s: %m", - XLogFileNameP(ThisTimeLineID, openLogSegNo)))); + XLogFileNameP(ThisTimeLineID, segno)))); break; #endif case SYNC_METHOD_OPEN: |