Skip to content

Commit 098a91f

Browse files
alubennikovaalubennikova
committed
improve help, add messages about successful init and add/del-instance
1 parent 7efada4 commit 098a91f

File tree

4 files changed

+18
-10
lines changed

4 files changed

+18
-10
lines changed

‎delete.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,6 @@ do_delete_instance(void)
426426
elog(ERROR, "can't remove \"%s\": %s", backup_instance_path,
427427
strerror(errno));
428428

429-
elog(INFO, "Instance '%s' deleted successfully", instance_name);
429+
elog(INFO, "Instance '%s' successfully deleted", instance_name);
430430
return 0;
431431
}

‎help.c

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ help_pg_probackup(void)
6565

6666
printf(_("\n %s init -B backup-path -D pgdata-dir\n"), PROGRAM_NAME);
6767

68-
printf(_("\n %s set-config -B backup-dir\n"), PROGRAM_NAME);
68+
printf(_("\n %s set-config -B backup-dir --instance=instance_name\n"), PROGRAM_NAME);
6969
printf(_(" [-d dbname] [-h host] [-p port] [-U username]\n"));
7070
printf(_(" [--log-level=log-level]\n"));
7171
printf(_(" [--log-filename=log-filename]\n"));
@@ -76,28 +76,28 @@ help_pg_probackup(void)
7676
printf(_(" [--retention-redundancy=retention-redundancy]\n"));
7777
printf(_(" [--retention-window=retention-window]\n"));
7878

79-
printf(_("\n %s show-config -B backup-dir\n"), PROGRAM_NAME);
79+
printf(_("\n %s show-config -B backup-dir --instance=instance_name\n"), PROGRAM_NAME);
8080

81-
printf(_("\n %s backup -B backup-path -b backup-mode\n"), PROGRAM_NAME);
81+
printf(_("\n %s backup -B backup-path -b backup-mode --instance=instance_name\n"), PROGRAM_NAME);
8282
printf(_(" [-D pgdata-dir] [-C] [--stream [-S slot-name]] [--backup-pg-log]\n"));
8383
printf(_(" [-j num-threads] [--archive-timeout=archive-timeout]\n"));
8484
printf(_(" [--progress] [--delete-expired]\n"));
8585
printf(_(" [-d dbname] [-h host] [-p port] [-U username]\n"));
8686

87-
printf(_("\n %s restore -B backup-dir\n"), PROGRAM_NAME);
87+
printf(_("\n %s restore -B backup-dir --instance=instance_name\n"), PROGRAM_NAME);
8888
printf(_(" [-D pgdata-dir] [-i backup-id] [--progress]\n"));
8989
printf(_(" [--time=time|--xid=xid [--inclusive=boolean]]\n"));
9090
printf(_(" [--timeline=timeline] [-T OLDDIR=NEWDIR]\n"));
9191

92-
printf(_("\n %s validate -B backup-dir\n"), PROGRAM_NAME);
92+
printf(_("\n %s validate -B backup-dir --instance=instance_name\n"), PROGRAM_NAME);
9393
printf(_(" [-D pgdata-dir] [-i backup-id] [--progress]\n"));
9494
printf(_(" [--time=time|--xid=xid [--inclusive=boolean]]\n"));
9595
printf(_(" [--timeline=timeline]\n"));
9696

9797
printf(_("\n %s show -B backup-dir\n"), PROGRAM_NAME);
98-
printf(_(" [-i backup-id]\n"));
98+
printf(_(" [--instance=instance_name [-i backup-id]]\n"));
9999

100-
printf(_("\n %s delete -B backup-dir\n"), PROGRAM_NAME);
100+
printf(_("\n %s delete -B backup-dir --instance=instance_name\n"), PROGRAM_NAME);
101101
printf(_(" [--wal] [-i backup-id | --expired]\n"));
102102

103103
printf(_("\n %s add-instance -B backup-dir\n"), PROGRAM_NAME);
@@ -158,12 +158,14 @@ help_backup(void)
158158
static void
159159
help_restore(void)
160160
{
161-
printf(_("%s restore -B backup-dir\n"), PROGRAM_NAME);
161+
printf(_("%s restore -B backup-dir --instance=instance_name\n"), PROGRAM_NAME);
162162
printf(_(" [-D pgdata-dir] [-i backup-id] [--progress]\n"));
163163
printf(_(" [--time=time|--xid=xid [--inclusive=boolean]]\n"));
164164
printf(_(" [--timeline=timeline] [-T OLDDIR=NEWDIR]\n\n"));
165165

166166
printf(_(" -B, --backup-path=backup-path location of the backup storage area\n"));
167+
printf(_(" --instance=instance_name name of the instance\n"));
168+
167169
printf(_(" -D, --pgdata=pgdata-dir location of the database storage area\n"));
168170
printf(_(" -i, --backup-id=backup-id backup to restore\n"));
169171

@@ -200,7 +202,7 @@ static void
200202
help_show(void)
201203
{
202204
printf(_("%s show -B backup-dir\n"), PROGRAM_NAME);
203-
printf(_(" [--instance=instance_name] [-i backup-id]\n\n"));
205+
printf(_(" [--instance=instance_name [-i backup-id]]\n\n"));
204206

205207
printf(_(" -B, --backup-path=backup-path location of the backup storage area\n"));
206208
printf(_(" --instance=instance_name show info about specific intstance\n"));

‎init.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ do_init(void)
5252
join_path_components(arclog_path_dir, backup_path, "wal");
5353
dir_create_dir(arclog_path_dir, DIR_PERMISSION);
5454

55+
elog(INFO, "Backup catalog '%s' successfully inited", backup_path);
5556
return 0;
5657
}
5758

@@ -106,5 +107,6 @@ do_add_instance(void)
106107
config->pgdata = pgdata;
107108
writeBackupCatalogConfigFile(config);
108109

110+
elog(INFO, "Instance '%s' successfully inited", instance_name);
109111
return 0;
110112
}

‎show.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ int
2323
do_show(time_t requested_backup_id)
2424
{
2525

26+
if (instance_name == NULL
27+
&& requested_backup_id != INVALID_BACKUP_ID)
28+
elog(ERROR, "You must specify --instance to use --backup_id option");
29+
2630
if (instance_name == NULL)
2731
{
2832
/* Show list of instances */

0 commit comments

Comments
 (0)