Rename project to pg_probackup.

Author: stalkerg

Makefile

@@ -1,4 +1,4 @@
-PROGRAM = pg_arman
+PROGRAM = pg_probackup
 OBJS = backup.o \
 	catalog.o \
 	data.o \
@@ -7,7 +7,7 @@ OBJS = backup.o \
 	fetch.o \
 	init.o \
 	parray.o \
-	pg_arman.o \
+	pg_probackup.o \
 	restore.o \
 	show.o \
 	status.o \
@@ -25,7 +25,7 @@ EXTRA_CLEAN = datapagemap.c datapagemap.h xlogreader.c receivelog.c receivelog.h
 
 REGRESS = init option show delete backup restore
 
-all: checksrcdir datapagemap.h logging.h receivelog.h streamutil.h pg_arman
+all: checksrcdir datapagemap.h logging.h receivelog.h streamutil.h pg_probackup
 
 MAKE_GLOBAL="../../src/Makefile.global"
 TEST_GLOBAL:=$(shell test -e ../../src/Makefile.global)
@@ -45,7 +45,7 @@ endif
 else
 #TODO: fix me
 REGRESS =
-subdir=contrib/pg_arman
+subdir=contrib/pg_probackup
 top_builddir=../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk

README.md

@@ -1,10 +1,7 @@
-pg_arman fork from Postgres Professional
+pg_probackup fork of pg_arman by Postgres Professional
 ========================================
 
-This repository contains fork of pg_arman by Postgres Professional with
-block level incremental backup support.
-
-pg_arman is a backup and recovery manager for PostgreSQL servers able to do
+pg_probackup is a backup and recovery manager for PostgreSQL servers able to do
 differential and full backup as well as restore a cluster to a
 state defined by a given recovery target. It is designed to perform
 periodic backups of an existing PostgreSQL server, combined with WAL
@@ -28,37 +25,37 @@ Download
 --------
 
 The latest version of this software can be found on the project website at
-https://github.com/postgrespro/pg_arman.  Original fork of pg_arman can be
+https://github.com/postgrespro/pg_probackup.  Original fork of pg_probackup can be
 found at https://github.com/michaelpq/pg_arman.
 
 Installation
 ------------
 
-Compiling pg_arman requires a PostgreSQL installation to be in place
+Compiling pg_probackup requires a PostgreSQL installation to be in place
 as well as a raw source tree. Pass the path to the PostgreSQL source tree
 to make, in the top_srcdir variable:
 
     make USE_PGXS=1 top_srcdir=<path to PostgreSQL source tree>
 
 In addition, you must have pg_config in $PATH.
 
-The current version of pg_arman is compatible with PostgreSQL 9.5 and
+The current version of pg_probackup is compatible with PostgreSQL 9.5 and
 upper versions.
 
 Platforms
 ---------
 
-pg_arman has been tested on Linux and Unix-based platforms.
+pg_probackup has been tested on Linux and Unix-based platforms.
 
 Documentation
 -------------
 
-All the documentation you can find [here](doc/pg_arman.md).
+All the documentation you can find [here](doc/pg_probackup.md).
 
 Regression tests
 ----------------
 
-The test suite of pg_arman is available in the code tree and can be
+The test suite of pg_probackup is available in the code tree and can be
 launched in a way similar to common PostgreSQL extensions and modules:
 
     make installcheck
@@ -85,7 +82,7 @@ of these approach is requirement to have WAL archive.
 some overhead to PostgreSQL performance.  On our experiments it appears to be
 less than 3%.
 
