Supporting PostgreSQL 9.2.

otsuka.knj@gmail.com · otsuka.knj@gmail.com · commit 068280f4a341 · 2013-01-24T06:49:34.000Z
Fix a bug about --recovery-target-time. Fix SPEC files for using normal user. (Reported by Nagayasu-san) Fix a compiling bug on no LZLib environment. Add restriction about Incremental backup. git-svn-id: http://pg-rman.googlecode.com/svn/trunk@71 182aca00-e38e-11de-a668-6fd11605f5ce
diff --git a/SPECS/pg_rman90.spec b/SPECS/pg_rman90.spec
@@ -9,7 +9,7 @@
 ## Set general information for pg_rman.
 Summary:    Backup and Recovery Tool for PostgreSQL
 Name:       pg_rman
-Version:    1.2.4
+Version:    1.2.5
 Release:    1%{?dist}
 License:    BSD
 Group:      Applications/Databases
@@ -44,7 +44,7 @@ USE_PGXS=1 make %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 
-USE_PGXS=1 make %{?_smp_mflags} install
+USE_PGXS=1 DESTDIR=%{buildroot} make %{?_smp_mflags} install
 
 install -d %{buildroot}%{_bindir}
 install -m 755 pg_rman %{buildroot}%{_bindir}/pg_rman
diff --git a/SPECS/pg_rman91.spec b/SPECS/pg_rman91.spec
@@ -9,7 +9,7 @@
 ## Set general information for pg_rman.
 Summary:    Backup and Recovery Tool for PostgreSQL
 Name:       pg_rman
-Version:    1.2.4
+Version:    1.2.5
 Release:    1%{?dist}
 License:    BSD
 Group:      Applications/Databases
@@ -44,7 +44,7 @@ USE_PGXS=1 make %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 
-USE_PGXS=1 make %{?_smp_mflags} install
+USE_PGXS=1 DESTDIR=%{buildroot} make %{?_smp_mflags} install
 
 install -d %{buildroot}%{_bindir}
 install -m 755 pg_rman %{buildroot}%{_bindir}/pg_rman
