Skip to content

Commit 8c2a823

Browse files
author
Sergey Fukanchik
committed
[PBCKP-314] fio_mkdir has been replaced with pioMakeDir
1 parent 45464f0 commit 8c2a823

File tree

11 files changed

+441
-102
lines changed

11 files changed

+441
-102
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ borrowed.mk: $(firstword $(MAKEFILE_LIST))
9595
$(file >$@,# This file is autogenerated. Do not edit!)
9696
$(foreach borrowed_file, $(BORROWED_H_SRC) $(BORROWED_C_SRC), \
9797
$(file >>$@,$(addprefix $(BORROW_DIR)/, $(notdir $(borrowed_file))): | $(CURDIR)/$(BORROW_DIR)/ $(realpath $(top_srcdir)/$(borrowed_file))) \
98-
$(file >>$@,$(shell echo " "'$$(LN_S) $(realpath $(top_srcdir)/$(borrowed_file)) $$@')) \
98+
$(file >>$@,$(shell echo " "'$$(LN_S) -f $(realpath $(top_srcdir)/$(borrowed_file)) $$@')) \
9999
)
100100
include borrowed.mk
101101

‎src/backup.c‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,15 @@ do_backup_pg(InstanceState *instanceState, PGconn *backup_conn,
250250
if (current.stream)
251251
{
252252
char stream_xlog_path[MAXPGPATH];
253+
int rc;
253254

254255
join_path_components(stream_xlog_path, current.database_dir, PG_XLOG_DIR);
255-
fio_mkdir(FIO_BACKUP_HOST, stream_xlog_path, DIR_PERMISSION, false);
256+
rc = $i(pioMakeDir, current.backup_location, .path = stream_xlog_path,
257+
.mode = DIR_PERMISSION, .strict = false);
258+
if (rc) {
259+
elog(WARNING, "Cannot create wal directory at \"%s\": \"%s\". Ignored",
260+
stream_xlog_path, strerror(errno));
261+
}
256262

257263
start_WAL_streaming(backup_conn, stream_xlog_path, &instance_config.conn_opt,
258264
current.start_lsn, current.tli, true);
@@ -399,8 +405,16 @@ do_backup_pg(InstanceState *instanceState, PGconn *backup_conn,
399405
else
400406
join_path_components(dirpath, current.database_dir, file->rel_path);
401407

402-
elog(LOG, "Create directory '%s'", dirpath);
403-
fio_mkdir(FIO_BACKUP_HOST, dirpath, DIR_PERMISSION, false);
408+
{
409+
int rc;
410+
elog(LOG, "Create directory '%s'", dirpath);
411+
rc = $i(pioMakeDir, current.backup_location, .path = dirpath,
412+
.mode = DIR_PERMISSION, .strict = false);
413+
if (rc) {
414+
elog(WARNING, "Failed to create directory \"%s\": \"%s\"",
415+
dirpath, strerror(errno));
416+
}
417+
}
404418
}
405419

406420
}

‎src/catalog.c‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,8 +1498,15 @@ pgBackupInitDir(pgBackup *backup, const char *backup_instance_path)
14981498
/* create directories for actual backup files */
14991499
for (i = 0; i < parray_num(subdirs); i++)
15001500
{
1501+
int rc;
1502+
15011503
join_path_components(temp, backup->root_dir, parray_get(subdirs, i));
1502-
fio_mkdir(FIO_BACKUP_HOST, temp, DIR_PERMISSION, false);
1504+
rc = $i(pioMakeDir, backup->backup_location, .path = temp,
1505+
.mode = DIR_PERMISSION, .strict = false);
1506+
if (rc) {
1507+
elog(WARNING, "Cannot create initial directory \"%s\": %s",
1508+
temp, strerror(errno));
1509+
}
15031510
}
15041511

15051512
free_dir_list(subdirs);
@@ -1520,8 +1527,7 @@ create_backup_dir(pgBackup *backup, const char *backup_instance_path)
15201527

15211528
join_path_components(path, backup_instance_path, base36enc(backup->backup_id));
15221529

1523-
/* TODO: add wrapper for remote mode */
1524-
rc = fio_mkdir(FIO_BACKUP_HOST, path, DIR_PERMISSION, true);
1530+
rc = $i(pioMakeDir, backup->backup_location, .path = path, .mode = DIR_PERMISSION, .strict = true);
15251531

15261532
if (rc == 0)
15271533
backup->root_dir = pgut_strdup(path);
@@ -2704,6 +2710,7 @@ readBackupControlFile(const char *path)
27042710
};
27052711

27062712
pgBackupInit(backup);
2713+
27072714
if (fio_access(FIO_BACKUP_HOST, path, F_OK) != 0)
27082715
{
27092716
elog(WARNING, "Control file \"%s\" doesn't exist", path);
@@ -2969,6 +2976,9 @@ pgBackupInit(pgBackup *backup)
29692976
backup->files = NULL;
29702977
backup->note = NULL;
29712978
backup->content_crc = 0;
2979+
2980+
backup->backup_location = pioDriveForLocation(FIO_BACKUP_HOST);
2981+
backup->database_location = pioDriveForLocation(FIO_DB_HOST);
29722982
}
29732983

29742984
/* free pgBackup object */
@@ -2977,6 +2987,10 @@ pgBackupFree(void *backup)
29772987
{
29782988
pgBackup *b = (pgBackup *) backup;
29792989

2990+
/* both point to global static vars */
2991+
b->backup_location.self = NULL;
2992+
b->database_location.self = NULL;
2993+
29802994
pg_free(b->primary_conninfo);
29812995
pg_free(b->external_dir_str);
29822996
pg_free(b->root_dir);

‎src/catchup.c‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,7 @@ int
613613
do_catchup(const char *source_pgdata, const char *dest_pgdata, int num_threads, bool sync_dest_files,
614614
parray *exclude_absolute_paths_list, parray *exclude_relative_paths_list)
615615
{
616+
pioDrive_i local_location = pioDriveForLocation(FIO_LOCAL_HOST);
616617
PGconn *source_conn = NULL;
617618
PGNodeInfo source_node_info;
618619
bool backup_logs = false;
@@ -704,7 +705,10 @@ do_catchup(const char *source_pgdata, const char *dest_pgdata, int num_threads,
704705
join_path_components(dest_xlog_path, dest_pgdata, PG_XLOG_DIR);
705706
if (!dry_run)
706707
{
707-
fio_mkdir(FIO_LOCAL_HOST, dest_xlog_path, DIR_PERMISSION, false);
708+
int rc = $i(pioMakeDir, local_location, dest_xlog_path, DIR_PERMISSION, false);
709+
if (rc < 0) {
710+
elog(WARNING, "Cannot create dir \"%s\": \"%s\"", dest_xlog_path, strerror(errno));
711+
}
708712
start_WAL_streaming(source_conn, dest_xlog_path, &instance_config.conn_opt,
709713
current.start_lsn, current.tli, false);
710714
}
@@ -819,8 +823,12 @@ do_catchup(const char *source_pgdata, const char *dest_pgdata, int num_threads,
819823
join_path_components(dirpath, dest_pgdata, file->rel_path);
820824

821825
elog(LOG, "Create directory '%s'", dirpath);
822-
if (!dry_run)
823-
fio_mkdir(FIO_LOCAL_HOST, dirpath, DIR_PERMISSION, false);
826+
if (!dry_run) {
827+
int rc = $i(pioMakeDir, local_location, dirpath, DIR_PERMISSION, false);
828+
if (rc < 0) {
829+
elog(WARNING, "Cannot create directory \"%s\": \"%s\"", dirpath, strerror(errno));
830+
}
831+
}
824832
}
825833
else
826834
{
@@ -854,14 +862,15 @@ do_catchup(const char *source_pgdata, const char *dest_pgdata, int num_threads,
854862
if (!dry_run)
855863
{
856864
/* create tablespace directory */
857-
if (fio_mkdir(FIO_LOCAL_HOST, linked_path, file->mode, false) != 0)
865+
if ($i(pioMakeDir, local_location, linked_path, file->mode, false) != 0)
858866
elog(ERROR, "Could not create tablespace directory \"%s\": %s",
859867
linked_path, strerror(errno));
860868

861869
/* create link to linked_path */
862-
if (fio_symlink(FIO_LOCAL_HOST, linked_path, to_path, true) < 0)
870+
if ($i(pioSymLink, local_location, linked_path, to_path, true) < 0) {
863871
elog(ERROR, "Could not create symbolic link \"%s\" -> \"%s\": %s",
864872
to_path, linked_path, strerror(errno));
873+
}
865874
}
866875
}
867876
}

‎src/dir.c‎

Lines changed: 45 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -844,15 +844,15 @@ opt_externaldir_map(ConfigOption *opt, const char *arg)
844844
*/
845845
void
846846
create_data_directories(parray *dest_files, const char *data_dir, const char *backup_dir,
847-
bool extract_tablespaces, bool incremental, fio_location location,
847+
bool extract_tablespaces, bool incremental, pioDrive_i location,
848848
const char* waldir_path)
849849
{
850850
int i;
851851
parray *links = NULL;
852852
mode_t pg_tablespace_mode = DIR_PERMISSION;
853853
char to_path[MAXPGPATH];
854854

855-
if (waldir_path && !dir_is_empty(waldir_path, location))
855+
if (waldir_path && !$i(pioIsDirEmpty, location, waldir_path))
856856
{
857857
elog(ERROR, "WAL directory location is not empty: \"%s\"", waldir_path);
858858
}
@@ -932,12 +932,25 @@ create_data_directories(parray *dest_files, const char *data_dir, const char *ba
932932
waldir_path, to_path);
933933

934934
/* create tablespace directory from waldir_path*/
935-
fio_mkdir(location, waldir_path, pg_tablespace_mode, false);
935+
{
936+
int rc;
937+
rc = $i(pioMakeDir, location, .path = waldir_path,
938+
.mode = pg_tablespace_mode, .strict = false);
939+
if (rc) {
940+
elog(WARNING, "Can not create wal directory \"%s\": \"%s\"",
941+
waldir_path, strerror(errno));
942+
}
943+
}
936944

937945
/* create link to linked_path */
938-
if (fio_symlink(location, waldir_path, to_path, incremental) < 0)
939-
elog(ERROR, "Could not create symbolic link \"%s\": %s",
940-
to_path, strerror(errno));
946+
{
947+
int rc;
948+
rc = $i(pioSymLink,location, waldir_path, to_path, incremental);
949+
if (rc < 0) {
950+
elog(ERROR, "Could not create symbolic link \"%s\": %s",
951+
to_path, strerror(errno));
952+
}
953+
}
941954

942955
continue;
943956

@@ -974,12 +987,26 @@ create_data_directories(parray *dest_files, const char *data_dir, const char *ba
974987
linked_path, to_path);
975988

976989
/* create tablespace directory */
977-
fio_mkdir(location, linked_path, pg_tablespace_mode, false);
990+
{
991+
int rc;
992+
993+
rc = $i(pioMakeDir, location, .path = linked_path,
994+
.mode = pg_tablespace_mode, .strict = false);
995+
if (rc) {
996+
elog(WARNING, "Can not create tablespace directory \"%s\": \"%s\"",
997+
linked_path, strerror(errno));
998+
}
999+
}
9781000

9791001
/* create link to linked_path */
980-
if (fio_symlink(location, linked_path, to_path, incremental) < 0)
981-
elog(ERROR, "Could not create symbolic link \"%s\": %s",
982-
to_path, strerror(errno));
1002+
{
1003+
int rc;
1004+
1005+
rc = $i(pioSymLink, location, linked_path, to_path, incremental);
1006+
if (rc < 0)
1007+
elog(ERROR, "Could not create symbolic link \"%s\": %s",
1008+
to_path, strerror(errno));
1009+
}
9831010

9841011
continue;
9851012
}
@@ -992,7 +1019,14 @@ create_data_directories(parray *dest_files, const char *data_dir, const char *ba
9921019
join_path_components(to_path, data_dir, dir->rel_path);
9931020

9941021
// TODO check exit code
995-
fio_mkdir(location, to_path, dir->mode, false);
1022+
{
1023+
int rc;
1024+
1025+
rc = $i(pioMakeDir, location, .path = to_path, .mode = dir->mode, .strict = false);
1026+
if (rc) {
1027+
elog(WARNING, "Can not create directory \"%s\": \"%s\"", to_path, strerror(errno));
1028+
}
1029+
}
9961030
}
9971031

9981032
if (extract_tablespaces)

‎src/init.c‎

Lines changed: 46 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,36 @@ do_init(CatalogState *catalogState)
3131
catalogState->catalog_path, strerror(errno_tmp));
3232
}
3333

34-
/* create backup catalog root directory */
35-
fio_mkdir(FIO_BACKUP_HOST, catalogState->catalog_path, DIR_PERMISSION, false);
36-
37-
/* create backup catalog data directory */
38-
fio_mkdir(FIO_BACKUP_HOST, catalogState->backup_subdir_path, DIR_PERMISSION, false);
39-
40-
/* create backup catalog wal directory */
41-
fio_mkdir(FIO_BACKUP_HOST, catalogState->wal_subdir_path, DIR_PERMISSION, false);
42-
43-
elog(INFO, "Backup catalog '%s' successfully inited", catalogState->catalog_path);
34+
{
35+
pioDrive_i backup_location = pioDriveForLocation(FIO_BACKUP_HOST);
36+
int rc;
37+
38+
/* create backup catalog root directory */
39+
rc = $i(pioMakeDir, backup_location, .path = catalogState->catalog_path,
40+
.mode = DIR_PERMISSION, .strict = false);
41+
if (rc) {
42+
elog(VERBOSE, "Got error while creating: \"%s\": \"%s\"",
43+
catalogState->catalog_path, strerror(errno));
44+
}
45+
46+
/* create backup catalog data directory */
47+
rc = $i(pioMakeDir, backup_location, .path = catalogState->backup_subdir_path,
48+
.mode = DIR_PERMISSION, .strict = false);
49+
if (rc) {
50+
elog(VERBOSE, "Got error while creating: \"%s\": \"%s\"",
51+
catalogState->backup_subdir_path, strerror(errno));
52+
}
53+
54+
/* create backup catalog wal directory */
55+
rc = $i(pioMakeDir, backup_location, .path = catalogState->wal_subdir_path,
56+
.mode = DIR_PERMISSION, .strict = false);
57+
if (rc) {
58+
elog(VERBOSE, "Got error while creating: \"%s\": \"%s\"",
59+
catalogState->wal_subdir_path, strerror(errno));
60+
}
61+
62+
elog(INFO, "Backup catalog '%s' successfully inited", catalogState->catalog_path);
63+
}
4464
return 0;
4565
}
4666

@@ -85,8 +105,22 @@ do_add_instance(InstanceState *instanceState, InstanceConfig *instance)
85105
instanceState->instance_name, instanceState->instance_wal_subdir_path);
86106

