Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb7d561b

Browse files
committed
Merge branch 'REL_2_5' into PBCKP-227
2 parentscc915c8 +b8c2076 commitb7d561b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1404
-508
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
/docker-compose.yml
5151
/Dockerfile
5252
/Dockerfile.in
53-
/run_tests.sh
5453
/make_dockerfile.sh
5554
/backup_restore.sh
5655

‎.travis.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ env:
3737
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=archive
3838
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=backup
3939
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup
40+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=checkdb
4041
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=compression
4142
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=delta
4243
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=locking
@@ -52,6 +53,7 @@ env:
5253
jobs:
5354
allow_failures:
5455
-if:env(PG_BRANCH) = master
56+
-if:env(PG_BRANCH) = REL_15_STABLE
5557
-if:env(PG_BRANCH) = REL9_5_STABLE
5658
# - if: env(MODE) IN (archive, backup, delta, locking, merge, replica, retention, restore)
5759

‎doc/pgprobackup.xml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3993,6 +3993,7 @@ pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replac
39933993
[--restore-command=<replaceable>cmdline</replaceable>]
39943994
[--primary-conninfo=<replaceable>primary_conninfo</replaceable>]
39953995
[-S | --primary-slot-name=<replaceable>slot_name</replaceable>]
3996+
[-X <replaceable>wal_dir</replaceable> | --waldir=<replaceable>wal_dir</replaceable>]
39963997
[<replaceable>recovery_target_options</replaceable>] [<replaceable>logging_options</replaceable>] [<replaceable>remote_options</replaceable>]
39973998
[<replaceable>partial_restore_options</replaceable>] [<replaceable>remote_wal_archive_options</replaceable>]
39983999
</programlisting>
@@ -4160,6 +4161,17 @@ pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replac
41604161
</para>
41614162
</listitem>
41624163
</varlistentry>
4164+
4165+
<varlistentry>
4166+
<term><option>-X <replaceable>wal_dir</replaceable></option></term>
4167+
<term><option>--waldir=<replaceable>wal_dir</replaceable></option></term>
4168+
<listitem>
4169+
<para>
4170+
Specifies the directory where WAL should be stored.
4171+
</para>
4172+
</listitem>
4173+
</varlistentry>
4174+
41634175
</variablelist>
41644176
</para>
41654177
<para>
@@ -5185,6 +5197,60 @@ pg_probackup catchup -b <replaceable>catchup_mode</replaceable>
51855197
</varlistentry>
51865198

51875199
<varlistentry>
5200+
<term><option>--log-format-console=<replaceable>log_format</replaceable></option></term>
5201+
<listitem>
5202+
<para>
5203+
Defines the format of the console log. Only set from the command line. Note that you cannot
5204+
specify this option in the <filename>pg_probackup.conf</filename> configuration file through
5205+
the <xreflinkend="pbk-set-config"/> command and that the <xreflinkend="pbk-backup"/>
5206+
command also treats this option specified in the configuration file as an error.
5207+
Possible values are:
5208+
5209+
<itemizedlistspacing="compact">
5210+
<listitem>
5211+
<para>
5212+
<literal>plain</literal> — sets the plain-text format of the console log.
5213+
</para>
5214+
</listitem>
5215+
<listitem>
5216+
<para>
5217+
<literal>json</literal> — sets the <acronym>JSON</acronym> format of the console log.
5218+
</para>
5219+
</listitem>
5220+
</itemizedlist>
5221+
</para>
5222+
<para>
5223+
Default: <literal>plain</literal>
5224+
</para>
5225+
</listitem>
5226+
</varlistentry>
5227+
5228+
<varlistentry>
5229+
<term><option>--log-format-file=<replaceable>log_format</replaceable></option></term>
5230+
<listitem>
5231+
<para>
5232+
Defines the format of log files used. Possible values are:
5233+
5234+
<itemizedlistspacing="compact">
5235+
<listitem>
5236+
<para>
5237+
<literal>plain</literal> — sets the plain-text format of log files.
5238+
</para>
5239+
</listitem>
5240+
<listitem>
5241+
<para>
5242+
<literal>json</literal> — sets the <acronym>JSON</acronym> format of log files.
5243+
</para>
5244+
</listitem>
5245+
</itemizedlist>
5246+
</para>
5247+
<para>
5248+
Default: <literal>plain</literal>
5249+
</para>
5250+
</listitem>
5251+
</varlistentry>
5252+
5253+
<varlistentry>
51885254
<term><option>--log-rotation-size=<replaceable>log_rotation_size</replaceable></option></term>
51895255
<listitem>
51905256
<para>
@@ -6056,6 +6122,8 @@ archive-timeout = 5min
60566122
# Logging parameters
60576123
log-level-console = INFO
60586124
log-level-file = OFF
6125+
log-format-console = PLAIN
6126+
log-format-file = PLAIN
60596127
log-filename = pg_probackup.log
60606128
log-rotation-size = 0
60616129
log-rotation-age = 0