diff --git a/SPECS/pg_rman92.spec b/SPECS/pg_rman92.spec
@@ -0,0 +1,64 @@
+# SPEC file for pg_rman
+# Copyright(C) 2009-2012 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
+
+%define _pgdir   /usr/pgsql-9.2
+%define _bindir  %{_pgdir}/bin
+%define _libdir  %{_pgdir}/lib
+%define _datadir %{_pgdir}/share
+
+## Set general information for pg_rman.
+Summary:    Backup and Recovery Tool for PostgreSQL
+Name:       pg_rman
+Version:    1.2.5
+Release:    1%{?dist}
+License:    BSD
+Group:      Applications/Databases
+Source0:    %{name}-%{version}.tar.gz
+URL:        http://code.google.com/p/pg-rman/
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
+Vendor:	    NIPPON TELEGRAPH AND TELEPHONE CORPORATION
+
+## We use postgresql-devel package
+BuildRequires:  postgresql92-devel
+Requires:  postgresql92-libs
+
+## Description for "pg_rman"
+%description
+pg_rman manages backup and recovery of PostgreSQL.
+pg_rman has the features below:
+-Takes a backup while database including tablespaces with just one command. 
+-Can recovery from backup with just one command. 
+-Supports incremental backup and compression of backup files so that it takes less disk spaces. 
+-Manages backup generations and shows a catalog of the backups. 
+
+
+## pre work for build pg_rman
+%prep
+%setup -q -n %{name}-%{version}
+
+## Set variables for build environment
+%build
+USE_PGXS=1 make %{?_smp_mflags}
+
+## Set variables for install
+%install
+rm -rf %{buildroot}
+
+USE_PGXS=1 DESTDIR=%{buildroot} make %{?_smp_mflags} install
+
+install -d %{buildroot}%{_bindir}
+install -m 755 pg_rman %{buildroot}%{_bindir}/pg_rman
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(755,root,root)
+%{_bindir}/pg_rman
+
+# History of pg_rman.
+%changelog
+* Wed Nov 10  2010 - NTT OSS Center <tomonari.katsumata@oss.ntt.co.jp> 1.2.0-1
+* Wed Dec 9  2009 - NTT OSS Center <itagaki.takahiro@oss.ntt.co.jp> 1.1.1-1
+- Initial cut for 1.1.1
+
diff --git a/backup.c b/backup.c
@@ -684,10 +684,10 @@ do_backup(bool smooth_checkpoint,
 		elog(ERROR_ARGS, _("required parameter not specified: SRVLOG_PATH (-S, --srvlog-path)"));
 
 #ifndef HAVE_LIBZ
-	if (current->compress_data)
+	if (current.compress_data)
 	{
 		elog(WARNING, _("requested compression not available in this: installation -- archive will be uncompressed"));
-		current->compress_data = false;
+		current.compress_data = false;
 	}
 #endif
 
diff --git a/data.c b/data.c
@@ -294,7 +294,6 @@ backup_data_file(const char *from_root, const char *to_root,
 	z_stream			z;
 	char				outbuf[zlibOutSize];
 #endif
-
 	INIT_CRC32(crc);
 
 	/* reset size summary */
@@ -787,7 +786,6 @@ copy_file(const char *from_root, const char *to_root, pgFile *file,
 	char		outbuf[zlibOutSize];
 	char		inbuf[zlibInSize];
 #endif
-
 	INIT_CRC32(crc);
 
 	/* reset size summary */
diff --git a/expected/backup_restore.out b/expected/backup_restore.out
@@ -15,13 +15,13 @@ diff files in BACKUP_PATH/backup/pg_xlog
 1
 diff files in BACKUP_PATH/backup/pg_xlog
 # of files in BACKUP_PATH/backup/srvlog
-1
+2
 full database backup after recovery
 CHECKPOINT
 # of files in BACKUP_PATH/backup/pg_xlog
 0
 # of files in BACKUP_PATH/backup/srvlog
-1
+2
 # of symbolic links in ARCLOG_PATH
 0
 # of files in BACKUP_PATH/timeline_history
diff --git a/expected/option.out b/expected/option.out
@@ -54,7 +54,7 @@ Generic options:
 
 Read the website for details. <http://code.google.com/p/pg-rman/>
 Report bugs to <http://code.google.com/p/pg-rman/issues/list>.
-pg_rman 1.2.4
+pg_rman 1.2.5
 ERROR: required parameter not specified: BACKUP_PATH (-B, --backup-path)
 ERROR: required parameter not specified: BACKUP_MODE (-b, --backup-mode)
 ERROR: required parameter not specified: ARCLOG_PATH (-A, --arclog-path)
diff --git a/pg_rman.c b/pg_rman.c
@@ -14,7 +14,7 @@
 #include <time.h>
 #include <sys/stat.h>
 
-const char *PROGRAM_VERSION	= "1.2.4";
+const char *PROGRAM_VERSION	= "1.2.5";
 const char *PROGRAM_URL		= "http://code.google.com/p/pg-rman/";
 const char *PROGRAM_EMAIL	= "http://code.google.com/p/pg-rman/issues/list";
 
diff --git a/restore.c b/restore.c
@@ -163,7 +163,7 @@ do_restore(const char *target_time,
 		if (base_backup->compress_data &&
 			(HAVE_DATABASE(base_backup) || HAVE_ARCLOG(base_backup)))
 		{
-			elog(EXIT_NOT_SUPPORTED,
+			elog(ERROR_SYSTEM,
 				_("can't restore from compressed backup (compression not supported in this installation)"));
 		}
 #endif
@@ -201,7 +201,7 @@ do_restore(const char *target_time,
 			continue;
 
 		/* is the backup is necessary for restore to target timeline ? */
-		if (!satisfy_timeline(timelines, backup) && !satisfy_recovery_target(backup, rt))
+		if (!satisfy_timeline(timelines, backup) || !satisfy_recovery_target(backup, rt))
 			continue;
 
 		if (verbose)
diff --git a/sql/backup.sql b/sql/backup.sql
diff --git a/sql/backup_restore.sh b/sql/backup_restore.sh
@@ -78,6 +78,7 @@ logging_collector = on
 wal_level = archive
 archive_mode = on
 archive_command = 'cp "%p" "$ARCLOG_PATH/%f"'
+log_filename = 'postgresql-%F_%H%M%S.log'
 EOF
 
 mkdir -p $ARCLOG_PATH
diff --git a/xlog.c b/xlog.c
@@ -28,6 +28,7 @@ typedef struct MemoryContextData *MemoryContext;
 #define XLOG_PAGE_MAGIC_v84		0xD063	/* 8.4 */
 #define XLOG_PAGE_MAGIC_v90		0xD064	/* 9.0 */
 #define XLOG_PAGE_MAGIC_v91		0xD066	/* 9.1 */
+#define XLOG_PAGE_MAGIC_v92		0xD071	/* 9.2 */
 
 /*
  * XLogLongPageHeaderData is modified in 8.3, but the layout is compatible
@@ -78,6 +79,8 @@ xlog_is_complete_wal(const pgFile *file, int server_version)
 		xlog_page_magic = XLOG_PAGE_MAGIC_v90;
 	else if (server_version < 90200)
 		xlog_page_magic = XLOG_PAGE_MAGIC_v91;
+	else if (server_version < 90300)
+		xlog_page_magic = XLOG_PAGE_MAGIC_v92;
 	else
 		return false;	/* not supported */
 

Original file line number	Diff line number	Diff line change
`@@ -684,10 +684,10 @@ do_backup(bool smooth_checkpoint,`
`684`	`684`	`elog(ERROR_ARGS, _("required parameter not specified: SRVLOG_PATH (-S, --srvlog-path)"));`
`685`	`685`
`686`	`686`	`#ifndef HAVE_LIBZ`
`687`		`- if (current->compress_data)`
	`687`	`+ if (current.compress_data)`
`688`	`688`	`{`
`689`	`689`	`elog(WARNING, _("requested compression not available in this: installation -- archive will be uncompressed"));`
`690`		`- current->compress_data = false;`
	`690`	`+ current.compress_data = false;`
`691`	`691`	`}`
`692`	`692`	`#endif`
`693`	`693`
Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,13 @@ diff files in BACKUP_PATH/backup/pg_xlog`
`15`	`15`	`1`
`16`	`16`	`diff files in BACKUP_PATH/backup/pg_xlog`
`17`	`17`	`# of files in BACKUP_PATH/backup/srvlog`
`18`		`-1`
	`18`	`+2`
`19`	`19`	`full database backup after recovery`
`20`	`20`	`CHECKPOINT`
`21`	`21`	`# of files in BACKUP_PATH/backup/pg_xlog`
`22`	`22`	`0`
`23`	`23`	`# of files in BACKUP_PATH/backup/srvlog`
`24`		`-1`
	`24`	`+2`
`25`	`25`	`# of symbolic links in ARCLOG_PATH`
`26`	`26`	`0`
`27`	`27`	`# of files in BACKUP_PATH/timeline_history`