87107
/* Create directory for data files of this specific instance */
88-
fio_mkdir(FIO_BACKUP_HOST, instanceState->instance_backup_subdir_path, DIR_PERMISSION, false);
89-
fio_mkdir(FIO_BACKUP_HOST, instanceState->instance_wal_subdir_path, DIR_PERMISSION, false);
108+
{
109+
pioDrive_i backup_location = pioDriveForLocation(FIO_BACKUP_HOST);
110+
int rc;
111+
rc = $i(pioMakeDir, backup_location, .path = instanceState->instance_backup_subdir_path,
112+
.mode = DIR_PERMISSION, .strict = false);
113+
if (rc) {
114+
elog(WARNING, "Can not create directory \"%s\": \"%s\"",
115+
instanceState->instance_backup_subdir_path, strerror(errno));
116+
}
117+
rc = $i(pioMakeDir, backup_location, .path = instanceState->instance_wal_subdir_path,
118+
.mode = DIR_PERMISSION, .strict = false);
119+
if (rc) {
120+
elog(WARNING, "Can not create directory \"%s\": \"%s\"",
121+
instanceState->instance_wal_subdir_path, strerror(errno));
122+
}
123+
}
90124

91125
/*
92126
* Write initial configuration file.

‎src/merge.c‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ merge_chain(InstanceState *instanceState,
613613

614614
/* Create directories */
615615
create_data_directories(dest_backup->files, full_database_dir,
616-
dest_backup->root_dir, false, false, FIO_BACKUP_HOST, NULL);
616+
dest_backup->root_dir, false, false, dest_backup->backup_location, NULL);
617617

