Fix some issues in pg_rewind.

MasaoFujii · MasaoFujii · commit 966c37fdb5ed · 2015-06-11T22:31:18.000+09:00
* Remove invalid option character "N" from the third argument (valid option
string) of getopt_long().

* Use pg_free() or pfree() to free the memory allocated by pg_malloc() or
palloc() instead of always using free().

* Assume problem is no disk space if write() fails but doesn't set errno.

* Fix several typos.

Patch by me. Review by Michael Paquier.
diff --git a/src/bin/pg_rewind/copy_fetch.c b/src/bin/pg_rewind/copy_fetch.c
@@ -43,7 +43,7 @@ traverse_datadir(const char *datadir, process_file_callback_t callback)
 /*
  * recursive part of traverse_datadir
  *
- * parent_path is the current subdirectory's path relative to datadir,
+ * parentpath is the current subdirectory's path relative to datadir,
  * or NULL at the top level.
  */
 static void
@@ -262,5 +262,5 @@ execute_pagemap(datapagemap_t *pagemap, const char *path)
 		copy_file_range(path, offset, offset + BLCKSZ, false);
 		/* Ok, this block has now been copied from new data dir to old */
 	}
-	free(iter);
+	pg_free(iter);
 }
diff --git a/src/bin/pg_rewind/datapagemap.c b/src/bin/pg_rewind/datapagemap.c
@@ -67,7 +67,7 @@ datapagemap_add(datapagemap_t *map, BlockNumber blkno)
  * Start iterating through all entries in the page map.
  *
  * After datapagemap_iterate, call datapagemap_next to return the entries,
- * until it returns NULL. After you're done, use free() to destroy the
+ * until it returns false. After you're done, use pg_free() to destroy the
  * iterator.
  */
 datapagemap_iterator_t *
@@ -122,5 +122,5 @@ datapagemap_print(datapagemap_t *map)
 	while (datapagemap_next(iter, &blocknum))
 		printf("  blk %u\n", blocknum);
 
-	free(iter);
+	pg_free(iter);
 }
