Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit406d82c

Browse files
committed
[PR#398] remove conn_arg from backup_files_arg
1 parent6de1e2a commit406d82c

File tree

4 files changed

+29
-39
lines changed

4 files changed

+29
-39
lines changed

‎src/backup.c‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -466,8 +466,6 @@ do_backup_pg(InstanceState *instanceState, PGconn *backup_conn,
466466
arg->files_list=backup_files_list;
467467
arg->prev_filelist=prev_backup_filelist;
468468
arg->prev_start_lsn=prev_backup_start_lsn;
469-
arg->conn_arg.conn=NULL;
470-
arg->conn_arg.cancel_conn=NULL;
471469
arg->hdr_map=&(current.hdr_map);
472470
arg->thread_num=i+1;
473471
/* By default there are some error */
@@ -2062,15 +2060,15 @@ backup_files(void *arg)
20622060
/* backup file */
20632061
if (file->is_datafile&& !file->is_cfs)
20642062
{
2065-
backup_data_file(&(arguments->conn_arg),file,from_fullpath,to_fullpath,
2066-
arguments->prev_start_lsn,
2067-
current.backup_mode,
2068-
instance_config.compress_alg,
2069-
instance_config.compress_level,
2070-
arguments->nodeInfo->checksum_version,
2071-
arguments->nodeInfo->ptrack_version_num,
2072-
arguments->nodeInfo->ptrack_schema,
2073-
arguments->hdr_map, false);
2063+
backup_data_file(file,from_fullpath,to_fullpath,
2064+
arguments->prev_start_lsn,
2065+
current.backup_mode,
2066+
instance_config.compress_alg,
2067+
instance_config.compress_level,
2068+
arguments->nodeInfo->checksum_version,
2069+
arguments->nodeInfo->ptrack_version_num,
2070+
arguments->nodeInfo->ptrack_schema,
2071+
arguments->hdr_map, false);
20742072
}
20752073
else
20762074
{
@@ -2094,10 +2092,6 @@ backup_files(void *arg)
20942092
/* ssh connection to longer needed */
20952093
fio_disconnect();
20962094

2097-
/* Close connection */
2098-
if (arguments->conn_arg.conn)
2099-
pgut_disconnect(arguments->conn_arg.conn);
2100-
21012095
/* Data files transferring is successful */
21022096
arguments->ret=0;
21032097

‎src/data.c‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,7 @@ get_checksum_errormsg(Page page, char **errormsg, BlockNumber absolute_blkno)
276276
* return it to the caller
277277
*/
278278
staticint32
279-
prepare_page(ConnectionArgs*conn_arg,
280-
pgFile*file,XLogRecPtrprev_backup_start_lsn,
279+
prepare_page(pgFile*file,XLogRecPtrprev_backup_start_lsn,
281280
BlockNumberblknum,FILE*in,
282281
BackupModebackup_mode,
283282
Pagepage,boolstrict,
@@ -468,8 +467,7 @@ compress_and_backup_page(pgFile *file, BlockNumber blknum,
468467
* backup with special header.
469468
*/
470469
void
471-
backup_data_file(ConnectionArgs*conn_arg,pgFile*file,
472-
constchar*from_fullpath,constchar*to_fullpath,
470+
backup_data_file(pgFile*file,constchar*from_fullpath,constchar*to_fullpath,
473471
XLogRecPtrprev_backup_start_lsn,BackupModebackup_mode,
474472
CompressAlgcalg,intclevel,uint32checksum_version,
475473
intptrack_version_num,constchar*ptrack_schema,
@@ -551,7 +549,7 @@ backup_data_file(ConnectionArgs* conn_arg, pgFile *file,
551549
else
552550
{
553551
/* TODO: stop handling errors internally */
554-
rc=send_pages(conn_arg,to_fullpath,from_fullpath,file,
552+
rc=send_pages(to_fullpath,from_fullpath,file,
555553
/* send prev backup START_LSN */
556554
(backup_mode==BACKUP_MODE_DIFF_DELTA||backup_mode==BACKUP_MODE_DIFF_PTRACK)&&
557555
file->exists_in_prev ?prev_backup_start_lsn :InvalidXLogRecPtr,
@@ -1500,10 +1498,10 @@ check_data_file(ConnectionArgs *arguments, pgFile *file,
15001498
for (blknum=0;blknum<nblocks;blknum++)
15011499
{
15021500
PageStatepage_st;
1503-
page_state=prepare_page(NULL,file,InvalidXLogRecPtr,
1504-
blknum,in,BACKUP_MODE_FULL,
1505-
curr_page, false,checksum_version,
1506-
0,NULL,from_fullpath,&page_st);
1501+
page_state=prepare_page(file,InvalidXLogRecPtr,
1502+
blknum,in,BACKUP_MODE_FULL,
1503+
curr_page, false,checksum_version,
1504+
0,NULL,from_fullpath,&page_st);
15071505

15081506
if (page_state==PageIsTruncated)
15091507
break;
@@ -1931,7 +1929,7 @@ open_local_file_rw(const char *to_fullpath, char **out_buf, uint32 buf_size)
19311929

19321930
/* backup local file */
19331931
int
1934-
send_pages(ConnectionArgs*conn_arg,constchar*to_fullpath,constchar*from_fullpath,
1932+
send_pages(constchar*to_fullpath,constchar*from_fullpath,
19351933
pgFile*file,XLogRecPtrprev_backup_start_lsn,CompressAlgcalg,intclevel,
19361934
uint32checksum_version,booluse_pagemap,BackupPageHeader2**headers,
19371935
BackupModebackup_mode,intptrack_version_num,constchar*ptrack_schema)
@@ -1989,11 +1987,11 @@ send_pages(ConnectionArgs* conn_arg, const char *to_fullpath, const char *from_f
19891987
while (blknum<file->n_blocks)
19901988
{
19911989
PageStatepage_st;
1992-
intrc=prepare_page(conn_arg,file,prev_backup_start_lsn,
1993-
blknum,in,backup_mode,curr_page,
1994-
true,checksum_version,
1995-
ptrack_version_num,ptrack_schema,
1996-
from_fullpath,&page_st);
1990+
intrc=prepare_page(file,prev_backup_start_lsn,
1991+
blknum,in,backup_mode,curr_page,
1992+
true,checksum_version,
1993+
ptrack_version_num,ptrack_schema,
1994+
from_fullpath,&page_st);
19971995
if (rc==PageIsTruncated)
19981996
break;
19991997

‎src/merge.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1253,7 +1253,7 @@ merge_data_file(parray *parent_chain, pgBackup *full_backup,
12531253
* 2 backups of old versions, where n_blocks is missing.
12541254
*/
12551255

1256-
backup_data_file(NULL,tmp_file,to_fullpath_tmp1,to_fullpath_tmp2,
1256+
backup_data_file(tmp_file,to_fullpath_tmp1,to_fullpath_tmp2,
12571257
InvalidXLogRecPtr,BACKUP_MODE_FULL,
12581258
dest_backup->compress_alg,dest_backup->compress_level,
12591259
dest_backup->checksum_version,0,NULL,

‎src/pg_probackup.h‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,6 @@ typedef struct
588588
parray*external_dirs;
589589
XLogRecPtrprev_start_lsn;
590590

591-
ConnectionArgsconn_arg;
592591
intthread_num;
593592
HeaderMap*hdr_map;
594593

@@ -1062,12 +1061,11 @@ extern void pfilearray_clear_locks(parray *file_list);
10621061
externboolcheck_data_file(ConnectionArgs*arguments,pgFile*file,
10631062
constchar*from_fullpath,uint32checksum_version);
10641063

1065-
externvoidbackup_data_file(ConnectionArgs*conn_arg,pgFile*file,
1066-
constchar*from_fullpath,constchar*to_fullpath,
1067-
XLogRecPtrprev_backup_start_lsn,BackupModebackup_mode,
1068-
CompressAlgcalg,intclevel,uint32checksum_version,
1069-
intptrack_version_num,constchar*ptrack_schema,
1070-
HeaderMap*hdr_map,boolmissing_ok);
1064+
externvoidbackup_data_file(pgFile*file,constchar*from_fullpath,constchar*to_fullpath,
1065+
XLogRecPtrprev_backup_start_lsn,BackupModebackup_mode,
1066+
CompressAlgcalg,intclevel,uint32checksum_version,
1067+
intptrack_version_num,constchar*ptrack_schema,
1068+
HeaderMap*hdr_map,boolmissing_ok);
10711069
externvoidbackup_non_data_file(pgFile*file,pgFile*prev_file,
10721070
constchar*from_fullpath,constchar*to_fullpath,
10731071
BackupModebackup_mode,time_tparent_backup_time,
@@ -1180,7 +1178,7 @@ extern parray * pg_ptrack_get_pagemapset(PGconn *backup_conn, const char *ptrack
11801178
/* open local file to writing */
11811179
externFILE*open_local_file_rw(constchar*to_fullpath,char**out_buf,uint32buf_size);
11821180

1183-
externintsend_pages(ConnectionArgs*conn_arg,constchar*to_fullpath,constchar*from_fullpath,
1181+
externintsend_pages(constchar*to_fullpath,constchar*from_fullpath,
11841182
pgFile*file,XLogRecPtrprev_backup_start_lsn,CompressAlgcalg,intclevel,
11851183
uint32checksum_version,booluse_pagemap,BackupPageHeader2**headers,
11861184
BackupModebackup_mode,intptrack_version_num,constchar*ptrack_schema);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp