Skip to content

Commit d6815e0

Browse files
author
Sergey Fukanchik
committed
[PBCKP-314] Failed directory creation is an error.
1 parent 19862d8 commit d6815e0

File tree

7 files changed

+29
-18
lines changed

7 files changed

+29
-18
lines changed

‎src/backup.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ do_backup_pg(InstanceState *instanceState, PGconn *backup_conn,
258258
.mode = DIR_PERMISSION, .strict = false);
259259
if ($haserr(err))
260260
{
261-
elog(WARNING, "%s", $errmsg(err));
261+
elog(ERROR, "Can not create WAL directory: %s", $errmsg(err));
262262
}
263263

264264
start_WAL_streaming(backup_conn, stream_xlog_path, &instance_config.conn_opt,
@@ -411,7 +411,8 @@ do_backup_pg(InstanceState *instanceState, PGconn *backup_conn,
411411
.mode = DIR_PERMISSION, .strict = false);
412412
if ($haserr(err))
413413
{
414-
elog(WARNING, "%s", $errmsg(err));
414+
elog(ERROR, "Can not create instance backup directory: %s",
415+
$errmsg(err));
415416
}
416417
}
417418

‎src/catalog.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1505,7 +1505,7 @@ pgBackupInitDir(pgBackup *backup, const char *backup_instance_path)
15051505
.mode = DIR_PERMISSION, .strict = false);
15061506
if ($haserr(err))
15071507
{
1508-
elog(WARNING, "%s", $errmsg(err));
1508+
elog(ERROR, "Can not create backup directory: %s", $errmsg(err));
15091509
}
15101510
}
15111511

@@ -1534,8 +1534,9 @@ create_backup_dir(pgBackup *backup, const char *backup_instance_path)
15341534
{
15351535
backup->root_dir = pgut_strdup(path);
15361536
} else {
1537-
elog(WARNING, "%s", $errmsg(err));
1537+
elog(ERROR, "Can not create backup directory: %s", $errmsg(err));
15381538
}
1539+
15391540
return err;
15401541
}
15411542

‎src/catchup.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ do_catchup(const char *source_pgdata, const char *dest_pgdata, int num_threads,
711711
.mode = DIR_PERMISSION, .strict = false);
712712
if($haserr(err))
713713
{
714-
elog(WARNING, "%s", $errmsg(err));
714+
elog(ERROR, "Can not create WAL directory: %s", $errmsg(err));
715715
}
716716
start_WAL_streaming(source_conn, dest_xlog_path, &instance_config.conn_opt,
717717
current.start_lsn, current.tli, false);
@@ -833,7 +833,7 @@ do_catchup(const char *source_pgdata, const char *dest_pgdata, int num_threads,
833833
.mode = DIR_PERMISSION, .strict = false);
834834
if ($haserr(err))
835835
{
836-
elog(WARNING, "%s", $errmsg(err));
836+
elog(ERROR, "Can not create directory: %s", $errmsg(err));
837837
}
838838
}
839839
}

‎src/dir.c‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,8 @@ create_data_directories(parray *dest_files, const char *data_dir, const char *ba
939939
.mode = pg_tablespace_mode, .strict = false);
940940
if ($haserr(err))
941941
{
942-
elog(WARNING, "%s", $errmsg(err));
942+
elog(ERROR, "Can not create tablespace directory: %s",
943+
$errmsg(err));
943944
}
944945

945946
/* create link to linked_path */
@@ -986,7 +987,8 @@ create_data_directories(parray *dest_files, const char *data_dir, const char *ba
986987
.mode = pg_tablespace_mode, .strict = false);
987988
if ($haserr(err))
988989
{
989-
elog(WARNING, "%s", $errmsg(err));
990+
elog(ERROR, "Can not create tablespace directory: %s",
991+
$errmsg(err));
990992
}
991993

992994
/* create link to linked_path */
@@ -1004,12 +1006,12 @@ create_data_directories(parray *dest_files, const char *data_dir, const char *ba
10041006

10051007
join_path_components(to_path, data_dir, dir->rel_path);
10061008

1007-
// TODO check exit code
10081009
err = $i(pioMakeDir, drive, .path = to_path, .mode = dir->mode,
10091010
.strict = false);
10101011
if ($haserr(err))
10111012
{
1012-
elog(WARNING, "%s", $errmsg(err));
1013+
elog(ERROR, "Can not create tablespace directory: %s",
1014+
$errmsg(err));
10131015
}
10141016
}
10151017

‎src/init.c‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,26 @@ do_init(CatalogState *catalogState)
3838
.mode = DIR_PERMISSION, .strict = false);
3939
if ($haserr(err))
4040
{
41-
elog(WARNING, "%s", $errmsg(err));
41+
elog(ERROR, "Can not create backup catalog root directory: %s",
42+
$errmsg(err));
4243
}
4344

4445
/* create backup catalog data directory */
4546
err = $i(pioMakeDir, backup_location, .path = catalogState->backup_subdir_path,
4647
.mode = DIR_PERMISSION, .strict = false);
4748
if ($haserr(err))
4849
{
49-
elog(WARNING, "%s", $errmsg(err));
50+
elog(ERROR, "Can not create backup catalog data directory: %s",
51+
$errmsg(err));
5052
}
5153

5254
/* create backup catalog wal directory */
5355
err = $i(pioMakeDir, backup_location, .path = catalogState->wal_subdir_path,
5456
.mode = DIR_PERMISSION, .strict = false);
5557
if ($haserr(err))
5658
{
57-
elog(WARNING, "%s", $errmsg(err));
59+
elog(ERROR, "Can not create backup catalog WAL directory: %s",
60+
$errmsg(err));
5861
}
5962

6063
elog(INFO, "Backup catalog '%s' successfully inited", catalogState->catalog_path);
@@ -108,13 +111,14 @@ do_add_instance(InstanceState *instanceState, InstanceConfig *instance)
108111
.mode = DIR_PERMISSION, .strict = false);
109112
if ($haserr(err))
110113
{
111-
elog(WARNING, "%s", $errmsg(err));
114+
elog(ERROR, "Can not create instance backup directory: %s",
115+
$errmsg(err));
112116
}
113117
err = $i(pioMakeDir, backup_location, .path = instanceState->instance_wal_subdir_path,
114118
.mode = DIR_PERMISSION, .strict = false);
115119
if ($haserr(err))
116120
{
117-
elog(WARNING, "%s", $errmsg(err));
121+
elog(ERROR, "Can not create instance WAL directory: %s", $errmsg(err));
118122
}
119123

120124
/*

‎src/merge.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,8 @@ merge_chain(InstanceState *instanceState,
651651
.mode = DIR_PERMISSION, .strict = false);
652652
if ($haserr(err))
653653
{
654-
elog(WARNING, "%s", $errmsg(err));
654+
elog(ERROR, "Can not create backup external directory: %s",
655+
$errmsg(err));
655656
}
656657
}
657658

‎src/restore.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,8 @@ restore_chain(pgBackup *dest_backup, parray *parent_chain,
824824
.path = dirpath, .mode = DIR_PERMISSION, .strict = false);
825825
if ($haserr(err))
826826
{
827-
elog(WARNING, "%s", $errmsg(err));
827+
elog(ERROR, "Can not restore external directory: %s",
828+
$errmsg(err));
828829
}
829830
}
830831
}
@@ -856,7 +857,8 @@ restore_chain(pgBackup *dest_backup, parray *parent_chain,
856857
.mode = file->mode, .strict = false);
857858
if ($haserr(err))
858859
{
859-
elog(WARNING, "%s", $errmsg(err));
860+
elog(ERROR, "Can not create backup external directory: %s",
861+
$errmsg(err));
860862
}
861863
}
862864
}

0 commit comments

Comments
 (0)