diff --git a/src/bin/pg_rewind/file_ops.c b/src/bin/pg_rewind/file_ops.c
@@ -105,10 +105,16 @@ write_target_range(char *buf, off_t begin, size_t size)
 	{
 		int			writelen;
 
+		errno = 0;
 		writelen = write(dstfd, p, writeleft);
 		if (writelen < 0)
+		{
+			/* if write didn't set errno, assume problem is no disk space */
+			if (errno == 0)
+				errno = ENOSPC;
 			pg_fatal("could not write file \"%s\": %s\n",
 					 dstpath, strerror(errno));
+		}
 
 		p += writelen;
 		writeleft -= writelen;
diff --git a/src/bin/pg_rewind/filemap.c b/src/bin/pg_rewind/filemap.c
@@ -114,7 +114,7 @@ process_source_file(const char *path, file_type_t type, size_t newsize,
 		case FILE_TYPE_DIRECTORY:
 			if (exists && !S_ISDIR(statbuf.st_mode))
 			{
-				/* it's a directory in target, but not in source. Strange.. */
+				/* it's a directory in source, but not in target. Strange.. */
 				pg_fatal("\"%s\" is not a directory\n", localpath);
 			}
 
@@ -135,7 +135,7 @@ process_source_file(const char *path, file_type_t type, size_t newsize,
 				)
 			{
 				/*
-				 * It's a symbolic link in target, but not in source.
+				 * It's a symbolic link in source, but not in target.
 				 * Strange..
 				 */
 				pg_fatal("\"%s\" is not a symbolic link\n", localpath);
@@ -354,7 +354,7 @@ process_block_change(ForkNumber forknum, RelFileNode rnode, BlockNumber blkno)
 		entry = *e;
 	else
 		entry = NULL;
-	free(path);
+	pfree(path);
 
 	if (entry)
 	{
@@ -530,7 +530,7 @@ print_filemap(void)
  * Does it look like a relation data file?
  *
  * For our purposes, only files belonging to the main fork are considered
- * relation files. Other forks are alwayes copied in toto, because we cannot
+ * relation files. Other forks are always copied in toto, because we cannot
  * reliably track changes to them, because WAL only contains block references
  * for the main fork.
  */
diff --git a/src/bin/pg_rewind/libpq_fetch.c b/src/bin/pg_rewind/libpq_fetch.c
@@ -69,7 +69,7 @@ libpqConnect(const char *connstr)
 	pg_free(str);
 
 	/*
-	 * Also check that full_page-writes are enabled. We can get torn pages if
+	 * Also check that full_page_writes is enabled. We can get torn pages if
 	 * a page is modified while we read it with pg_read_binary_file(), and we
 	 * rely on full page images to fix them.
 	 */
@@ -465,5 +465,5 @@ execute_pagemap(datapagemap_t *pagemap, const char *path)
 
 		fetch_file_range(path, offset, offset + BLCKSZ);
 	}
-	free(iter);
+	pg_free(iter);
 }
diff --git a/src/bin/pg_rewind/logging.h b/src/bin/pg_rewind/logging.h
@@ -32,4 +32,4 @@ extern void pg_fatal(const char *fmt,...) pg_attribute_printf(1, 2) pg_attribute
 
 extern void progress_report(bool force);
 
-#endif
+#endif   /* PG_REWIND_LOGGING_H */
diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
@@ -121,7 +121,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	while ((c = getopt_long(argc, argv, "D:NnP", long_options, &option_index)) != -1)
+	while ((c = getopt_long(argc, argv, "D:nP", long_options, &option_index)) != -1)
 	{
 		switch (c)
 		{
@@ -370,7 +370,7 @@ sanityChecks(void)
 	if (ControlFile_target.data_checksum_version != PG_DATA_CHECKSUM_VERSION &&
 		!ControlFile_target.wal_log_hints)
 	{
-		pg_fatal("target server need to use either data checksums or \"wal_log_hints = on\"\n");
+		pg_fatal("target server needs to use either data checksums or \"wal_log_hints = on\"\n");
 	}
 
 	/*
@@ -450,7 +450,7 @@ findCommonAncestorTimeline(XLogRecPtr *recptr, TimeLineID *tli)
 			*recptr = entry->end;
 			*tli = entry->tli;
 
-			free(sourceHistory);
+			pg_free(sourceHistory);
 			return;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ traverse_datadir(const char *datadir, process_file_callback_t callback)`
`43`	`43`	`/*`
`44`	`44`	`* recursive part of traverse_datadir`
`45`	`45`	`*`
`46`		`- * parent_path is the current subdirectory's path relative to datadir,`
	`46`	`+ * parentpath is the current subdirectory's path relative to datadir,`
`47`	`47`	`* or NULL at the top level.`
`48`	`48`	`*/`
`49`	`49`	`static void`
`@@ -262,5 +262,5 @@ execute_pagemap(datapagemap_t pagemap, const char path)`
`262`	`262`	`copy_file_range(path, offset, offset + BLCKSZ, false);`
`263`	`263`	`/* Ok, this block has now been copied from new data dir to old */`
`264`	`264`	`}`
`265`		`- free(iter);`
	`265`	`+ pg_free(iter);`
`266`	`266`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ datapagemap_add(datapagemap_t *map, BlockNumber blkno)`
`67`	`67`	`* Start iterating through all entries in the page map.`
`68`	`68`	`*`
`69`	`69`	`* After datapagemap_iterate, call datapagemap_next to return the entries,`
`70`		`- * until it returns NULL. After you're done, use free() to destroy the`
	`70`	`+ * until it returns false. After you're done, use pg_free() to destroy the`
`71`	`71`	`* iterator.`
`72`	`72`	`*/`
`73`	`73`	`datapagemap_iterator_t *`
`@@ -122,5 +122,5 @@ datapagemap_print(datapagemap_t *map)`
`122`	`122`	`while (datapagemap_next(iter, &blocknum))`
`123`	`123`	`printf(" blk %u\n", blocknum);`
`124`	`124`
`125`		`- free(iter);`
	`125`	`+ pg_free(iter);`
`126`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ process_source_file(const char *path, file_type_t type, size_t newsize,`
`114`	`114`	`case FILE_TYPE_DIRECTORY:`
`115`	`115`	`if (exists && !S_ISDIR(statbuf.st_mode))`
`116`	`116`	`{`
`117`		`- /* it's a directory in target, but not in source. Strange.. */`
	`117`	`+ /* it's a directory in source, but not in target. Strange.. */`
`118`	`118`	`pg_fatal("\"%s\" is not a directory\n", localpath);`
`119`	`119`	`}`
`120`	`120`
`@@ -135,7 +135,7 @@ process_source_file(const char *path, file_type_t type, size_t newsize,`
`135`	`135`	`)`
`136`	`136`	`{`
`137`	`137`	`/*`
`138`		`- * It's a symbolic link in target, but not in source.`
	`138`	`+ * It's a symbolic link in source, but not in target.`
`139`	`139`	`* Strange..`
`140`	`140`	`*/`
`141`	`141`	`pg_fatal("\"%s\" is not a symbolic link\n", localpath);`
`@@ -354,7 +354,7 @@ process_block_change(ForkNumber forknum, RelFileNode rnode, BlockNumber blkno)`
`354`	`354`	`entry = *e;`
`355`	`355`	`else`
`356`	`356`	`entry = NULL;`
`357`		`- free(path);`
	`357`	`+ pfree(path);`
`358`	`358`
`359`	`359`	`if (entry)`
`360`	`360`	`{`
`@@ -530,7 +530,7 @@ print_filemap(void)`
`530`	`530`	`* Does it look like a relation data file?`
`531`	`531`	`*`
`532`	`532`	`* For our purposes, only files belonging to the main fork are considered`
`533`		`- * relation files. Other forks are alwayes copied in toto, because we cannot`
	`533`	`+ * relation files. Other forks are always copied in toto, because we cannot`
`534`	`534`	`* reliably track changes to them, because WAL only contains block references`
`535`	`535`	`* for the main fork.`
`536`	`536`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ libpqConnect(const char *connstr)`
`69`	`69`	`pg_free(str);`
`70`	`70`
`71`	`71`	`/*`
`72`		`- * Also check that full_page-writes are enabled. We can get torn pages if`
	`72`	`+ * Also check that full_page_writes is enabled. We can get torn pages if`
`73`	`73`	`* a page is modified while we read it with pg_read_binary_file(), and we`
`74`	`74`	`* rely on full page images to fix them.`
`75`	`75`	`*/`
`@@ -465,5 +465,5 @@ execute_pagemap(datapagemap_t pagemap, const char path)`
`465`	`465`
`466`	`466`	`fetch_file_range(path, offset, offset + BLCKSZ);`
`467`	`467`	`}`
`468`		`- free(iter);`
	`468`	`+ pg_free(iter);`
`469`	`469`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,4 @@ extern void pg_fatal(const char *fmt,...) pg_attribute_printf(1, 2) pg_attribute`
`32`	`32`
`33`	`33`	`extern void progress_report(bool force);`
`34`	`34`
`35`		`-#endif`
	`35`	`+#endif /* PG_REWIND_LOGGING_H */`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ main(int argc, char **argv)`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`
`124`		`- while ((c = getopt_long(argc, argv, "D:NnP", long_options, &option_index)) != -1)`
	`124`	`+ while ((c = getopt_long(argc, argv, "D:nP", long_options, &option_index)) != -1)`
`125`	`125`	`{`
`126`	`126`	`switch (c)`
`127`	`127`	`{`
`@@ -370,7 +370,7 @@ sanityChecks(void)`
`370`	`370`	`if (ControlFile_target.data_checksum_version != PG_DATA_CHECKSUM_VERSION &&`
`371`	`371`	`!ControlFile_target.wal_log_hints)`
`372`	`372`	`{`
`373`		`- pg_fatal("target server need to use either data checksums or \"wal_log_hints = on\"\n");`
	`373`	`+ pg_fatal("target server needs to use either data checksums or \"wal_log_hints = on\"\n");`
`374`	`374`	`}`
`375`	`375`
`376`	`376`	`/*`
`@@ -450,7 +450,7 @@ findCommonAncestorTimeline(XLogRecPtr recptr, TimeLineID tli)`
`450`	`450`	`*recptr = entry->end;`
`451`	`451`	`*tli = entry->tli;`
`452`	`452`
`453`		`- free(sourceHistory);`
	`453`	`+ pg_free(sourceHistory);`
`454`	`454`	`return;`
`455`	`455`	`}`
`456`	`456`	`}`