diff options
| author | Magnus Hagander <magnus@hagander.net> | 2018-05-18 17:53:17 +0200 |
|---|---|---|
| committer | Magnus Hagander <magnus@hagander.net> | 2018-05-18 17:53:17 +0200 |
| commit | 714d8e5fa1b21a1113d6cd444af5cbc9d67d566f (patch) | |
| tree | 1a782c56176ea8b5e924fa1419c7366d642c30e9 /src | |
| parent | 6d7629094a527bd33f38426b012172cfc9e02e44 (diff) | |
| download | postgresql-714d8e5fa1b21a1113d6cd444af5cbc9d67d566f.tar.gz postgresql-714d8e5fa1b21a1113d6cd444af5cbc9d67d566f.zip | |
Fix error message on short read of pg_control
Instead of saying "error: success", indicate that we got a working read
but it was too short.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/access/transam/xlog.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 527ce760e49..5d845a81789 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -4258,6 +4258,7 @@ ReadControlFile(void) { pg_crc32c crc; int fd; + int r; /* * Read data... @@ -4271,10 +4272,17 @@ ReadControlFile(void) errmsg("could not open control file \"%s\": %m", XLOG_CONTROL_FILE))); - if (read(fd, ControlFile, sizeof(ControlFileData)) != sizeof(ControlFileData)) - ereport(PANIC, - (errcode_for_file_access(), - errmsg("could not read from control file: %m"))); + r = read(fd, ControlFile, sizeof(ControlFileData)); + if (r != sizeof(ControlFileData)) + { + if (r < 0) + ereport(PANIC, + (errcode_for_file_access(), + errmsg("could not read from control file: %m"))); + else + ereport(PANIC, + (errmsg("could not read from control file: read %d bytes, expected %d", r, (int) sizeof(ControlFileData)))); + } close(fd); |