‎src/archive.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* archive.c: - pg_probackup specific archive commands for archive backups.
44
*
55
*
6-
* Portions Copyright (c) 2018-2021, Postgres Professional
6+
* Portions Copyright (c) 2018-2022, Postgres Professional
77
*
88
*-------------------------------------------------------------------------
99
*/
@@ -361,7 +361,7 @@ push_file(WALSegno *xlogfile, const char *archive_status_dir,
361361
canonicalize_path(wal_file_ready);
362362
canonicalize_path(wal_file_done);
363363
/* It is ok to rename status file in archive_status directory */
364-
elog(VERBOSE,"Rename \"%s\" to \"%s\"",wal_file_ready,wal_file_done);
364+
elog(LOG,"Rename \"%s\" to \"%s\"",wal_file_ready,wal_file_done);
365365

366366
/* do not error out, if rename failed */
367367
if (fio_rename(wal_file_ready,wal_file_done,FIO_DB_HOST)<0)
@@ -505,7 +505,7 @@ push_file_internal_uncompressed(const char *wal_file_name, const char *pg_xlog_d
505505
}
506506

507507
part_opened:
508-
elog(VERBOSE,"Temp WAL file successfully created: \"%s\"",to_fullpath_part);
508+
elog(LOG,"Temp WAL file successfully created: \"%s\"",to_fullpath_part);
509509
/* Check if possible to skip copying */
510510
if (fileExists(to_fullpath,FIO_BACKUP_HOST))
511511
{
@@ -595,7 +595,7 @@ push_file_internal_uncompressed(const char *wal_file_name, const char *pg_xlog_d
595595
to_fullpath_part,strerror(errno));
596596
}
597597

598-
elog(VERBOSE,"Rename \"%s\" to \"%s\"",to_fullpath_part,to_fullpath);
598+
elog(LOG,"Rename \"%s\" to \"%s\"",to_fullpath_part,to_fullpath);
599599

600600
//copy_file_attributes(from_path, FIO_DB_HOST, to_path_temp, FIO_BACKUP_HOST, true);
601601

@@ -752,7 +752,7 @@ push_file_internal_gz(const char *wal_file_name, const char *pg_xlog_dir,
752752
}
753753

754754
part_opened:
755-
elog(VERBOSE,"Temp WAL file successfully created: \"%s\"",to_fullpath_gz_part);
755+
elog(LOG,"Temp WAL file successfully created: \"%s\"",to_fullpath_gz_part);
756756
/* Check if possible to skip copying,
757757
*/
758758
if (fileExists(to_fullpath_gz,FIO_BACKUP_HOST))
@@ -844,7 +844,7 @@ push_file_internal_gz(const char *wal_file_name, const char *pg_xlog_dir,
844844
to_fullpath_gz_part,strerror(errno));
845845
}
846846

847-
elog(VERBOSE,"Rename \"%s\" to \"%s\"",
847+
elog(LOG,"Rename \"%s\" to \"%s\"",
848848
to_fullpath_gz_part,to_fullpath_gz);
849849

850850
//copy_file_attributes(from_path, FIO_DB_HOST, to_path_temp, FIO_BACKUP_HOST, true);
@@ -1155,7 +1155,7 @@ do_archive_get(InstanceState *instanceState, InstanceConfig *instance, const cha
11551155
if (get_wal_file(wal_file_name,backup_wal_file_path,absolute_wal_file_path, false))
11561156
{
11571157
fail_count=0;
1158-
elog(INFO,"pg_probackup archive-get copied WAL file %s",wal_file_name);
1158+
elog(LOG,"pg_probackup archive-get copied WAL file %s",wal_file_name);
11591159
n_fetched++;
11601160
break;
11611161
}
@@ -1511,7 +1511,7 @@ get_wal_file_internal(const char *from_path, const char *to_path, FILE *out,
15111511
char*buf=pgut_malloc(OUT_BUF_SIZE);/* 1MB buffer */
15121512
intexit_code=0;
15131513

1514-
elog(VERBOSE,"Attempting to %s WAL file '%s'",
1514+
elog(LOG,"Attempting to %s WAL file '%s'",
15151515
is_decompress ?"open compressed" :"open",from_path);
15161516

15171517
/* open source file for read */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp