lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid that a system crash can clobber the sync state file

Browse Source 
make sure that the new state is committed to disk before overwriting the
old version - by default meta data is committed first, so we may end up
with no valid state at all otherwise.
This commit is contained in:
Oswald Buddenhagen 2012-09-15 13:25:50 +02:00
parent bbf98bb165
commit df6c3b64b7
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/sync.c
View File

@ -33,12 +33,16 @@
#include <errno.h> #include <errno.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifndef _POSIX_SYNCHRONIZED_IO
# define fdatasync fsync
#endif
const char *str_ms[] = { "master", "slave" }, *str_hl[] = { "push", "pull" }; const char *str_ms[] = { "master", "slave" }, *str_hl[] = { "push", "pull" };
void void
Fclose( FILE *f ) Fclose( FILE *f, int safe )
{ {
if (fclose( f ) == EOF) { if ((safe && (fflush( f ) || fdatasync( fileno( f ) ))) || fclose( f ) == EOF) {
sys_error( "Error: cannot close file. Disk full?" ); sys_error( "Error: cannot close file. Disk full?" );
exit( 1 ); exit( 1 );
} }
@ -496,8 +500,8 @@ cancel_done( void *aux )
svars->state[t] |= ST_CANCELED; svars->state[t] |= ST_CANCELED;
if (svars->state[1-t] & ST_CANCELED) { if (svars->state[1-t] & ST_CANCELED) {
if (svars->lfd) { if (svars->lfd) {
Fclose( svars->nfp ); Fclose( svars->nfp, 0 );
Fclose( svars->jfp ); Fclose( svars->jfp, 0 );
sync_bail( svars ); sync_bail( svars );
} else { } else {
sync_bail2( svars ); sync_bail2( svars );
@ -1698,8 +1702,8 @@ box_closed_p2( sync_vars_t *svars, int t )
srec->status & S_EXPIRED ? "X" : "", fbuf ); srec->status & S_EXPIRED ? "X" : "", fbuf );
} }
Fclose( svars->nfp ); Fclose( svars->nfp, 1 );
Fclose( svars->jfp ); Fclose( svars->jfp, 0 );
if (!(DFlags & KEEPJOURNAL)) { if (!(DFlags & KEEPJOURNAL)) {
/* order is important! */ /* order is important! */
rename( svars->nname, svars->dname ); rename( svars->nname, svars->dname );