Skip to content

Commit f239d39

Browse files
kulaginmGrigory Smolkin
kulaginm
authored and
Grigory Smolkin
committed
[refactoring] move fio_location argument in first place in fio_ functions (part 1)
1 parent ab1aa37 commit f239d39

File tree

18 files changed

+217
-206
lines changed

18 files changed

+217
-206
lines changed

‎src/archive.c‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ push_file(WALSegno *xlogfile, const char *archive_status_dir,
364364
elog(LOG, "Rename \"%s\" to \"%s\"", wal_file_ready, wal_file_done);
365365

366366
/* do not error out, if rename failed */
367-
if (fio_rename(wal_file_ready, wal_file_done, FIO_DB_HOST) < 0)
367+
if (fio_rename(FIO_DB_HOST, wal_file_ready, wal_file_done) < 0)
368368
elog(WARNING, "Cannot rename ready file \"%s\" to \"%s\": %s",
369369
wal_file_ready, wal_file_done, strerror(errno));
370370
}
@@ -418,7 +418,7 @@ push_file_internal_uncompressed(const char *wal_file_name, const char *pg_xlog_d
418418
snprintf(to_fullpath_part, sizeof(to_fullpath_part), "%s.part", to_fullpath);
419419

420420
/* Grab lock by creating temp file in exclusive mode */
421-
out = fio_open(to_fullpath_part, O_RDWR | O_CREAT | O_EXCL | PG_BINARY, FIO_BACKUP_HOST);
421+
out = fio_open(FIO_BACKUP_HOST, to_fullpath_part, O_RDWR | O_CREAT | O_EXCL | PG_BINARY);
422422
if (out < 0)
423423
{
424424
if (errno != EEXIST)
@@ -444,12 +444,12 @@ push_file_internal_uncompressed(const char *wal_file_name, const char *pg_xlog_d
444444

445445
while (partial_try_count < archive_timeout)
446446
{
447-
if (fio_stat(to_fullpath_part, &st, false, FIO_BACKUP_HOST) < 0)
447+
if (fio_stat(FIO_BACKUP_HOST, to_fullpath_part, &st, false) < 0)
448448
{
449449
if (errno == ENOENT)
450450
{
451451
//part file is gone, lets try to grab it
452-
out = fio_open(to_fullpath_part, O_RDWR | O_CREAT | O_EXCL | PG_BINARY, FIO_BACKUP_HOST);
452+
out = fio_open(FIO_BACKUP_HOST, to_fullpath_part, O_RDWR | O_CREAT | O_EXCL | PG_BINARY);
453453
if (out < 0)
454454
{
455455
if (errno != EEXIST)
@@ -497,10 +497,10 @@ push_file_internal_uncompressed(const char *wal_file_name, const char *pg_xlog_d
497497

498498
/* Partial segment is considered stale, so reuse it */
499499
elog(LOG, "Reusing stale temp WAL file \"%s\"", to_fullpath_part);
500-
if (fio_remove(to_fullpath_part, false, FIO_BACKUP_HOST) != 0)
500+
if (fio_remove(FIO_BACKUP_HOST, to_fullpath_part, false) != 0)
501501
elog(ERROR, "Cannot remove stale temp WAL file \"%s\": %s", to_fullpath_part, strerror(errno));
502502

503-
out = fio_open(to_fullpath_part, O_RDWR | O_CREAT | O_EXCL | PG_BINARY, FIO_BACKUP_HOST);
503+
out = fio_open(FIO_BACKUP_HOST, to_fullpath_part, O_RDWR | O_CREAT | O_EXCL | PG_BINARY);
504504
if (out < 0)
505505
elog(ERROR, "Cannot open temp WAL file \"%s\": %s", to_fullpath_part, strerror(errno));
506506
}
@@ -513,8 +513,8 @@ push_file_internal_uncompressed(const char *wal_file_name, const char *pg_xlog_d
513513
pg_crc32 crc32_src;
514514
pg_crc32 crc32_dst;
515515

516-
crc32_src = fio_get_crc32(from_fullpath, FIO_DB_HOST, false, false);
517-
crc32_dst = fio_get_crc32(to_fullpath, FIO_BACKUP_HOST, false, false);
516+
crc32_src = fio_get_crc32(FIO_DB_HOST, from_fullpath, false, false);
517+
crc32_dst = fio_get_crc32(FIO_BACKUP_HOST, to_fullpath, false, false);
518518

519519
if (crc32_src == crc32_dst)
520520
{
@@ -523,7 +523,7 @@ push_file_internal_uncompressed(const char *wal_file_name, const char *pg_xlog_d
523523
/* cleanup */
524524
fclose(in);
525525
fio_close(out);
526-
if (fio_remove(to_fullpath_part, false, FIO_BACKUP_HOST) != 0)
526+
if (fio_remove(FIO_BACKUP_HOST, to_fullpath_part, false) != 0)
527527
elog(WARNING, "Cannot remove temp WAL file \"%s\": %s", to_fullpath_part, strerror(errno));
528528
return 1;
529529
}
@@ -537,7 +537,7 @@ push_file_internal_uncompressed(const char *wal_file_name, const char *pg_xlog_d
537537
/* Overwriting is forbidden,
538538
* so we must unlink partial file and exit with error.
539539
*/
540-
if (fio_remove(to_fullpath_part, false, FIO_BACKUP_HOST) != 0)
540+
if (fio_remove(FIO_BACKUP_HOST, to_fullpath_part, false) != 0)
541541
elog(WARNING, "Cannot remove temp WAL file \"%s\": %s", to_fullpath_part, strerror(errno));
542542
elog(ERROR, "WAL file already exists in archive with "
543543
"different checksum: \"%s\"", to_fullpath);
@@ -556,7 +556,7 @@ push_file_internal_uncompressed(const char *wal_file_name, const char *pg_xlog_d
556556
if (ferror(in))
557557
{
558558
int save_errno = errno;
559-
if (fio_remove(to_fullpath_part, false, FIO_BACKUP_HOST) != 0)
559+
if (fio_remove(FIO_BACKUP_HOST, to_fullpath_part, false) != 0)
560560
elog(WARNING, "Cannot remove temp WAL file \"%s\": %s", to_fullpath_part, strerror(errno));
561561
elog(ERROR, "Cannot read source file \"%s\": %s",
562562
from_fullpath, strerror(save_errno));
@@ -565,7 +565,7 @@ push_file_internal_uncompressed(const char *wal_file_name, const char *pg_xlog_d
565565
if (read_len > 0 && fio_write_async(out, buf, read_len) != read_len)
566566
{
567567
int save_errno = errno;
568-
if (fio_remove(to_fullpath_part, false, FIO_BACKUP_HOST) != 0)
568+
if (fio_remove(FIO_BACKUP_HOST, to_fullpath_part, false) != 0)
569569
elog(WARNING, "Cannot cleanup temp WAL file \"%s\": %s", to_fullpath_part, strerror(errno));
570570
elog(ERROR, "Cannot write to destination temp file \"%s\": %s",
571571
to_fullpath_part, strerror(save_errno));
@@ -581,7 +581,7 @@ push_file_internal_uncompressed(const char *wal_file_name, const char *pg_xlog_d
581581
/* Writing is asynchronous in case of push in remote mode, so check agent status */
582582
if (fio_check_error_fd(out, &errmsg))
583583
{
584-
if (fio_remove(to_fullpath_part, false, FIO_BACKUP_HOST) != 0)
584+
if (fio_remove(FIO_BACKUP_HOST, to_fullpath_part, false) != 0)
585585
elog(WARNING, "Cannot cleanup temp WAL file \"%s\": %s", to_fullpath_part, strerror(errno));
586586
elog(ERROR, "Cannot write to the remote file \"%s\": %s",
587587
to_fullpath_part, errmsg);
@@ -591,7 +591,7 @@ push_file_internal_uncompressed(const char *wal_file_name, const char *pg_xlog_d
591591
if (fio_close(out) != 0)
592592
{
593593
int save_errno = errno;
594-
if (fio_remove(to_fullpath_part, false, FIO_BACKUP_HOST) != 0)
594+
if (fio_remove(FIO_BACKUP_HOST, to_fullpath_part, false) != 0)
595595
elog(WARNING, "Cannot cleanup temp WAL file \"%s\": %s", to_fullpath_part, strerror(errno));
596596
elog(ERROR, "Cannot close temp WAL file \"%s\": %s",
597597
to_fullpath_part, strerror(save_errno));
@@ -600,7 +600,7 @@ push_file_internal_uncompressed(const char *wal_file_name, const char *pg_xlog_d
600600
/* sync temp file to disk */
601601
if (!no_sync)
602602
{
603-
if (fio_sync(to_fullpath_part, FIO_BACKUP_HOST) != 0)
603+
if (fio_sync(FIO_BACKUP_HOST, to_fullpath_part) != 0)
604604
elog(ERROR, "Failed to sync file \"%s\": %s",
605605
to_fullpath_part, strerror(errno));
606606
}
@@ -610,10 +610,10 @@ push_file_internal_uncompressed(const char *wal_file_name, const char *pg_xlog_d
610610
//copy_file_attributes(from_path, FIO_DB_HOST, to_path_temp, FIO_BACKUP_HOST, true);
611611

612612
/* Rename temp file to destination file */
613-
if (fio_rename(to_fullpath_part, to_fullpath, FIO_BACKUP_HOST) < 0)
613+
if (fio_rename(FIO_BACKUP_HOST, to_fullpath_part, to_fullpath) < 0)
614614
{
615615
int save_errno = errno;
616-
if (fio_remove(to_fullpath_part, false, FIO_BACKUP_HOST) != 0)
616+
if (fio_remove(FIO_BACKUP_HOST, to_fullpath_part, false) != 0)
617617
elog(WARNING, "Cannot cleanup temp WAL file \"%s\": %s", to_fullpath_part, strerror(errno));
618618
elog(ERROR, "Cannot rename file \"%s\" to \"%s\": %s",
619619
to_fullpath_part, to_fullpath, strerror(save_errno));
@@ -675,7 +675,7 @@ push_file_internal_gz(const char *wal_file_name, const char *pg_xlog_dir,
675675
setvbuf(in, NULL, _IONBF, BUFSIZ);
676676

677677
/* Grab lock by creating temp file in exclusive mode */
678-
out = fio_gzopen(to_fullpath_gz_part, PG_BINARY_W, compress_level, FIO_BACKUP_HOST);
678+
out = fio_gzopen(FIO_BACKUP_HOST, to_fullpath_gz_part, PG_BINARY_W, compress_level);
679679
if (out == NULL)
680680
{
681681
if (errno != EEXIST)
@@ -701,12 +701,12 @@ push_file_internal_gz(const char *wal_file_name, const char *pg_xlog_dir,
701701

702702
while (partial_try_count < archive_timeout)
703703
{
704-
if (fio_stat(to_fullpath_gz_part, &st, false, FIO_BACKUP_HOST) < 0)
704+
if (fio_stat(FIO_BACKUP_HOST, to_fullpath_gz_part, &st, false) < 0)
705705
{
706706
if (errno == ENOENT)
707707
{
708708
//part file is gone, lets try to grab it
709-
out = fio_gzopen(to_fullpath_gz_part, PG_BINARY_W, compress_level, FIO_BACKUP_HOST);
709+
out = fio_gzopen(FIO_BACKUP_HOST, to_fullpath_gz_part, PG_BINARY_W, compress_level);
710710
if (out == NULL)
711711
{
712712
if (errno != EEXIST)
@@ -755,10 +755,10 @@ push_file_internal_gz(const char *wal_file_name, const char *pg_xlog_dir,
755755

756756
/* Partial segment is considered stale, so reuse it */
757757
elog(LOG, "Reusing stale temp WAL file \"%s\"", to_fullpath_gz_part);
758-
if (fio_remove(to_fullpath_gz_part, false, FIO_BACKUP_HOST) != 0)
758+
if (fio_remove(FIO_BACKUP_HOST, to_fullpath_gz_part, false) != 0)
759759
elog(ERROR, "Cannot remove stale compressed temp WAL file \"%s\": %s", to_fullpath_gz_part, strerror(errno));
760760

761-
out = fio_gzopen(to_fullpath_gz_part, PG_BINARY_W, compress_level, FIO_BACKUP_HOST);
761+
out = fio_gzopen(FIO_BACKUP_HOST, to_fullpath_gz_part, PG_BINARY_W, compress_level);
762762
if (out == NULL)
763763
elog(ERROR, "Cannot open temp WAL file \"%s\": %s",
764764
to_fullpath_gz_part, strerror(errno));
@@ -773,8 +773,8 @@ push_file_internal_gz(const char *wal_file_name, const char *pg_xlog_dir,
773773
pg_crc32 crc32_src;
774774
pg_crc32 crc32_dst;
775775

776-
crc32_src = fio_get_crc32(from_fullpath, FIO_DB_HOST, false, false);
777-
crc32_dst = fio_get_crc32(to_fullpath_gz, FIO_BACKUP_HOST, true, false);
776+
crc32_src = fio_get_crc32(FIO_DB_HOST, from_fullpath, false, false);
777+
crc32_dst = fio_get_crc32(FIO_BACKUP_HOST, to_fullpath_gz, true, false);
778778

779779
if (crc32_src == crc32_dst)
780780
{
@@ -783,7 +783,7 @@ push_file_internal_gz(const char *wal_file_name, const char *pg_xlog_dir,
783783
/* cleanup */
784784
fclose(in);
785785
fio_gzclose(out);
786-
if (fio_remove(to_fullpath_gz_part, false, FIO_BACKUP_HOST) != 0)
786+
if (fio_remove(FIO_BACKUP_HOST, to_fullpath_gz_part, false) != 0)
787787
elog(WARNING, "Cannot remove compressed temp WAL file \"%s\": %s", to_fullpath_gz_part, strerror(errno));
788788
return 1;
789789
}
@@ -797,7 +797,7 @@ push_file_internal_gz(const char *wal_file_name, const char *pg_xlog_dir,
797797
/* Overwriting is forbidden,
798798
* so we must unlink partial file and exit with error.
799799
*/
800-
if (fio_remove(to_fullpath_gz_part, false, FIO_BACKUP_HOST) != 0)
800+
if (fio_remove(FIO_BACKUP_HOST, to_fullpath_gz_part, false) != 0)
801801
elog(WARNING, "Cannot remove compressed temp WAL file \"%s\": %s", to_fullpath_gz_part, strerror(errno));
802802
elog(ERROR, "WAL file already exists in archive with "
803803
"different checksum: \"%s\"", to_fullpath_gz);
@@ -816,7 +816,7 @@ push_file_internal_gz(const char *wal_file_name, const char *pg_xlog_dir,
816816
if (ferror(in))
817817
{
818818
int save_errno = errno;
819-
if (fio_remove(to_fullpath_gz_part, false, FIO_BACKUP_HOST) != 0)
819+
if (fio_remove(FIO_BACKUP_HOST, to_fullpath_gz_part, false) != 0)
820820
elog(WARNING, "Cannot remove compressed temp WAL file \"%s\": %s", to_fullpath_gz_part, strerror(errno));
821821
elog(ERROR, "Cannot read from source file \"%s\": %s",
822822
from_fullpath, strerror(save_errno));
@@ -825,7 +825,7 @@ push_file_internal_gz(const char *wal_file_name, const char *pg_xlog_dir,
825825
if (read_len > 0 && fio_gzwrite(out, buf, read_len) != read_len)
826826
{
827827
int save_errno = errno;
828-
if (fio_remove(to_fullpath_gz_part, false, FIO_BACKUP_HOST) != 0)
828+
if (fio_remove(FIO_BACKUP_HOST, to_fullpath_gz_part, false) != 0)
829829
elog(WARNING, "Cannot cleanup compressed temp WAL file \"%s\": %s", to_fullpath_gz_part, strerror(errno));
830830
elog(ERROR, "Cannot write to compressed temp WAL file \"%s\": %s",
831831
to_fullpath_gz_part, get_gz_error(out, save_errno));
@@ -841,7 +841,7 @@ push_file_internal_gz(const char *wal_file_name, const char *pg_xlog_dir,
841841
/* Writing is asynchronous in case of push in remote mode, so check agent status */
842842
if (fio_check_error_fd_gz(out, &errmsg))
843843
{
844-
if (fio_remove(to_fullpath_gz_part, false, FIO_BACKUP_HOST) != 0)
844+
if (fio_remove(FIO_BACKUP_HOST, to_fullpath_gz_part, false) != 0)
845845
elog(WARNING, "Cannot cleanup remote compressed temp WAL file \"%s\": %s", to_fullpath_gz_part, strerror(errno));
846846
elog(ERROR, "Cannot write to the remote compressed file \"%s\": %s",
847847
to_fullpath_gz_part, errmsg);
@@ -851,7 +851,7 @@ push_file_internal_gz(const char *wal_file_name, const char *pg_xlog_dir,
851851
if (fio_gzclose(out) != 0)
852852
{
853853
int save_errno = errno;
854-
if (fio_remove(to_fullpath_gz_part, false, FIO_BACKUP_HOST) != 0)
854+
if (fio_remove(FIO_BACKUP_HOST, to_fullpath_gz_part, false) != 0)
855855
elog(WARNING, "Cannot cleanup compressed temp WAL file \"%s\": %s", to_fullpath_gz_part, strerror(errno));
856856
elog(ERROR, "Cannot close compressed temp WAL file \"%s\": %s",
857857
to_fullpath_gz_part, strerror(save_errno));
@@ -860,7 +860,7 @@ push_file_internal_gz(const char *wal_file_name, const char *pg_xlog_dir,
860860
/* sync temp file to disk */
861861
if (!no_sync)
862862
{
863-
if (fio_sync(to_fullpath_gz_part, FIO_BACKUP_HOST) != 0)
863+
if (fio_sync(FIO_BACKUP_HOST, to_fullpath_gz_part) != 0)
864864
elog(ERROR, "Failed to sync file \"%s\": %s",
865865
to_fullpath_gz_part, strerror(errno));
866866
}
@@ -871,10 +871,10 @@ push_file_internal_gz(const char *wal_file_name, const char *pg_xlog_dir,
871871
//copy_file_attributes(from_path, FIO_DB_HOST, to_path_temp, FIO_BACKUP_HOST, true);
872872

873873
/* Rename temp file to destination file */
874-
if (fio_rename(to_fullpath_gz_part, to_fullpath_gz, FIO_BACKUP_HOST) < 0)
874+
if (fio_rename(FIO_BACKUP_HOST, to_fullpath_gz_part, to_fullpath_gz) < 0)
875875
{
876876
int save_errno = errno;
877-
if (fio_remove(to_fullpath_gz_part, false, FIO_BACKUP_HOST) != 0)
877+
if (fio_remove(FIO_BACKUP_HOST, to_fullpath_gz_part, false) != 0)
878878
elog(WARNING, "Cannot cleanup compressed temp WAL file \"%s\": %s", to_fullpath_gz_part, strerror(errno));
879879
elog(ERROR, "Cannot rename file \"%s\" to \"%s\": %s",
880880
to_fullpath_gz_part, to_fullpath_gz, strerror(save_errno));
@@ -912,15 +912,15 @@ get_gz_error(gzFile gzf, int errnum)
912912
//{
913913
// struct stat st;
914914
//
915-
// if (fio_stat(from_path, &st, true, from_location) == -1)
915+
// if (fio_stat(from_location, from_path, &st, true) == -1)
916916
// {
917917
// if (unlink_on_error)
918918
// fio_unlink(to_path, to_location);
919919
// elog(ERROR, "Cannot stat file \"%s\": %s",
920920
// from_path, strerror(errno));
921921
// }
922922
//
923-
// if (fio_chmod(to_path, st.st_mode, to_location) == -1)
923+
// if (fio_chmod(to_location, to_path, st.st_mode) == -1)
924924
// {
925925
// if (unlink_on_error)
926926
// fio_unlink(to_path, to_location);

‎src/backup.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ do_backup_pg(InstanceState *instanceState, PGconn *backup_conn,
241241
if (current.backup_mode == BACKUP_MODE_DIFF_PAGE || !current.stream)
242242
{
243243
/* Check that archive_dir can be reached */
244-
if (fio_access(instanceState->instance_wal_subdir_path, F_OK, FIO_BACKUP_HOST) != 0)
244+
if (fio_access(FIO_BACKUP_HOST, instanceState->instance_wal_subdir_path, F_OK) != 0)
245245
elog(ERROR, "WAL archive directory is not accessible \"%s\": %s",
246246
instanceState->instance_wal_subdir_path, strerror(errno));
247247

@@ -259,7 +259,7 @@ do_backup_pg(InstanceState *instanceState, PGconn *backup_conn,
259259
char stream_xlog_path[MAXPGPATH];
260260

261261
join_path_components(stream_xlog_path, current.database_dir, PG_XLOG_DIR);
262-
fio_mkdir(stream_xlog_path, DIR_PERMISSION, FIO_BACKUP_HOST);
262+
fio_mkdir(FIO_BACKUP_HOST, stream_xlog_path, DIR_PERMISSION);
263263

264264
start_WAL_streaming(backup_conn, stream_xlog_path, &instance_config.conn_opt,
265265
current.start_lsn, current.tli, true);
@@ -412,7 +412,7 @@ do_backup_pg(InstanceState *instanceState, PGconn *backup_conn,
412412
join_path_components(dirpath, current.database_dir, file->rel_path);
413413

414414
elog(LOG, "Create directory '%s'", dirpath);
415-
fio_mkdir(dirpath, DIR_PERMISSION, FIO_BACKUP_HOST);
415+
fio_mkdir(FIO_BACKUP_HOST, dirpath, DIR_PERMISSION);
416416
}
417417

418418
}
@@ -527,7 +527,7 @@ do_backup_pg(InstanceState *instanceState, PGconn *backup_conn,
527527
{
528528
cleanup_header_map(&(current.hdr_map));
529529

530-
if (fio_sync(current.hdr_map.path, FIO_BACKUP_HOST) != 0)
530+
if (fio_sync(FIO_BACKUP_HOST, current.hdr_map.path) != 0)
531531
elog(ERROR, "Cannot sync file \"%s\": %s", current.hdr_map.path, strerror(errno));
532532
}
533533

@@ -586,7 +586,7 @@ do_backup_pg(InstanceState *instanceState, PGconn *backup_conn,
586586
join_path_components(to_fullpath, external_dst, file->rel_path);
587587
}
588588

589-
if (fio_sync(to_fullpath, FIO_BACKUP_HOST) != 0)
589+
if (fio_sync(FIO_BACKUP_HOST, to_fullpath) != 0)
590590
elog(ERROR, "Cannot sync file \"%s\": %s", to_fullpath, strerror(errno));
591591
}
592592

@@ -1889,7 +1889,7 @@ pg_stop_backup_write_file_helper(const char *path, const char *filename, const c
18891889
char full_filename[MAXPGPATH];
18901890

18911891
join_path_components(full_filename, path, filename);
1892-
fp = fio_fopen(full_filename, PG_BINARY_W, FIO_BACKUP_HOST);
1892+
fp = fio_fopen(FIO_BACKUP_HOST, full_filename, PG_BINARY_W);
18931893
if (fp == NULL)
18941894
elog(ERROR, "can't open %s file \"%s\": %s",
18951895
error_msg_filename, full_filename, strerror(errno));

0 commit comments

Comments
 (0)