s/pg_probackup/pg_backup/ (#2)

Author: kulaginm

.gitignore

@@ -1,5 +1,6 @@
 # Object files
 *.o
+*.bc
 
 # Libraries
 *.lib
@@ -19,7 +20,7 @@
 .deps
 
 # Binaries
-/pg_probackup
+/pg_backup
 
 # Generated translated file
 /po/ru.mo

Makefile

@@ -1,7 +1,7 @@
-PROGRAM = pg_probackup
+PROGRAM = pg_backup
 WORKDIR ?= $(CURDIR)
 BUILDDIR = $(WORKDIR)/build/
-PBK_GIT_REPO = https://github.com/postgrespro/pg_probackup
+PBK_GIT_REPO = https://github.com/pgtoolz/pg_backup
 
 # utils
 OBJS = src/utils/configuration.o src/utils/json.o src/utils/logger.o \
@@ -24,7 +24,7 @@ ifdef top_srcdir
 srchome := $(abspath $(top_srcdir))
 else
 top_srcdir=../..
-ifneq (,$(wildcard ../../../contrib/pg_probackup))
+ifneq (,$(wildcard ../../../contrib/pg_backup))
 # separate build directory support
 srchome := $(abspath $(top_srcdir)/..)
 else
@@ -43,7 +43,7 @@ PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 else
-subdir=contrib/pg_probackup
+subdir=contrib/pg_backup
 top_builddir=../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk

doc/Readme.md

@@ -1,5 +1,5 @@
 # Generating documentation
 ```
 xmllint --noout --valid probackup.xml
-xsltproc stylesheet.xsl probackup.xml >pg-probackup.html
+xsltproc stylesheet.xsl probackup.xml >pg_backup.html
 ```

doc/pgprobackup.xml

@@ -1,5 +1,5 @@
 # contrib/pg_probackup/nls.mk
-CATALOG_NAME     = pg_probackup
+CATALOG_NAME     = pg_backup
 AVAIL_LANGUAGES  = ru
 GETTEXT_FILES    = src/help.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)

nls.mk

@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * archive.c: -  pg_probackup specific archive commands for archive backups.
+ * archive.c: -  pg_backup specific archive commands for archive backups.
  *
  *
  * Portions Copyright (c) 2018-2022, Postgres Professional
