Improve error reporting in remote backup

knizhnik · knizhnik · commit ed81839ab85b · 2019-03-14T16:41:19.000+03:00
diff --git a/src/data.c b/src/data.c
@@ -1052,7 +1052,7 @@ get_gz_error(gzFile gzf, int errnum)
 	int			gz_errnum;
 	const char *errmsg;
 
-	errmsg = gzerror(gzf, &gz_errnum);
+	errmsg = fio_gzerror(gzf, &gz_errnum);
 	if (gz_errnum == Z_ERRNO)
 		return strerror(errnum);
 	else
diff --git a/src/parsexlog.c b/src/parsexlog.c
@@ -906,7 +906,7 @@ get_gz_error(gzFile gzf)
 	int			errnum;
 	const char *errmsg;
 
-	errmsg = gzerror(gzf, &errnum);
+	errmsg = fio_gzerror(gzf, &errnum);
 	if (errnum == Z_ERRNO)
 		return strerror(errno);
 	else
diff --git a/src/utils/file.c b/src/utils/file.c
@@ -740,6 +740,7 @@ typedef struct fioGZFile
 {
 	z_stream strm;
 	int      fd;
+	int      errnum;
 	bool     compress;
 	bool     eof;
 	Bytef    buf[ZLIB_BUFFER_SIZE];
@@ -754,7 +755,7 @@ fio_gzopen(char const* path, char const* mode, int level, fio_location location)
 		fioGZFile* gz = (fioGZFile*)malloc(sizeof(fioGZFile));
 		memset(&gz->strm, 0, sizeof(gz->strm));
 		gz->eof = 0;
-
+		gz->errnum = Z_OK;
 		if (strcmp(mode, PG_BINARY_W) == 0) /* compress */
 		{
 			gz->strm.next_out = gz->buf;
@@ -838,6 +839,7 @@ fio_gzread(gzFile f, void *buf, unsigned size)
 				}
 				else if (rc != Z_OK)
 				{
+					gz->errnum = rc;
 					return -1;
 				}
 				if (gz->strm.avail_out != size)
@@ -968,6 +970,21 @@ int fio_gzeof(gzFile f)
 	}
 }
 
+const char* fio_gzerror(gzFile f, int *errnum)
+{
+	if ((size_t)f & FIO_GZ_REMOTE_MARKER)
+	{
+		fioGZFile* gz = (fioGZFile*)((size_t)f - FIO_GZ_REMOTE_MARKER);
+		if (errnum)
+			*errnum = gz->errnum;
+		return gz->strm.msg;
+	}
+	else
+	{
+		return gzerror(f, errnum);
+	}
+}
+
 z_off_t fio_gzseek(gzFile f, z_off_t offset, int whence)
 {
 	Assert(!((size_t)f & FIO_GZ_REMOTE_MARKER));
diff --git a/src/utils/file.h b/src/utils/file.h
@@ -49,7 +49,7 @@ typedef enum
 #define PAGE_CHECKSUM_MISMATCH (-256)
 
 #define SYS_CHECK(cmd) do if ((cmd) < 0) { fprintf(stderr, "%s:%d: (%s) %s\n", __FILE__, __LINE__, #cmd, strerror(errno)); exit(EXIT_FAILURE); } while (0)
-#define IO_CHECK(cmd, size) do { int _rc = (cmd); if (_rc != (size)) { fprintf(stderr, "%s:%d: proceeds %d bytes instead of %d: %s\n", __FILE__, __LINE__, _rc, (int)(size), _rc < 0 ? "end of data" :  strerror(errno)); exit(EXIT_FAILURE); } } while (0)
+#define IO_CHECK(cmd, size) do { int _rc = (cmd); if (_rc != (size)) if (remote_agent) { fprintf(stderr, "%s:%d: proceeds %d bytes instead of %d: %s\n", __FILE__, __LINE__, _rc, (int)(size), _rc >= 0 ? "end of data" :  strerror(errno)); exit(EXIT_FAILURE); } else elog(ERROR, "Communication error: %s", _rc >= 0 ? "end of data" :  strerror(errno)); } while (0)
 
 typedef struct
 {
@@ -111,6 +111,7 @@ extern int     fio_gzread(gzFile f, void *buf, unsigned size);
 extern int     fio_gzwrite(gzFile f, void const* buf, unsigned size);
 extern int     fio_gzeof(gzFile f);
 extern z_off_t fio_gzseek(gzFile f, z_off_t offset, int whence);
+extern const char* fio_gzerror(gzFile file, int *errnum);
 #endif
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -740,6 +740,7 @@ typedef struct fioGZFile`
`740`	`740`	`{`
`741`	`741`	`z_stream strm;`
`742`	`742`	`int fd;`
	`743`	`+ int errnum;`
`743`	`744`	`bool compress;`
`744`	`745`	`bool eof;`
`745`	`746`	`Bytef buf[ZLIB_BUFFER_SIZE];`
`@@ -754,7 +755,7 @@ fio_gzopen(char const* path, char const* mode, int level, fio_location location)`
`754`	`755`	`fioGZFile* gz = (fioGZFile*)malloc(sizeof(fioGZFile));`
`755`	`756`	`memset(&gz->strm, 0, sizeof(gz->strm));`
`756`	`757`	`gz->eof = 0;`
`757`		`-`
	`758`	`+ gz->errnum = Z_OK;`
`758`	`759`	`if (strcmp(mode, PG_BINARY_W) == 0) /* compress */`
`759`	`760`	`{`
`760`	`761`	`gz->strm.next_out = gz->buf;`
`@@ -838,6 +839,7 @@ fio_gzread(gzFile f, void *buf, unsigned size)`
`838`	`839`	`}`
`839`	`840`	`else if (rc != Z_OK)`
`840`	`841`	`{`
	`842`	`+ gz->errnum = rc;`
`841`	`843`	`return -1;`
`842`	`844`	`}`
`843`	`845`	`if (gz->strm.avail_out != size)`
`@@ -968,6 +970,21 @@ int fio_gzeof(gzFile f)`
`968`	`970`	`}`
`969`	`971`	`}`
`970`	`972`
	`973`	`+const char* fio_gzerror(gzFile f, int *errnum)`
	`974`	`+{`
	`975`	`+ if ((size_t)f & FIO_GZ_REMOTE_MARKER)`
	`976`	`+ {`
	`977`	`+ fioGZFile* gz = (fioGZFile*)((size_t)f - FIO_GZ_REMOTE_MARKER);`
	`978`	`+ if (errnum)`
	`979`	`+ *errnum = gz->errnum;`
	`980`	`+ return gz->strm.msg;`
	`981`	`+ }`
	`982`	`+ else`
	`983`	`+ {`
	`984`	`+ return gzerror(f, errnum);`
	`985`	`+ }`
	`986`	`+}`
	`987`	`+`
`971`	`988`	`z_off_t fio_gzseek(gzFile f, z_off_t offset, int whence)`
`972`	`989`	`{`
`973`	`990`	`Assert(!((size_t)f & FIO_GZ_REMOTE_MARKER));`