Merge branch 'master' into pgpro-2573

gsmolk · gsmolk · commit 75aa7a435a9e · 2019-04-02T21:45:44.000+03:00
diff --git a/src/restore.c b/src/restore.c
@@ -219,6 +219,7 @@ do_restore_or_validate(time_t target_backup_id, pgRecoveryTarget *rt,
 					}
 				}
 			}
+			pg_free(missing_backup_id);
 			/* No point in doing futher */
 			elog(ERROR, "%s of backup %s failed.", action, base36enc(dest_backup->start_time));
 		}
@@ -255,6 +256,7 @@ do_restore_or_validate(time_t target_backup_id, pgRecoveryTarget *rt,
 					}
 				}
 			}
+			pg_free(parent_backup_id);
 			tmp_backup = find_parent_full_backup(dest_backup);
 
 			/* sanity */
diff --git a/src/utils/logger.c b/src/utils/logger.c
@@ -130,13 +130,13 @@ exit_if_necessary(int elevel)
 		/* If this is not the main thread then don't call exit() */
 		if (main_tid != pthread_self())
 		{
+			/* Interrupt other possible routines */
+			thread_interrupted = true;
 #ifdef WIN32
 			ExitThread(elevel);
 #else
 			pthread_exit(NULL);
 #endif
-			/* Interrupt other possible routines */
-			thread_interrupted = true;
 		}
 		else
 			exit(elevel);
diff --git a/src/validate.c b/src/validate.c
@@ -382,7 +382,6 @@ do_validate_all(void)
 static void
 do_validate_instance(void)
 {
-	char	   *current_backup_id;
 	int			i;
 	int			j;
 	parray	   *backups;
@@ -397,7 +396,6 @@ do_validate_instance(void)
 	for (i = 0; i < parray_num(backups); i++)
 	{
 		pgBackup   *base_full_backup;
-		char	   *parent_backup_id;
 
 		current_backup = (pgBackup *) parray_get(backups, i);
 
@@ -412,6 +410,7 @@ do_validate_instance(void)
 			/* chain is broken */
 			if (result == 0)
 			{
+				char	   *parent_backup_id;
 				/* determine missing backup ID */
 
 				parent_backup_id = base36enc_dup(tmp_backup->parent_backup);
@@ -430,31 +429,31 @@ do_validate_instance(void)
 					elog(WARNING, "Backup %s has missing parent %s",
 						base36enc(current_backup->start_time), parent_backup_id);
 				}
+				pg_free(parent_backup_id);
 				continue;
 			}
 			/* chain is whole, but at least one parent is invalid */
 			else if (result == 1)
 			{
-				/* determine corrupt backup ID */
-				parent_backup_id = base36enc_dup(tmp_backup->start_time);
-
 				/* Oldest corrupt backup has a chance for revalidation */
 				if (current_backup->start_time != tmp_backup->start_time)
 				{
+					char	   *backup_id = base36enc_dup(tmp_backup->start_time);
 					/* orphanize current_backup */
 					if (current_backup->status == BACKUP_STATUS_OK)
 					{
 						write_backup_status(current_backup, BACKUP_STATUS_ORPHAN);
 						elog(WARNING, "Backup %s is orphaned because his parent %s has status: %s",
-								base36enc(current_backup->start_time), parent_backup_id,
+								base36enc(current_backup->start_time), backup_id,
 								status2str(tmp_backup->status));
 					}
 					else
 					{
 						elog(WARNING, "Backup %s has parent %s with status: %s",
-								base36enc(current_backup->start_time),parent_backup_id,
+								base36enc(current_backup->start_time), backup_id,
 								status2str(tmp_backup->status));
 					}
+					pg_free(backup_id);
 					continue;
 				}
 				base_full_backup = find_parent_full_backup(current_backup);
@@ -495,6 +494,7 @@ do_validate_instance(void)
 		 */
 		if (current_backup->status != BACKUP_STATUS_OK)
 		{
+			char	   *current_backup_id;
 			/* This is ridiculous but legal.
 			 * PAGE_b2 <- OK
 			 * PAGE_a2 <- OK

Original file line number	Diff line number	Diff line change
`@@ -219,6 +219,7 @@ do_restore_or_validate(time_t target_backup_id, pgRecoveryTarget *rt,`
`219`	`219`	`}`
`220`	`220`	`}`
`221`	`221`	`}`
	`222`	`+ pg_free(missing_backup_id);`
`222`	`223`	`/* No point in doing futher */`
`223`	`224`	`elog(ERROR, "%s of backup %s failed.", action, base36enc(dest_backup->start_time));`
`224`	`225`	`}`
`@@ -255,6 +256,7 @@ do_restore_or_validate(time_t target_backup_id, pgRecoveryTarget *rt,`
`255`	`256`	`}`
`256`	`257`	`}`
`257`	`258`	`}`
	`259`	`+ pg_free(parent_backup_id);`
`258`	`260`	`tmp_backup = find_parent_full_backup(dest_backup);`
`259`	`261`
`260`	`262`	`/* sanity */`
Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,6 @@ do_validate_all(void)`
`382`	`382`	`static void`
`383`	`383`	`do_validate_instance(void)`
`384`	`384`	`{`
`385`		`- char *current_backup_id;`
`386`	`385`	`int i;`
`387`	`386`	`int j;`
`388`	`387`	`parray *backups;`
`@@ -397,7 +396,6 @@ do_validate_instance(void)`
`397`	`396`	`for (i = 0; i < parray_num(backups); i++)`
`398`	`397`	`{`
`399`	`398`	`pgBackup *base_full_backup;`
`400`		`- char *parent_backup_id;`
`401`	`399`
`402`	`400`	`current_backup = (pgBackup *) parray_get(backups, i);`
`403`	`401`
`@@ -412,6 +410,7 @@ do_validate_instance(void)`
`412`	`410`	`/* chain is broken */`
`413`	`411`	`if (result == 0)`
`414`	`412`	`{`
	`413`	`+ char *parent_backup_id;`