-These two approaches were implemented in this fork of pg_arman.  The second
+These two approaches were implemented in this fork of pg_probackup.  The second
 approach requires [patch for PostgreSQL 9.5](https://gist.github.com/stalkerg/44703dbcbac1da08f448b7e6966646c0) or
 [patch for PostgreSQL 10](https://gist.github.com/stalkerg/ab833d94e2f64df241f1835651e06e4b).
 
@@ -101,29 +98,29 @@ You need to enable WAL archive by adding following lines to postgresql.conf:
 
 ```
 wal_level = archive
-archive_command = 'test ! -f /home/postgres/backup/arman/wal/%f && cp %p /home/postgres/backup/arman/wal/%f'
+archive_command = 'test ! -f /home/postgres/backup/wal/%f && cp %p /home/postgres/backup/wal/%f'
 ```
 
 Example backup (assuming PostgreSQL is running):
 ```bash
 # Init pg_aramn backup folder
-pg_arman init -B /home/postgres/backup/pgarman
+pg_probackup init -B /home/postgres/backup
 # Make full backup with 2 thread and verbose mode.
-pg_arman backup -B /home/postgres/backup/pgarman -D /home/postgres/pgdata/arman -b full -v -j 2
+pg_probackup backup -B /home/postgres/backup -D /home/postgres/pgdata -b full -v -j 2
 # Show backups information
-pg_arman show -B /home/postgres/backup/pgarman
+pg_probackup show -B /home/postgres/backup
 
 # Now you can insert or update some data in your database
 
 # Then start the incremental backup.
-pg_arman backup -B /home/postgres/backup/pgarman -D /home/postgres/pgdata/arman -b page -v -j 2
+pg_probackup backup -B /home/postgres/backup -D /home/postgres/pgdata -b page -v -j 2
 # You should see that increment is really small
-pg_arman show -B /home/postgres/backup/pgarman
+pg_probackup show -B /home/postgres/backup
 ```
 
 For restore after remove your pgdata you can use:
 ```
-pg_arman restore -B /home/postgres/backup/pgarman -D /home/postgres/pgdata/arman -j 4 --verbose
+pg_probackup restore -B /home/postgres/backup -D /home/postgres/pgdata -j 4 --verbose
 ```
 
 ### Retrieving changed blocks from ptrack
@@ -134,33 +131,33 @@ The advantage of this approach is that you don't have to save WAL archive.  You
 ptrack_enable = on
 ```
 
-Also, some WALs still need to be fetched in order to get consistent backup.  pg_arman can fetch them trough the streaming replication protocol.  Thus, you also need to [enable streaming replication connection](https://wiki.postgresql.org/wiki/Streaming_Replication).
+Also, some WALs still need to be fetched in order to get consistent backup.  pg_probackup can fetch them trough the streaming replication protocol.  Thus, you also need to [enable streaming replication connection](https://wiki.postgresql.org/wiki/Streaming_Replication).
 
 Example backup (assuming PostgreSQL is running):
 ```bash
 # Init pg_aramn backup folder
-pg_arman init -B /home/postgres/backup/pgarman
+pg_probackup init -B /home/postgres/backup
 # Make full backup with 2 thread and verbose mode.
-pg_arman backup -B /home/postgres/backup/pgarman -D /home/postgres/pgdata/arman -b full -v -j 2 --stream
+pg_probackup backup -B /home/postgres/backup -D /home/postgres/pgdata -b full -v -j 2 --stream
 # Show backups information
-pg_arman show -B /home/postgres/backup/pgarman
+pg_probackup show -B /home/postgres/backup
 
 # Now you can insert or update some data in your database
 
 # Then start the incremental backup.
-pg_arman backup -B /home/postgres/backup/pgarman -D /home/postgres/pgdata/arman -b ptrack -v -j 2 --stream
+pg_probackup backup -B /home/postgres/backup -D /home/postgres/pgdata -b ptrack -v -j 2 --stream
 # You should see that increment is really small
-pg_arman show -B /home/postgres/backup/pgarman
+pg_probackup show -B /home/postgres/backup
 ```
 
 For restore after remove your pgdata you can use:
 ```
-pg_arman restore -B /home/postgres/backup/pgarman -D /home/postgres/pgdata/arman -j 4 --verbose --stream
+pg_probackup restore -B /home/postgres/backup -D /home/postgres/pgdata -j 4 --verbose --stream
 ```
 
 License
 -------
 
-pg_arman can be distributed under the PostgreSQL license. See COPYRIGHT
+pg_probackup can be distributed under the PostgreSQL license. See COPYRIGHT
 file for more information. pg_arman is a fork of the existing project
 pg_rman, initially created and maintained by NTT and Itagaki Takahiro.

backup.c

@@ -7,7 +7,7 @@
  *-------------------------------------------------------------------------
  */
 
-#include "pg_arman.h"
+#include "pg_probackup.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -35,7 +35,7 @@ static int server_version = 0;
 static bool	in_backup = false;						/* TODO: more robust logic */
 static int	standby_message_timeout = 10 * 1000;	/* 10 sec = default */
 static XLogRecPtr stop_backup_lsn = InvalidXLogRecPtr;
-const char *progname = "pg_arman";
+const char *progname = "pg_probackup";
 
 /* list of files contained in backup */
 parray	*backup_files_list;
@@ -161,7 +161,7 @@ do_backup_database(parray *backup_list, pgBackupOption bkupopt)
 
 	/* notify start of backup to PostgreSQL server */
 	time2iso(label, lengthof(label), current.start_time);
-	strncat(label, " with pg_arman", lengthof(label));
+	strncat(label, " with pg_probackup", lengthof(label));
 	pg_start_backup(label, smooth_checkpoint, &current);
 
 	/* start stream replication */
@@ -476,7 +476,7 @@ do_backup(pgBackupOption bkupopt)
 		elog(ERROR, "cannot lock backup catalog");
 	else if (ret == 1)
 		elog(ERROR,
-			"another pg_arman is running, skipping this backup");
+			"another pg_probackup is running, skipping this backup");
 
 	/* initialize backup result */
 	current.status = BACKUP_STATUS_RUNNING;

catalog.c

@@ -7,7 +7,7 @@
  *-------------------------------------------------------------------------
  */
 
-#include "pg_arman.h"
+#include "pg_probackup.h"
 
 #include <dirent.h>
 #include <fcntl.h>
@@ -28,7 +28,7 @@ static pgBackup *catalog_read_ini(const char *path);
 static int lock_fd = -1;
 
 /*
- * Lock of the catalog with pg_arman.ini file and return 0.
+ * Lock of the catalog with pg_probackup.conf file and return 0.
  * If the lock is held by another one, return 1 immediately.
  */
 int

data.c

@@ -7,7 +7,7 @@
  *-------------------------------------------------------------------------
  */
 
-#include "pg_arman.h"
+#include "pg_probackup.h"
 
 #include <unistd.h>
 #include <time.h>

delete.c

@@ -7,7 +7,7 @@
  *-------------------------------------------------------------------------
  */
 
-#include "pg_arman.h"
+#include "pg_probackup.h"
 
 #include <dirent.h>
 #include <unistd.h>
@@ -34,7 +34,7 @@ do_delete(time_t backup_id)
 		elog(ERROR, "can't lock backup catalog.");
 	else if (ret == 1)
 		elog(ERROR,
-			"another pg_arman is running, stop delete.");
+			"another pg_probackup is running, stop delete.");
 
 	/* Get complete list of backups */
 	backup_list = catalog_get_backup_list(0);
@@ -109,7 +109,7 @@ int do_deletewal(time_t backup_id, bool strict)
 		elog(ERROR, "can't lock backup catalog.");
 	else if (ret == 1)
 		elog(ERROR,
-			"another pg_arman is running, stop delete.");
+			"another pg_probackup is running, stop delete.");
 
 	backup_list = catalog_get_backup_list(0);
 	for (i = 0; i < parray_num(backup_list); i++)

dir.c

@@ -7,7 +7,7 @@
  *-------------------------------------------------------------------------
  */
 
-#include "pg_arman.h"
+#include "pg_probackup.h"
 
 #include <libgen.h>
 #include <unistd.h>