Clear PGDATA only if we find dst backup. Also show status if

stalkerg · stalkerg · commit 0ccc9eeac0b4 · 2016-11-17T19:37:39.000+03:00
dst backup is not OK.
diff --git a/restore.c b/restore.c
@@ -112,27 +112,6 @@ do_restore(time_t backup_id,
 	elog(LOG, "latest full backup timeline ID = %u", backup_tli);
 	elog(LOG, "target timeline ID = %u", target_tli);
 
-	/*
-	 * Clear restore destination, but don't remove $PGDATA.
-	 * To remove symbolic link, get file list with "omit_symlink = false".
-	 */
-	if (!check)
-	{
-		elog(LOG, "----------------------------------------");
-		elog(LOG, "clearing restore destination");
-
-		files = parray_new();
-		dir_list_file(files, pgdata, NULL, false, false);
-		parray_qsort(files, pgFileComparePathDesc);	/* delete from leaf */
-
-		for (i = 0; i < parray_num(files); i++)
-		{
-			pgFile *file = (pgFile *) parray_get(files, i);
-			pgFileDelete(file);
-		}
-		parray_walk(files, pgFileFree);
-		parray_free(files);
-	}
 
 	/* Read timeline history files from archives */
 	timelines = readTimeLineHistory(target_tli);
@@ -151,6 +130,11 @@ do_restore(time_t backup_id,
 		)
 			backup_id_found = true;
 
+		if (backup_id == base_backup->start_time &&
+			base_backup->status != BACKUP_STATUS_OK
+		)
+			elog(ERROR, "given backup %s is %s", base36enc(backup_id), status2str(base_backup->status));
+
 		if (base_backup->backup_mode < BACKUP_MODE_FULL ||
 			base_backup->status != BACKUP_STATUS_OK)
 			continue;
@@ -166,6 +150,28 @@ do_restore(time_t backup_id,
 base_backup_found:
 	base_index = i;
 
+	/*
+	 * Clear restore destination, but don't remove $PGDATA.
+	 * To remove symbolic link, get file list with "omit_symlink = false".
+	 */
+	if (!check)
+	{
+		elog(LOG, "----------------------------------------");
+		elog(LOG, "clearing restore destination");
+
+		files = parray_new();
+		dir_list_file(files, pgdata, NULL, false, false);
+		parray_qsort(files, pgFileComparePathDesc);	/* delete from leaf */
+
+		for (i = 0; i < parray_num(files); i++)
+		{
+			pgFile *file = (pgFile *) parray_get(files, i);
+			pgFileDelete(file);
+		}
+		parray_walk(files, pgFileFree);
+		parray_free(files);
+	}
+
 	print_backup_lsn(base_backup);
 
 	if (backup_id != 0)