`415`	`414`	`/* determine missing backup ID */`
`416`	`415`
`417`	`416`	`parent_backup_id = base36enc_dup(tmp_backup->parent_backup);`
`@@ -430,31 +429,31 @@ do_validate_instance(void)`
`430`	`429`	`elog(WARNING, "Backup %s has missing parent %s",`
`431`	`430`	`base36enc(current_backup->start_time), parent_backup_id);`
`432`	`431`	`}`
	`432`	`+ pg_free(parent_backup_id);`
`433`	`433`	`continue;`
`434`	`434`	`}`
`435`	`435`	`/* chain is whole, but at least one parent is invalid */`
`436`	`436`	`else if (result == 1)`
`437`	`437`	`{`
`438`		`- /* determine corrupt backup ID */`
`439`		`- parent_backup_id = base36enc_dup(tmp_backup->start_time);`
`440`		`-`
`441`	`438`	`/* Oldest corrupt backup has a chance for revalidation */`
`442`	`439`	`if (current_backup->start_time != tmp_backup->start_time)`
`443`	`440`	`{`
	`441`	`+ char *backup_id = base36enc_dup(tmp_backup->start_time);`
`444`	`442`	`/* orphanize current_backup */`
`445`	`443`	`if (current_backup->status == BACKUP_STATUS_OK)`
`446`	`444`	`{`
`447`	`445`	`write_backup_status(current_backup, BACKUP_STATUS_ORPHAN);`
`448`	`446`	`elog(WARNING, "Backup %s is orphaned because his parent %s has status: %s",`
`449`		`- base36enc(current_backup->start_time), parent_backup_id,`
	`447`	`+ base36enc(current_backup->start_time), backup_id,`
`450`	`448`	`status2str(tmp_backup->status));`
`451`	`449`	`}`
`452`	`450`	`else`
`453`	`451`	`{`
`454`	`452`	`elog(WARNING, "Backup %s has parent %s with status: %s",`
`455`		`- base36enc(current_backup->start_time),parent_backup_id,`
	`453`	`+ base36enc(current_backup->start_time), backup_id,`
`456`	`454`	`status2str(tmp_backup->status));`
`457`	`455`	`}`
	`456`	`+ pg_free(backup_id);`
`458`	`457`	`continue;`
`459`	`458`	`}`
`460`	`459`	`base_full_backup = find_parent_full_backup(current_backup);`
`@@ -495,6 +494,7 @@ do_validate_instance(void)`
`495`	`494`	`*/`
`496`	`495`	`if (current_backup->status != BACKUP_STATUS_OK)`
`497`	`496`	`{`
	`497`	`+ char *current_backup_id;`
`498`	`498`	`/* This is ridiculous but legal.`
`499`	`499`	`* PAGE_b2 <- OK`
`500`	`500`	`* PAGE_a2 <- OK`