Skip to content

Commit 90a4a4f

Browse files
postgres-devpostgres-dev
committed
Replace BACKUP_PATH in the source files
1 parent 17037ba commit 90a4a4f

9 files changed

+31
-31
lines changed

‎doc/pgprobackup.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1128,7 +1128,7 @@ pg_probackup add-instance -B <replaceable>backup_dir</replaceable> -D <replaceab
11281128
<replaceable>backup_dir</replaceable> directory and at least read-only
11291129
access to <replaceable>data_dir</replaceable> directory. If you
11301130
specify the path to the backup catalog in the
1131-
<envar>BACKUP_PATH</envar> environment variable, you can
1131+
<envar>BACKUP_DIR</envar> environment variable, you can
11321132
omit the corresponding option when running <application>pg_probackup</application>
11331133
commands.
11341134
</para>
@@ -5212,14 +5212,14 @@ pg_probackup catchup -b <replaceable>catchup_mode</replaceable>
52125212
<varlistentry>
52135213
<term><option>-B <replaceable>directory</replaceable></option></term>
52145214
<term><option>--backup-path=<replaceable>directory</replaceable></option></term>
5215-
<term><envar>BACKUP_PATH</envar></term>
5215+
<term><envar>BACKUP_DIR</envar></term>
52165216
<listitem>
52175217
<para>
52185218
Specifies the absolute path to the backup catalog. Backup
52195219
catalog is a directory where all backup files and meta
52205220
information are stored. Since this option is required for most
52215221
of the <application>pg_probackup</application> commands, you are recommended to specify
5222-
it once in the <envar>BACKUP_PATH</envar> environment variable. In this case,
5222+
it once in the <envar>BACKUP_DIR</envar> environment variable. In this case,
52235223
you do not need to use this option each time on the command
52245224
line.
52255225
</para>
@@ -5679,7 +5679,7 @@ pg_probackup catchup -b <replaceable>catchup_mode</replaceable>
56795679
lazily, when the first log message is written.
56805680
</para>
56815681
<para>
5682-
Default: <filename>$BACKUP_PATH/log/</filename>
5682+
Default: <filename>$BACKUP_DIR/log/</filename>
56835683
</para>
56845684
</listitem>
56855685
</varlistentry>
@@ -5762,7 +5762,7 @@ pg_probackup catchup -b <replaceable>catchup_mode</replaceable>
57625762
reached, the log file is rotated once a <application>pg_probackup</application> command
57635763
is launched, except <command>help</command> and <command>version</command> commands. The time of the
57645764
last log file creation is stored in
5765-
<filename>$BACKUP_PATH/log/log_rotation</filename>. The zero value disables
5765+
<filename>$BACKUP_DIR/log/log_rotation</filename>. The zero value disables
57665766
time-based rotation. Supported units: ms, s, min, h, d (min by
57675767
default).
57685768
</para>

‎po/ru.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@ msgstr ""
811811
#: src/help.c:360 src/help.c:521 src/help.c:588 src/help.c:635 src/help.c:715
812812
#: src/help.c:761 src/help.c:833
813813
#, c-format
814-
msgid " directory for file logging (default: BACKUP_PATH/log)\n"
814+
msgid " directory for file logging (default: BACKUP_DIR/log)\n"
815815
msgstr ""
816816

817817
#: src/help.c:361 src/help.c:522 src/help.c:589 src/help.c:636 src/help.c:716

