Merge branch 'master' into release_2_5

Author: alubennikova

doc/pgprobackup.xml

@@ -3978,6 +3978,10 @@ pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replac
         this flag if you need to restore the
         <productname>PostgreSQL</productname> cluster from a corrupt or an invalid backup.
         Use with caution.
+        When used with <link linkend="pbk-incremental-restore">incremental restore</link> this flag
+        allows to replace already existing PGDATA with different system ID. In case of tablespaces,
+        remapped via <literal>--tablespace-mapping</literal> option into not empty directories,
+        the old content of such directories will be deleted.
       </para>
       </listitem>
       </varlistentry>

src/backup.c

@@ -95,7 +95,6 @@ static void
 do_backup_instance(PGconn *backup_conn, PGNodeInfo *nodeInfo, bool no_sync, bool backup_logs)
 {
 	int			i;
-	char		database_path[MAXPGPATH];
 	char		external_prefix[MAXPGPATH]; /* Temp value. Used as template */
 	char		dst_backup_path[MAXPGPATH];
 	char		label[1024];
@@ -147,15 +146,6 @@ do_backup_instance(PGconn *backup_conn, PGNodeInfo *nodeInfo, bool no_sync, bool
 	current.tli = get_current_timeline_from_control(false);
 #endif
 
-	/* In PAGE mode or in ARCHIVE wal-mode wait for current segment */
-	if (current.backup_mode == BACKUP_MODE_DIFF_PAGE ||!stream_wal)
-		/*
-		 * Do not wait start_lsn for stream backup.
-		 * Because WAL streaming will start after pg_start_backup() in stream
-		 * mode.
-		 */
-		wait_wal_lsn(current.start_lsn, true, current.tli, false, true, ERROR, false);
-
 	/*
 	 * In incremental backup mode ensure that already-validated
 	 * backup on current timeline exists and get its filelist.
@@ -265,31 +255,39 @@ do_backup_instance(PGconn *backup_conn, PGNodeInfo *nodeInfo, bool no_sync, bool
 	/* Update running backup meta with START LSN */
 	write_backup(&current, true);
 
-	pgBackupGetPath(&current, database_path, lengthof(database_path),
-					DATABASE_DIR);
-	pgBackupGetPath(&current, external_prefix, lengthof(external_prefix),
-					EXTERNAL_DIR);
+	/* In PAGE mode or in ARCHIVE wal-mode wait for current segment */
+	if (current.backup_mode == BACKUP_MODE_DIFF_PAGE || !stream_wal)
+	{
+		/* Check that archive_dir can be reached */
+		if (fio_access(arclog_path, F_OK, FIO_BACKUP_HOST) != 0)
+			elog(ERROR, "WAL archive directory is not accessible \"%s\": %s",
+				arclog_path, strerror(errno));
 
-	/* initialize backup's file list */
-	backup_files_list = parray_new();
+		/*
+		 * Do not wait start_lsn for stream backup.
+		 * Because WAL streaming will start after pg_start_backup() in stream
+		 * mode.
+		 */
+		wait_wal_lsn(current.start_lsn, true, current.tli, false, true, ERROR, false);
+	}
 
 	/* start stream replication */
 	if (stream_wal)
 	{
-		join_path_components(dst_backup_path, database_path, PG_XLOG_DIR);
+		join_path_components(dst_backup_path, current.database_dir, PG_XLOG_DIR);
 		fio_mkdir(dst_backup_path, DIR_PERMISSION, FIO_BACKUP_HOST);
 
 		start_WAL_streaming(backup_conn, dst_backup_path, &instance_config.conn_opt,
 							current.start_lsn, current.tli);
 	}
 
+	/* initialize backup's file list */
+	backup_files_list = parray_new();
+	join_path_components(external_prefix, current.root_dir, EXTERNAL_DIR);
+
 	/* list files with the logical path. omit $PGDATA */
-	if (fio_is_remote(FIO_DB_HOST))
-		fio_list_dir(backup_files_list, instance_config.pgdata,
-					 true, true, false, backup_logs, true, 0);
-	else
-		dir_list_file(backup_files_list, instance_config.pgdata,
-					  true, true, false, backup_logs, true, 0, FIO_LOCAL_HOST);
+	fio_list_dir(backup_files_list, instance_config.pgdata,
+				 true, true, false, backup_logs, true, 0);
 
 	/*
 	 * Get database_map (name to oid) for use in partial restore feature.
@@ -441,7 +439,7 @@ do_backup_instance(PGconn *backup_conn, PGNodeInfo *nodeInfo, bool no_sync, bool
 				join_path_components(dirpath, temp, file->rel_path);
 			}
 			else
-				join_path_components(dirpath, database_path, file->rel_path);
+				join_path_components(dirpath, current.database_dir, file->rel_path);
 
 			elog(VERBOSE, "Create directory '%s'", dirpath);
 			fio_mkdir(dirpath, DIR_PERMISSION, FIO_BACKUP_HOST);
@@ -475,7 +473,7 @@ do_backup_instance(PGconn *backup_conn, PGNodeInfo *nodeInfo, bool no_sync, bool
 
 		arg->nodeInfo = nodeInfo;
 		arg->from_root = instance_config.pgdata;
-		arg->to_root = database_path;
+		arg->to_root = current.database_dir;
 		arg->external_prefix = external_prefix;
 		arg->external_dirs = external_dirs;
 		arg->files_list = backup_files_list;
@@ -552,7 +550,7 @@ do_backup_instance(PGconn *backup_conn, PGNodeInfo *nodeInfo, bool no_sync, bool
 			elog(ERROR, "Failed to find file \"%s\" in backup filelist.",
 							XLOG_CONTROL_FILE);
 
-		set_min_recovery_point(pg_control, database_path, current.stop_lsn);
+		set_min_recovery_point(pg_control, current.database_dir, current.stop_lsn);
 	}
 
 	/* close and sync page header map */
@@ -609,7 +607,7 @@ do_backup_instance(PGconn *backup_conn, PGNodeInfo *nodeInfo, bool no_sync, bool
 
 			/* construct fullpath */
 			if (file->external_dir_num == 0)
-				join_path_components(to_fullpath, database_path, file->rel_path);
+				join_path_components(to_fullpath, current.database_dir, file->rel_path);
 			else
 			{
 				char 	external_dst[MAXPGPATH];
@@ -726,8 +724,8 @@ pgdata_basic_setup(ConnectionOptions conn_opt, PGNodeInfo *nodeInfo)
  * Entry point of pg_probackup BACKUP subcommand.
  */
 int
-do_backup(time_t start_time, pgSetBackupParams *set_backup_params,
-			bool no_validate, bool no_sync, bool backup_logs)
+do_backup(pgSetBackupParams *set_backup_params,
+		  bool no_validate, bool no_sync, bool backup_logs)
 {
 	PGconn		*backup_conn = NULL;
 	PGNodeInfo	nodeInfo;
@@ -736,37 +734,37 @@ do_backup(time_t start_time, pgSetBackupParams *set_backup_params,
 	/* Initialize PGInfonode */
 	pgNodeInit(&nodeInfo);
 
+	/* Save list of external directories */
+	if (instance_config.external_dir_str &&
+		(pg_strcasecmp(instance_config.external_dir_str, "none") != 0))
+		current.external_dir_str = instance_config.external_dir_str;
+
+	/* Create backup directory and BACKUP_CONTROL_FILE */
+	pgBackupCreateDir(&current, backup_instance_path);
+
 	if (!instance_config.pgdata)
 		elog(ERROR, "required parameter not specified: PGDATA "
 						 "(-D, --pgdata)");
 
 	/* Update backup status and other metainfo. */
 	current.status = BACKUP_STATUS_RUNNING;
-	current.start_time = start_time;
+	current.start_time = current.backup_id;
 
 	StrNCpy(current.program_version, PROGRAM_VERSION,
 			sizeof(current.program_version));
 
 	current.compress_alg = instance_config.compress_alg;
 	current.compress_level = instance_config.compress_level;
 
-	/* Save list of external directories */
-	if (instance_config.external_dir_str &&
-		(pg_strcasecmp(instance_config.external_dir_str, "none") != 0))
-		current.external_dir_str = instance_config.external_dir_str;
-
 	elog(INFO, "Backup start, pg_probackup version: %s, instance: %s, backup ID: %s, backup mode: %s, "
 			"wal mode: %s, remote: %s, compress-algorithm: %s, compress-level: %i",
-			PROGRAM_VERSION, instance_name, base36enc(start_time), pgBackupGetBackupMode(&current, false),
+			PROGRAM_VERSION, instance_name, base36enc(current.backup_id), pgBackupGetBackupMode(&current, false),
 			current.stream ? "STREAM" : "ARCHIVE", IsSshProtocol()  ? "true" : "false",
 			deparse_compress_alg(current.compress_alg), current.compress_level);
 
-	/* Create backup directory and BACKUP_CONTROL_FILE */
-	if (pgBackupCreateDir(&current))
-		elog(ERROR, "Cannot create backup directory");
 	if (!lock_backup(&current, true, true))
 		elog(ERROR, "Cannot lock backup %s directory",
-			 base36enc(current.start_time));
+			 base36enc(current.backup_id));
 	write_backup(&current, true);
 
 	/* set the error processing function for the backup process */
@@ -781,7 +779,7 @@ do_backup(time_t start_time, pgSetBackupParams *set_backup_params,
 	backup_conn = pgdata_basic_setup(instance_config.conn_opt, &nodeInfo);
 
 	if (current.from_replica)
-		elog(INFO, "Backup %s is going to be taken from standby", base36enc(start_time));
+		elog(INFO, "Backup %s is going to be taken from standby", base36enc(current.backup_id));
 
 	/* TODO, print PostgreSQL full version */
 	//elog(INFO, "PostgreSQL version: %s", nodeInfo.server_version_str);

src/catalog.c

@@ -23,6 +23,7 @@ static pgBackup* get_closest_backup(timelineInfo *tlinfo);
 static pgBackup* get_oldest_backup(timelineInfo *tlinfo);
 static const char *backupModes[] = {"", "PAGE", "PTRACK", "DELTA", "FULL"};
 static pgBackup *readBackupControlFile(const char *path);
+static time_t create_backup_dir(pgBackup *backup, const char *backup_instance_path);
 
 static bool backup_lock_exit_hook_registered = false;
 static parray *lock_files = NULL;
@@ -1149,12 +1150,18 @@ get_multi_timeline_parent(parray *backup_list, parray *tli_list,
 	return NULL;
 }
 
-/* create backup directory in $BACKUP_PATH */
-int
-pgBackupCreateDir(pgBackup *backup)
+/* Create backup directory in $BACKUP_PATH
+ * Note, that backup_id attribute is updated,
+ * so it is possible to get diffrent values in
+ * pgBackup.start_time and pgBackup.backup_id.
+ * It may be ok or maybe not, so it's up to the caller
+ * to fix it or let it be.
+ */
+
+void
+pgBackupCreateDir(pgBackup *backup, const char *backup_instance_path)
 {
 	int		i;
-	char	path[MAXPGPATH];
 	parray *subdirs = parray_new();
 
 	parray_append(subdirs, pg_strdup(DATABASE_DIR));
@@ -1176,13 +1183,10 @@ pgBackupCreateDir(pgBackup *backup)
 		free_dir_list(external_list);
 	}
 
-	pgBackupGetPath(backup, path, lengthof(path), NULL);
-
-	if (!dir_is_empty(path, FIO_BACKUP_HOST))
-		elog(ERROR, "backup destination is not empty \"%s\"", path);
+	backup->backup_id = create_backup_dir(backup, backup_instance_path);
 
-	fio_mkdir(path, DIR_PERMISSION, FIO_BACKUP_HOST);
-	backup->root_dir = pgut_strdup(path);
+	if (backup->backup_id == 0)
+		elog(ERROR, "Cannot create backup directory: %s", strerror(errno));
 
 	backup->database_dir = pgut_malloc(MAXPGPATH);
 	join_path_components(backup->database_dir, backup->root_dir, DATABASE_DIR);
@@ -1193,11 +1197,47 @@ pgBackupCreateDir(pgBackup *backup)
 	/* create directories for actual backup files */
 	for (i = 0; i < parray_num(subdirs); i++)
 	{
+		char	path[MAXPGPATH];
+
 		join_path_components(path, backup->root_dir, parray_get(subdirs, i));
 		fio_mkdir(path, DIR_PERMISSION, FIO_BACKUP_HOST);
 	}
 
 	free_dir_list(subdirs);
+}
+
+/*
+ * Create root directory for backup,
+ * update pgBackup.root_dir if directory creation was a success
+ */
+time_t
+create_backup_dir(pgBackup *backup, const char *backup_instance_path)
+{
+	int     attempts = 10;
+
+	while (attempts--)
+	{
+		int    rc;
+		char   path[MAXPGPATH];
+		time_t backup_id = time(NULL);
+
+		join_path_components(path, backup_instance_path, base36enc(backup_id));
+
+		/* TODO: add wrapper for remote mode */
+		rc = dir_create_dir(path, DIR_PERMISSION, true);
+
+		if (rc == 0)
+		{
+			backup->root_dir = pgut_strdup(path);
+			return backup_id;
+		}
+		else
+		{
+			elog(WARNING, "Cannot create directory \"%s\": %s", path, strerror(errno));
+			sleep(1);
+		}
+	}
+
 	return 0;
 }
 

src/delete.c

@@ -720,6 +720,7 @@ do_retention_wal(bool dry_run)
 /*
  * Delete backup files of the backup and update the status of the backup to
  * BACKUP_STATUS_DELETED.
+ * TODO: delete files on multiple threads
  */
 void
 delete_backup_files(pgBackup *backup)