@@ -106,9 +106,9 @@ static parray *setup_push_filelist(const char *archive_status_dir,
  * At this point, we already done one roundtrip to archive server
  * to get instance config.
  *
- * pg_probackup specific archive command for archive backups
+ * pg_backup specific archive command for archive backups
  * set archive_command to
- * 'pg_probackup archive-push -B /home/anastasia/backup --wal-file-name %f',
+ * 'pg_backup archive-push -B /home/anastasia/backup --wal-file-name %f',
  * to move backups into arclog_path.
  * Where archlog_path is $BACKUP_PATH/wal/instance_name
  */
@@ -154,9 +154,9 @@ do_archive_push(InstanceState *instanceState, InstanceConfig *instance, char *pg
 	if (num_threads > parray_num(batch_files))
 		n_threads = parray_num(batch_files);
 
-	elog(INFO, "pg_probackup archive-push WAL file: %s, "
+	elog(INFO, "%s archive-push WAL file: %s, "
 					"threads: %i/%i, batch: %lu/%i, compression: %s",
-						wal_file_name, n_threads, num_threads,
+						PROGRAM_NAME, wal_file_name, n_threads, num_threads,
 						parray_num(batch_files), batch_size,
 						is_compress ? "zlib" : "none");
 
@@ -265,13 +265,13 @@ do_archive_push(InstanceState *instanceState, InstanceConfig *instance, char *pg
 
 	if (push_isok)
 		/* report number of files pushed into archive */
-		elog(INFO, "pg_probackup archive-push completed successfully, "
+		elog(INFO, "%s archive-push completed successfully, "
 					"pushed: %u, skipped: %u, time elapsed: %s",
-					n_total_pushed, n_total_skipped, pretty_time_str);
+					PROGRAM_NAME, n_total_pushed, n_total_skipped, pretty_time_str);
 	else
-		elog(ERROR, "pg_probackup archive-push failed, "
+		elog(ERROR, "%s archive-push failed, "
 					"pushed: %i, skipped: %u, failed: %u, time elapsed: %s",
-					n_total_pushed, n_total_skipped, n_total_failed,
+					PROGRAM_NAME, n_total_pushed, n_total_skipped, n_total_failed,
 					pretty_time_str);
 }
 
@@ -968,7 +968,7 @@ setup_push_filelist(const char *archive_status_dir, const char *first_file,
 }
 
 /*
- * pg_probackup specific restore command.
+ * pg_backup specific restore command.
  * Move files from arclog_path to pgdata/wal_file_path.
  *
  *  The problem with archive-get: we must be very careful about
@@ -1027,8 +1027,8 @@ do_archive_get(InstanceState *instanceState, InstanceConfig *instance, const cha
 	INSTR_TIME_SET_CURRENT(start_time);
 	if (num_threads > batch_size)
 		n_actual_threads = batch_size;
-	elog(INFO, "pg_probackup archive-get WAL file: %s, remote: %s, threads: %i/%i, batch: %i",
-			wal_file_name, IsSshProtocol() ? "ssh" : "none", n_actual_threads, num_threads, batch_size);
+	elog(INFO, "%s archive-get WAL file: %s, remote: %s, threads: %i/%i, batch: %i",
+			PROGRAM_NAME, wal_file_name, IsSshProtocol() ? "ssh" : "none", n_actual_threads, num_threads, batch_size);
 
 	num_threads = n_actual_threads;
 
@@ -1084,8 +1084,8 @@ do_archive_get(InstanceState *instanceState, InstanceConfig *instance, const cha
 										  validate_wal))
 			{
 				n_files_in_prefetch--;
-				elog(INFO, "pg_probackup archive-get used prefetched WAL segment %s, prefetch state: %u/%u",
-						wal_file_name, n_files_in_prefetch, batch_size);
+				elog(INFO, "%s archive-get used prefetched WAL segment %s, prefetch state: %u/%u",
+						PROGRAM_NAME, wal_file_name, n_files_in_prefetch, batch_size);
 				goto get_done;
 			}
 			else
@@ -1122,8 +1122,8 @@ do_archive_get(InstanceState *instanceState, InstanceConfig *instance, const cha
 										  instance->xlog_seg_size, validate_wal))
 			{
 				n_files_in_prefetch--;
-				elog(INFO, "pg_probackup archive-get copied WAL file %s, prefetch state: %u/%u",
-						wal_file_name, n_files_in_prefetch, batch_size);
+				elog(INFO, "%s archive-get copied WAL file %s, prefetch state: %u/%u",
+						PROGRAM_NAME, wal_file_name, n_files_in_prefetch, batch_size);
 				goto get_done;
 			}
 //			else
@@ -1154,7 +1154,7 @@ do_archive_get(InstanceState *instanceState, InstanceConfig *instance, const cha
 		if (get_wal_file(wal_file_name, backup_wal_file_path, absolute_wal_file_path, false))
 		{
 			fail_count = 0;
-			elog(LOG, "pg_probackup archive-get copied WAL file %s", wal_file_name);
+			elog(LOG, "%s archive-get copied WAL file %s", PROGRAM_NAME, wal_file_name);
 			n_fetched++;
 			break;
 		}
@@ -1182,11 +1182,11 @@ do_archive_get(InstanceState *instanceState, InstanceConfig *instance, const cha
 	pretty_time_interval(get_time, pretty_time_str, 20);
 
 	if (fail_count == 0)
-		elog(INFO, "pg_probackup archive-get completed successfully, fetched: %i/%i, time elapsed: %s",
-				n_fetched, batch_size, pretty_time_str);
+		elog(INFO, "%s archive-get completed successfully, fetched: %i/%i, time elapsed: %s",
+				PROGRAM_NAME, n_fetched, batch_size, pretty_time_str);
 	else
-		elog(ERROR, "pg_probackup archive-get failed to deliver WAL file: %s, time elapsed: %s",
-				wal_file_name, pretty_time_str);
+		elog(ERROR, "%s archive-get failed to deliver WAL file: %s, time elapsed: %s",
+				PROGRAM_NAME, wal_file_name, pretty_time_str);
 }
 
 /*

src/archive.c

@@ -24,8 +24,6 @@
 #include "utils/thread.h"
 #include "utils/file.h"
 
-//const char *progname = "pg_probackup";
-
 /* list of files contained in backup */
 parray *backup_files_list = NULL;
 
@@ -126,8 +124,8 @@ do_backup_pg(InstanceState *instanceState, PGconn *backup_conn,
 
 	/* notify start of backup to PostgreSQL server */
 	time2iso(label, lengthof(label), current.start_time, false);
-	strncat(label, " with pg_probackup", lengthof(label) -
-			strlen(" with pg_probackup"));
+	strncat(label, " with pg_backup", lengthof(label) -
+			strlen(" with pg_backup"));
 
 	/* Call pg_start_backup function in PostgreSQL connect */
 	pg_start_backup(label, smooth_checkpoint, &current, nodeInfo, backup_conn);
@@ -187,10 +185,11 @@ do_backup_pg(InstanceState *instanceState, PGconn *backup_conn,
 	if (prev_backup)
 	{
 		if (parse_program_version(prev_backup->program_version) > parse_program_version(PROGRAM_VERSION))
-			elog(ERROR, "pg_probackup binary version is %s, but backup %s version is %s. "
-						"pg_probackup do not guarantee to be forward compatible. "
-						"Please upgrade pg_probackup binary.",
-						PROGRAM_VERSION, backup_id_of(prev_backup), prev_backup->program_version);
+			elog(ERROR, "%s binary version is %s, but backup %s version is %s. "
+						"%s do not guarantee to be forward compatible. "
+						"Please upgrade %s binary.",
+						PROGRAM_NAME, PROGRAM_VERSION, backup_id_of(prev_backup),
+						prev_backup->program_version, PROGRAM_NAME, PROGRAM_NAME);
 
 		elog(INFO, "Parent backup: %s", backup_id_of(prev_backup));
 
@@ -314,7 +313,7 @@ do_backup_pg(InstanceState *instanceState, PGconn *backup_conn,
 
 	if (parray_num(backup_files_list) < 100)
 		elog(ERROR, "PGDATA is almost empty. Either it was concurrently deleted or "
-			"pg_probackup do not possess sufficient permissions to list PGDATA content");
+			"%s do not possess sufficient permissions to list PGDATA content", PROGRAM_NAME);
 
 	current.pgdata_bytes += calculate_datasize_of_filelist(backup_files_list);
 	pretty_size(current.pgdata_bytes, pretty_bytes, lengthof(pretty_bytes));
@@ -677,12 +676,12 @@ pgdata_basic_setup(ConnectionOptions conn_opt, PGNodeInfo *nodeInfo)
 					"Data block corruption will be detected");
 	else
 		elog(WARNING, "This PostgreSQL instance was initialized without data block checksums. "
-						"pg_probackup have no way to detect data block corruption without them. "
-						"Reinitialize PGDATA with option '--data-checksums'.");
+						"%s have no way to detect data block corruption without them. "
+						"Reinitialize PGDATA with option '--data-checksums'.", PROGRAM_NAME);
 
 	if (nodeInfo->is_superuser)
 		elog(WARNING, "Current PostgreSQL role is superuser. "
-						"It is not recommended to run pg_probackup under superuser.");
+						"It is not recommended to run %s under superuser.", PROGRAM_NAME);
 
 	strlcpy(current.server_version, nodeInfo->server_version_str,
 			sizeof(current.server_version));
@@ -691,7 +690,7 @@ pgdata_basic_setup(ConnectionOptions conn_opt, PGNodeInfo *nodeInfo)
 }
 
 /*
- * Entry point of pg_probackup BACKUP subcommand.
+ * Entry point of pg_backup BACKUP subcommand.
  *
  * if start_time == INVALID_BACKUP_ID then we can generate backup_id
  */
@@ -777,9 +776,9 @@ do_backup(InstanceState *instanceState, pgSetBackupParams *set_backup_params,
 	current.compress_alg = instance_config.compress_alg;
 	current.compress_level = instance_config.compress_level;
 
-	elog(INFO, "Backup start, pg_probackup version: %s, instance: %s, backup ID: %s, backup mode: %s, "
+	elog(INFO, "Backup start, %s version: %s, instance: %s, backup ID: %s, backup mode: %s, "
 			"wal mode: %s, remote: %s, compress-algorithm: %s, compress-level: %i",
-			PROGRAM_VERSION, instanceState->instance_name, backup_id_of(&current), pgBackupGetBackupMode(&current, false),
+			PROGRAM_NAME, PROGRAM_VERSION, instanceState->instance_name, backup_id_of(&current), pgBackupGetBackupMode(&current, false),
 			current.stream ? "STREAM" : "ARCHIVE", IsSshProtocol()  ? "true" : "false",
 			deparse_compress_alg(current.compress_alg), current.compress_level);
 
@@ -1433,9 +1432,9 @@ wait_wal_lsn(const char *wal_segment_dir, XLogRecPtr target_lsn, bool is_start_l
 		}
 
 		if (!current.stream && is_start_lsn && try_count == 30)
-			elog(WARNING, "By default pg_probackup assume WAL delivery method to be ARCHIVE. "
+			elog(WARNING, "By default %s assume WAL delivery method to be ARCHIVE. "
 				 "If continuous archiving is not set up, use '--stream' option to make autonomous backup. "
-				 "Otherwise check that continuous archiving works correctly.");
+				 "Otherwise check that continuous archiving works correctly.", PROGRAM_NAME);
 
 		if (timeout > 0 && try_count > timeout)
 		{
@@ -1609,7 +1608,7 @@ pg_create_restore_point(PGconn *conn, time_t backup_start_time)
 	const char	*params[1];
 	char		name[1024];
 
-	snprintf(name, lengthof(name), "pg_probackup, backup_id %s",
+	snprintf(name, lengthof(name), "pg_backup, backup_id %s",
 				base36enc(backup_start_time));
 	params[0] = name;
 

src/backup.c

@@ -73,10 +73,10 @@ catchup_init_state(PGNodeInfo	*source_node_info, const char *source_pgdata, cons
 	current.tli = get_current_timeline_from_control(source_pgdata, FIO_DB_HOST, false);
 #endif
 
-	elog(INFO, "Catchup start, pg_probackup version: %s, "
+	elog(INFO, "Catchup start, %s version: %s, "
 			"PostgreSQL version: %s, "
 			"remote: %s, source-pgdata: %s, destination-pgdata: %s",
-			PROGRAM_VERSION, source_node_info->server_version_str,
+			PROGRAM_NAME, PROGRAM_VERSION, source_node_info->server_version_str,
 			IsSshProtocol()  ? "true" : "false",
 			source_pgdata, dest_pgdata);
 
@@ -613,7 +613,7 @@ filter_filelist(parray *filelist, const char *pgdata,
 }
 
 /*
- * Entry point of pg_probackup CATCHUP subcommand.
+ * Entry point of pg_backup CATCHUP subcommand.
  * exclude_*_paths_list are parray's of char *
  */
 int
@@ -691,8 +691,8 @@ do_catchup(const char *source_pgdata, const char *dest_pgdata, int num_threads,
 		char		label[1024];
 		/* notify start of backup to PostgreSQL server */
 		time2iso(label, lengthof(label), current.start_time, false);
-		strncat(label, " with pg_probackup", lengthof(label) -
-				strlen(" with pg_probackup"));
+		strncat(label, " with pg_backup", lengthof(label) -
+				strlen(" with pg_backup"));
 
 		/* Call pg_start_backup function in PostgreSQL connect */
 		pg_start_backup(label, smooth_checkpoint, &current, &source_node_info, source_conn);

src/catchup.c

@@ -1,7 +1,7 @@
 /*-------------------------------------------------------------------------
  *
  * src/checkdb.c
- * pg_probackup checkdb subcommand
+ * pg_backup checkdb subcommand
  *
  * It allows to validate all data files located in PGDATA
  * via block checksums matching and page header sanity checks.
@@ -733,7 +733,7 @@ do_amcheck(ConnectionOptions conn_opt, PGconn *conn)
 							   "All databases were amchecked.");
 }
 
-/* Entry point of pg_probackup CHECKDB subcommand */
+/* Entry point of pg_backup CHECKDB subcommand */
 void
 do_checkdb(bool need_amcheck,
 		   ConnectionOptions conn_opt, char *pgdata)