Merge branch 'master' into release_2_5

Author: gsmolk

src/catalog.c

@@ -842,7 +842,7 @@ IsDir(const char *dirpath, const char *entry, fio_location location)
 	char		path[MAXPGPATH];
 	struct stat	st;
 
-	snprintf(path, MAXPGPATH, "%s/%s", dirpath, entry);
+	join_path_components(path, dirpath, entry);
 
 	return fio_stat(path, &st, false, location) == 0 && S_ISDIR(st.st_mode);
 }
@@ -956,7 +956,7 @@ catalog_get_backup_list(InstanceState *instanceState, time_t requested_backup_id
 		join_path_components(data_path, instanceState->instance_backup_subdir_path, data_ent->d_name);
 
 		/* read backup information from BACKUP_CONTROL_FILE */
-		snprintf(backup_conf_path, MAXPGPATH, "%s/%s", data_path, BACKUP_CONTROL_FILE);
+		join_path_components(backup_conf_path, data_path, BACKUP_CONTROL_FILE);
 		backup = readBackupControlFile(backup_conf_path);
 
 		if (!backup)

src/data.c

@@ -1516,7 +1516,7 @@ validate_one_page(Page page, BlockNumber absolute_blkno,
 }
 
 /*
- * Valiate pages of datafile in PGDATA one by one.
+ * Validate pages of datafile in PGDATA one by one.
  *
  * returns true if the file is valid
  * also returns true if the file was not found

src/parsexlog.c

@@ -1017,7 +1017,7 @@ SimpleXLogPageRead(XLogReaderState *xlogreader, XLogRecPtr targetPagePtr,
 
 		GetXLogFileName(xlogfname, reader_data->tli, reader_data->xlogsegno, wal_seg_size);
 
-		snprintf(reader_data->xlogpath, MAXPGPATH, "%s/%s", wal_archivedir, xlogfname);
+		join_path_components(reader_data->xlogpath, wal_archivedir, xlogfname);
 		snprintf(reader_data->gz_xlogpath, MAXPGPATH, "%s.gz", reader_data->xlogpath);
 
 		/* We fall back to using .partial segment in case if we are running

src/pg_probackup.h

@@ -1101,8 +1101,6 @@ extern PageState *get_checksum_map(const char *fullpath, uint32 checksum_version
 								int n_blocks, XLogRecPtr dest_stop_lsn, BlockNumber segmentno);
 extern datapagemap_t *get_lsn_map(const char *fullpath, uint32 checksum_version,
 								  int n_blocks, XLogRecPtr shift_lsn, BlockNumber segmentno);
-extern pid_t check_postmaster(const char *pgdata);
-
 extern bool validate_file_pages(pgFile *file, const char *fullpath, XLogRecPtr stop_lsn,
 							    uint32 checksum_version, uint32 backup_version, HeaderMap *hdr_map);
 

src/restore.c

@@ -1483,7 +1483,7 @@ update_recovery_options_before_v12(InstanceState *instanceState, pgBackup *backu
 	}
 
 	elog(LOG, "update recovery settings in recovery.conf");
-	snprintf(path, lengthof(path), "%s/recovery.conf", instance_config.pgdata);
+	join_path_components(path, instance_config.pgdata, "recovery.conf");
 
 	fp = fio_fopen(path, "w", FIO_DB_HOST);
 	if (fp == NULL)
@@ -1540,8 +1540,7 @@ update_recovery_options(InstanceState *instanceState, pgBackup *backup,
 
 	time2iso(current_time_str, lengthof(current_time_str), current_time, false);
 
-	snprintf(postgres_auto_path, lengthof(postgres_auto_path),
-				"%s/postgresql.auto.conf", instance_config.pgdata);
+	join_path_components(postgres_auto_path, instance_config.pgdata, "postgresql.auto.conf");
 
 	if (fio_stat(postgres_auto_path, &st, false, FIO_DB_HOST) < 0)
 	{
@@ -1651,7 +1650,7 @@ update_recovery_options(InstanceState *instanceState, pgBackup *backup,
 		if (params->recovery_settings_mode == PITR_REQUESTED)
 		{
 			elog(LOG, "creating recovery.signal file");
-			snprintf(path, lengthof(path), "%s/recovery.signal", instance_config.pgdata);
+			join_path_components(path, instance_config.pgdata, "recovery.signal");
 
 			fp = fio_fopen(path, PG_BINARY_W, FIO_DB_HOST);
 			if (fp == NULL)
@@ -1667,7 +1666,7 @@ update_recovery_options(InstanceState *instanceState, pgBackup *backup,
 		if (params->restore_as_replica)
 		{
 			elog(LOG, "creating standby.signal file");
-			snprintf(path, lengthof(path), "%s/standby.signal", instance_config.pgdata);
+			join_path_components(path, instance_config.pgdata, "standby.signal");
 
 			fp = fio_fopen(path, PG_BINARY_W, FIO_DB_HOST);
 			if (fp == NULL)
@@ -2163,7 +2162,7 @@ check_incremental_compatibility(const char *pgdata, uint64 system_identifier,
 	{
 		char pid_file[MAXPGPATH];
 
-		snprintf(pid_file, MAXPGPATH, "%s/postmaster.pid", pgdata);
+		join_path_components(pid_file, pgdata, "postmaster.pid");
 		elog(WARNING, "Pid file \"%s\" is mangled, cannot determine whether postmaster is running or not",
 			pid_file);
 		success = false;
@@ -2204,7 +2203,7 @@ check_incremental_compatibility(const char *pgdata, uint64 system_identifier,
 	 */
 	if (incremental_mode == INCR_LSN)
 	{
-		snprintf(backup_label, MAXPGPATH, "%s/backup_label", pgdata);
+		join_path_components(backup_label, pgdata, "backup_label");
 		if (fio_access(backup_label, F_OK, FIO_DB_HOST) == 0)
 		{
 			elog(WARNING, "Destination directory contains \"backup_control\" file. "

src/util.c

@@ -418,7 +418,7 @@ set_min_recovery_point(pgFile *file, const char *backup_path,
 	FIN_CRC32C(ControlFile.crc);
 
 	/* overwrite pg_control */
-	snprintf(fullpath, sizeof(fullpath), "%s/%s", backup_path, XLOG_CONTROL_FILE);
+	join_path_components(fullpath, backup_path, XLOG_CONTROL_FILE);
 	writeControlFile(&ControlFile, fullpath, FIO_LOCAL_HOST);
 
 	/* Update pg_control checksum in backup_list */
@@ -579,51 +579,3 @@ datapagemap_print_debug(datapagemap_t *map)
 
 	pg_free(iter);
 }
-
-/*
- * Return pid of postmaster process running in given pgdata.
- * Return 0 if there is none.
- * Return 1 if postmaster.pid is mangled.
- */
-pid_t
-check_postmaster(const char *pgdata)
-{
-	FILE  *fp;
-	pid_t  pid;
-	char   pid_file[MAXPGPATH];
-
-	snprintf(pid_file, MAXPGPATH, "%s/postmaster.pid", pgdata);
-
-	fp = fopen(pid_file, "r");
-	if (fp == NULL)
-	{
-		/* No pid file, acceptable*/
-		if (errno == ENOENT)
-			return 0;
-		else
-			elog(ERROR, "Cannot open file \"%s\": %s",
-				pid_file, strerror(errno));
-	}
-
-	if (fscanf(fp, "%i", &pid) != 1)
-	{
-		/* something is wrong with the file content */
-		pid = 1;
-	}
-
-	if (pid > 1)
-	{
-		if (kill(pid, 0) != 0)
-		{
-			/* process no longer exists */
-			if (errno == ESRCH)
-				pid = 0;
-			else
-				elog(ERROR, "Failed to send signal 0 to a process %d: %s",
-						pid, strerror(errno));
-		}
-	}
-
-	fclose(fp);
-	return pid;
-}