‎src/archive.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ static parray *setup_push_filelist(const char *archive_status_dir,
113113
* set archive_command to
114114
* 'pg_probackup archive-push -B /home/anastasia/backup --wal-file-name %f',
115115
* to move backups into arclog_path.
116-
* Where archlog_path is $BACKUP_PATH/wal/instance_name
116+
* Where archlog_path is $BACKUP_DIR/wal/instance_name
117117
*/
118118
void
119119
do_archive_push(InstanceState *instanceState, InstanceConfig *instance, char *pg_xlog_dir,
@@ -1126,7 +1126,7 @@ do_archive_get(InstanceState *instanceState, InstanceConfig *instance, const cha
11261126
join_path_components(absolute_wal_file_path, current_dir, wal_file_path);
11271127

11281128
/* full filepath to WAL file in archive directory.
1129-
* $BACKUP_PATH/wal/instance_name/000000010000000000000001 */
1129+
* $BACKUP_DIR/wal/instance_name/000000010000000000000001 */
11301130
join_path_components(backup_wal_file_path, instanceState->instance_wal_subdir_path, wal_file_name);
11311131

11321132
INSTR_TIME_SET_CURRENT(start_time);

‎src/catalog.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1437,7 +1437,7 @@ get_multi_timeline_parent(parray *backup_list, parray *tli_list,
14371437
}
14381438

14391439
/*
1440-
* Create backup directory in $BACKUP_PATH
1440+
* Create backup directory in $BACKUP_DIR
14411441
* (with proposed backup->backup_id)
14421442
* and initialize this directory.
14431443
* If creation of directory fails, then

‎src/help.c

+11-11
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ help_backup(void)
372372
printf(_(" --error-log-filename=error-log-filename\n"));
373373
printf(_(" filename for error logging (default: none)\n"));
374374
printf(_(" --log-directory=log-directory\n"));
375-
printf(_(" directory for file logging (default: BACKUP_PATH/log)\n"));
375+
printf(_(" directory for file logging (default: BACKUP_DIR/log)\n"));
376376
printf(_(" --log-rotation-size=log-rotation-size\n"));
377377
printf(_(" rotate logfile if its size exceeds this value; 0 disables; (default: 0)\n"));
378378
printf(_(" available units: 'kB', 'MB', 'GB', 'TB' (default: kB)\n"));
@@ -548,7 +548,7 @@ help_restore(void)
548548
printf(_(" --error-log-filename=error-log-filename\n"));
549549
printf(_(" filename for error logging (default: none)\n"));
550550
printf(_(" --log-directory=log-directory\n"));
551-
printf(_(" directory for file logging (default: BACKUP_PATH/log)\n"));
551+
printf(_(" directory for file logging (default: BACKUP_DIR/log)\n"));
552552
printf(_(" --log-rotation-size=log-rotation-size\n"));
553553
printf(_(" rotate logfile if its size exceeds this value; 0 disables; (default: 0)\n"));
554554
printf(_(" available units: 'kB', 'MB', 'GB', 'TB' (default: kB)\n"));
@@ -621,7 +621,7 @@ help_validate(void)
621621
printf(_(" --error-log-filename=error-log-filename\n"));
622622
printf(_(" filename for error logging (default: none)\n"));
623623
printf(_(" --log-directory=log-directory\n"));
624-
printf(_(" directory for file logging (default: BACKUP_PATH/log)\n"));
624+
printf(_(" directory for file logging (default: BACKUP_DIR/log)\n"));
625625
printf(_(" --log-rotation-size=log-rotation-size\n"));
626626
printf(_(" rotate logfile if its size exceeds this value; 0 disables; (default: 0)\n"));
627627
printf(_(" available units: 'kB', 'MB', 'GB', 'TB' (default: kB)\n"));
@@ -674,7 +674,7 @@ help_checkdb(void)
674674
printf(_(" --error-log-filename=error-log-filename\n"));
675675
printf(_(" filename for error logging (default: none)\n"));
676676
printf(_(" --log-directory=log-directory\n"));
677-
printf(_(" directory for file logging (default: BACKUP_PATH/log)\n"));
677+
printf(_(" directory for file logging (default: BACKUP_DIR/log)\n"));
678678
printf(_(" --log-rotation-size=log-rotation-size\n"));
679679
printf(_(" rotate logfile if its size exceeds this value; 0 disables; (default: 0)\n"));
680680
printf(_(" available units: 'kB', 'MB', 'GB', 'TB' (default: kB)\n"));
@@ -760,7 +760,7 @@ help_delete(void)
760760
printf(_(" --error-log-filename=error-log-filename\n"));
761761
printf(_(" filename for error logging (default: none)\n"));
762762
printf(_(" --log-directory=log-directory\n"));
763-
printf(_(" directory for file logging (default: BACKUP_PATH/log)\n"));
763+
printf(_(" directory for file logging (default: BACKUP_DIR/log)\n"));
764764
printf(_(" --log-rotation-size=log-rotation-size\n"));
765765
printf(_(" rotate logfile if its size exceeds this value; 0 disables; (default: 0)\n"));
766766
printf(_(" available units: 'kB', 'MB', 'GB', 'TB' (default: kB)\n"));
@@ -814,7 +814,7 @@ help_merge(void)
814814
printf(_(" --error-log-filename=error-log-filename\n"));
815815
printf(_(" filename for error logging (default: none)\n"));
816816
printf(_(" --log-directory=log-directory\n"));
817-
printf(_(" directory for file logging (default: BACKUP_PATH/log)\n"));
817+
printf(_(" directory for file logging (default: BACKUP_DIR/log)\n"));
818818
printf(_(" --log-rotation-size=log-rotation-size\n"));
819819
printf(_(" rotate logfile if its size exceeds this value; 0 disables; (default: 0)\n"));
820820
printf(_(" available units: 'kB', 'MB', 'GB', 'TB' (default: kB)\n"));
@@ -890,7 +890,7 @@ help_set_config(void)
890890
printf(_(" --error-log-filename=error-log-filename\n"));
891891
printf(_(" filename for error logging (default: none)\n"));
892892
printf(_(" --log-directory=log-directory\n"));
893-
printf(_(" directory for file logging (default: BACKUP_PATH/log)\n"));
893+
printf(_(" directory for file logging (default: BACKUP_DIR/log)\n"));
894894
printf(_(" --log-rotation-size=log-rotation-size\n"));
895895
printf(_(" rotate logfile if its size exceeds this value; 0 disables; (default: 0)\n"));
896896
printf(_(" available units: 'kB', 'MB', 'GB', 'TB' (default: kB)\n"));
@@ -1002,7 +1002,7 @@ help_add_instance(void)
10021002
printf(_(" --error-log-filename=error-log-filename\n"));
10031003
printf(_(" filename for error logging (default: none)\n"));
10041004
printf(_(" --log-directory=log-directory\n"));
1005-
printf(_(" directory for file logging (default: BACKUP_PATH/log)\n"));
1005+
printf(_(" directory for file logging (default: BACKUP_DIR/log)\n"));
10061006
printf(_(" --log-rotation-size=log-rotation-size\n"));
10071007
printf(_(" rotate logfile if its size exceeds this value; 0 disables; (default: 0)\n"));
10081008
printf(_(" available units: 'kB', 'MB', 'GB', 'TB' (default: kB)\n"));
@@ -1072,7 +1072,7 @@ help_archive_push(void)
10721072
printf(_(" --error-log-filename=error-log-filename\n"));
10731073
printf(_(" filename for error logging (default: none)\n"));
10741074
printf(_(" --log-directory=log-directory\n"));
1075-
printf(_(" directory for file logging (default: BACKUP_PATH/log)\n"));
1075+
printf(_(" directory for file logging (default: BACKUP_DIR/log)\n"));
10761076
printf(_(" --log-rotation-size=log-rotation-size\n"));
10771077
printf(_(" rotate logfile if its size exceeds this value; 0 disables; (default: 0)\n"));
10781078
printf(_(" available units: 'kB', 'MB', 'GB', 'TB' (default: kB)\n"));
@@ -1131,7 +1131,7 @@ help_archive_get(void)
11311131
printf(_(" --error-log-filename=error-log-filename\n"));
11321132
printf(_(" filename for error logging (default: none)\n"));
11331133
printf(_(" --log-directory=log-directory\n"));
1134-
printf(_(" directory for file logging (default: BACKUP_PATH/log)\n"));
1134+
printf(_(" directory for file logging (default: BACKUP_DIR/log)\n"));
11351135
printf(_(" --log-rotation-size=log-rotation-size\n"));
11361136
printf(_(" rotate logfile if its size exceeds this value; 0 disables; (default: 0)\n"));
11371137
printf(_(" available units: 'kB', 'MB', 'GB', 'TB' (default: kB)\n"));
@@ -1221,7 +1221,7 @@ help_catchup(void)
12211221
printf(_(" --error-log-filename=error-log-filename\n"));
12221222
printf(_(" filename for error logging (default: none)\n"));
12231223
printf(_(" --log-directory=log-directory\n"));
1224-
printf(_(" directory for file logging (default: BACKUP_PATH/log)\n"));
1224+
printf(_(" directory for file logging (default: BACKUP_DIR/log)\n"));
12251225
printf(_(" --log-rotation-size=log-rotation-size\n"));
12261226
printf(_(" rotate logfile if its size exceeds this value; 0 disables; (default: 0)\n"));
12271227
printf(_(" available units: 'kB', 'MB', 'GB', 'TB' (default: kB)\n"));

‎src/pg_probackup.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -468,10 +468,10 @@ main(int argc, char *argv[])
468468
if (backup_path == NULL)
469469
{
470470
/*
471-
* If command line argument is not set, try to read BACKUP_PATH
471+
* If command line argument is not set, try to read BACKUP_DIR
472472
* from environment variable
473473
*/
474-
backup_path = getenv("BACKUP_PATH");
474+
backup_path = getenv("BACKUP_DIR");
475475
}
476476

477477
if (backup_path != NULL)
@@ -498,7 +498,7 @@ main(int argc, char *argv[])
498498
backup_subcmd != CATCHUP_CMD)
499499
elog(ERROR,
500500
"No backup catalog path specified.\n"
501-
"Please specify it either using environment variable BACKUP_PATH or\n"
501+
"Please specify it either using environment variable BACKUP_DIR or\n"
502502
"command line option --backup-path (-B)");
503503

504504
/* ===== catalogState (END) ======*/

‎src/pg_probackup.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -837,13 +837,13 @@ typedef struct InstanceState
837837
CatalogState *catalog_state;
838838

839839
char instance_name[MAXPGPATH]; //previously global var instance_name
840-
/* $BACKUP_PATH/backups/instance_name */
840+
/* $BACKUP_DIR/backups/instance_name */
841841
char instance_backup_subdir_path[MAXPGPATH];
842842

843-
/* $BACKUP_PATH/backups/instance_name/BACKUP_CATALOG_CONF_FILE */
843+
/* $BACKUP_DIR/backups/instance_name/BACKUP_CATALOG_CONF_FILE */
844844
char instance_config_path[MAXPGPATH];
845-
846-
/* $BACKUP_PATH/backups/instance_name */
845+
846+
/* $BACKUP_DIR/backups/instance_name */
847847
char instance_wal_subdir_path[MAXPGPATH]; // previously global var arclog_path
848848

849849
/* TODO: Make it more specific */

‎src/pg_probackup_state.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313

1414
typedef struct CatalogState
1515
{
16-
/* $BACKUP_PATH */
16+
/* $BACKUP_DIR */
1717
char catalog_path[MAXPGPATH]; //previously global var backup_path
18-
/* $BACKUP_PATH/backups */
18+
/* $BACKUP_DIR/backups */
1919
char backup_subdir_path[MAXPGPATH];
20-
/* $BACKUP_PATH/wal */
20+
/* $BACKUP_DIR/wal */
2121
char wal_subdir_path[MAXPGPATH]; // previously global var arclog_path
2222
} CatalogState;
2323

‎tests/option_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def test_without_backup_path_3(self):
3434
except ProbackupException as e:
3535
self.assertIn(
3636
'ERROR: No backup catalog path specified.\n' + \
37-
'Please specify it either using environment variable BACKUP_PATH or\n' + \
37+
'Please specify it either using environment variable BACKUP_DIR or\n' + \
3838
'command line option --backup-path (-B)',
3939
e.message,
4040
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(repr(e.message), self.cmd))

0 commit comments

Comments
 (0)