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

Commit9b5f9b8

Browse files
committed
[Issue#90] Refactoring
1 parent080988b commit9b5f9b8

File tree

2 files changed

+44
-41
lines changed

2 files changed

+44
-41
lines changed

‎src/archive.c‎

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,10 @@ push_wal_file(const char *from_path, const char *to_path, bool is_compress,
143143
charto_path_temp[MAXPGPATH];
144144
interrno_temp;
145145
/* partial handling */
146-
intpartial_timeout=0;
147-
intpartial_size=0;
148146
structstatst;
149-
boolpartial_exists= false;
147+
intpartial_file_timeout=0;
148+
intpartial_file_size=0;
149+
boolpartial_file_exists= false;
150150

151151
#ifdefHAVE_LIBZ
152152
chargz_to_path[MAXPGPATH];
@@ -186,7 +186,7 @@ push_wal_file(const char *from_path, const char *to_path, bool is_compress,
186186
gz_out=fio_gzopen(to_path_temp,PG_BINARY_W,instance_config.compress_level,FIO_BACKUP_HOST);
187187
if (gz_out==NULL)
188188
{
189-
partial_exists= true;
189+
partial_file_exists= true;
190190
elog(WARNING,"Cannot open destination temporary WAL file \"%s\": %s",
191191
to_path_temp,strerror(errno));
192192
}
@@ -199,63 +199,65 @@ push_wal_file(const char *from_path, const char *to_path, bool is_compress,
199199
out=fio_open(to_path_temp,O_RDWR |O_CREAT |O_EXCL |PG_BINARY,FIO_BACKUP_HOST);
200200
if (out<0)
201201
{
202-
partial_exists= true;
202+
partial_file_exists= true;
203203
elog(WARNING,"Cannot open destination temporary WAL file \"%s\": %s",
204204
to_path_temp,strerror(errno));
205205
}
206206
}
207207

208-
/* sleep a second, check if .partial file size is changing, if not, then goto p1
209-
* Algorihtm is not pretty however we do not expect conflict for '.partial' file
210-
* to be frequent occurrence.
211-
* The main goal is to protect against failed archive-push which left behind
212-
* orphan '.partial' file.
208+
/* Partial file is already exists, it could have happened due to failed archive-push,
209+
* in this case partial file can be discarded, or due to concurrent archiving.
210+
*
211+
* Our main goal here is to try to handle partial file to prevent stalling of
212+
* continious archiving.
213+
* To ensure that ecncountered partial file is actually a stale "orphaned" file,
214+
* check its size every second.
215+
* If the size has not changed in PARTIAL_WAL_TIMER seconds, we can consider
216+
* the file stale and reuse it.
217+
* If file size is changing, it means that another archiver works at the same
218+
* directory with the same files. Such partial files cannot be reused.
213219
*/
214-
if (partial_exists)
220+
if (partial_file_exists)
215221
{
216-
while (1)
222+
while (partial_file_timeout<PARTIAL_WAL_TIMER)
217223
{
218-
/* exit from loop */
219-
if (partial_timeout>10)
220-
{
221-
/* For 10 second the file didn`t changed its size, so consider it stale and reuse it */
222-
elog(WARNING,"Reusing stale destination temporary WAL file \"%s\"",to_path_temp);
223-
fio_unlink(to_path_temp,FIO_BACKUP_HOST);
224-
225-
#ifdefHAVE_LIBZ
226-
if (is_compress)
227-
{
228-
gz_out=fio_gzopen(to_path_temp,PG_BINARY_W,instance_config.compress_level,FIO_BACKUP_HOST);
229-
if (gz_out==NULL)
230-
elog(ERROR,"Cannot open destination temporary WAL file \"%s\": %s",
231-
to_path_temp,strerror(errno));
232-
}
233-
else
234-
#endif
235-
{
236-
out=fio_open(to_path_temp,O_RDWR |O_CREAT |O_EXCL |PG_BINARY,FIO_BACKUP_HOST);
237-
if (out<0)
238-
elog(ERROR,"Cannot open destination temporary WAL file \"%s\": %s",
239-
to_path_temp,strerror(errno));
240-
}
241-
break;
242-
}
243224

244225
if (fio_stat(to_path_temp,&st, false,FIO_BACKUP_HOST)<0)
245226
/* It is ok if partial is gone, we can safely error out */
246227
elog(ERROR,"Cannot stat destination temporary WAL file \"%s\": %s",to_path_temp,
247228
strerror(errno));
248229

249230
/* first round */
250-
if (!partial_timeout)
251-
partial_size=st.st_size;
231+
if (!partial_file_timeout)
232+
partial_file_size=st.st_size;
252233

253234
/* file size is changing */
254-
if (st.st_size>partial_size)
235+
if (st.st_size>partial_file_size)
255236
elog(ERROR,"Destination temporary WAL file \"%s\" is not stale",to_path_temp);
256237

257238
sleep(1);
258-
partial_timeout++;
239+
partial_file_timeout++;
240+
}
241+
242+
/* Partial segment is considered stale, so reuse it */
243+
elog(WARNING,"Reusing stale destination temporary WAL file \"%s\"",to_path_temp);
244+
fio_unlink(to_path_temp,FIO_BACKUP_HOST);
245+
246+
#ifdefHAVE_LIBZ
247+
if (is_compress)
248+
{
249+
gz_out=fio_gzopen(to_path_temp,PG_BINARY_W,instance_config.compress_level,FIO_BACKUP_HOST);
250+
if (gz_out==NULL)
251+
elog(ERROR,"Cannot open destination temporary WAL file \"%s\": %s",
252+
to_path_temp,strerror(errno));
253+
}
254+
else
255+
#endif
256+
{
257+
out=fio_open(to_path_temp,O_RDWR |O_CREAT |O_EXCL |PG_BINARY,FIO_BACKUP_HOST);
258+
if (out<0)
259+
elog(ERROR,"Cannot open destination temporary WAL file \"%s\": %s",
260+
to_path_temp,strerror(errno));
259261
}
260262
}
261263

‎src/pg_probackup.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ extern const char *PROGRAM_EMAIL;
6363
#defineEXTERNAL_DIR"external_directories/externaldir"
6464

6565
/* Timeout defaults */
66+
#definePARTIAL_WAL_TIMER60
6667
#defineARCHIVE_TIMEOUT_DEFAULT300
6768
#defineREPLICA_TIMEOUT_DEFAULT300
6869

0 commit comments

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