618618
/* External directories stuff */
619619
if (dest_backup->external_dir_str)
@@ -641,11 +641,17 @@ merge_chain(InstanceState *instanceState,
641641
{
642642
char dirpath[MAXPGPATH];
643643
char new_container[MAXPGPATH];
644+
int rc;
644645

645646
makeExternalDirPathByNum(new_container, full_external_prefix,
646647
file->external_dir_num);
647648
join_path_components(dirpath, new_container, file->rel_path);
648-
fio_mkdir(FIO_BACKUP_HOST, dirpath, DIR_PERMISSION, false);
649+
rc = $i(pioMakeDir, dest_backup->backup_location,
650+
.path = dirpath, .mode = DIR_PERMISSION, .strict = false);
651+
if (rc) {
652+
elog(WARNING, "Can not create external directory \"%s\": \"%s\"",
653+
dirpath, strerror(errno));
654+
}
649655
}
650656

651657
pg_atomic_init_flag(&file->lock);

‎src/pg_probackup.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,9 @@ struct pgBackup
488488

489489
/* map used for access to page headers */
490490
HeaderMap hdr_map;
491+
492+
pioDrive_i database_location; /* Where to backup from/restore to */
493+
pioDrive_i backup_location; /* Where to save to/read from */
491494
};
492495

493496
/* Recovery target for restore and validate subcommands */
@@ -992,7 +995,7 @@ extern void create_data_directories(parray *dest_files,
992995
const char *backup_dir,
993996
bool extract_tablespaces,
994997
bool incremental,
995-
fio_location location,
998+
pioDrive_i location,
996999
const char *waldir_path);
9971000

9981001
extern void read_tablespace_map(parray *links, const char *backup_dir);

0 commit comments

Comments
 (0)