lock the sync state open the journal before opening the master. this is
a bit ugly for the "SyncState *" case, as we have to create a directory without making it a maildir right away. however, this makes the code quite a bit simpler to understand and simpler to parallelize.
This commit is contained in:
parent
7726ce3e0f
commit
bc39f10a1e
69
src/sync.c
69
src/sync.c
|
@ -394,6 +394,18 @@ sync_boxes( store_t *ctx[], const char *names[], channel_conf_t *chan )
|
||||||
}
|
}
|
||||||
free( csname );
|
free( csname );
|
||||||
}
|
}
|
||||||
|
if (!(s = strrchr( dname, '/' ))) {
|
||||||
|
fprintf( stderr, "Error: invalid SyncState '%s'\n", dname );
|
||||||
|
free( dname );
|
||||||
|
return SYNC_BAD(S);
|
||||||
|
}
|
||||||
|
*s = 0;
|
||||||
|
if (mkdir( dname, 0700 ) && errno != EEXIST) {
|
||||||
|
fprintf( stderr, "Error: cannot create SyncState directory '%s': %s\n", dname, strerror(errno) );
|
||||||
|
free( dname );
|
||||||
|
return SYNC_BAD(S);
|
||||||
|
}
|
||||||
|
*s = '/';
|
||||||
nfasprintf( &jname, "%s.journal", dname );
|
nfasprintf( &jname, "%s.journal", dname );
|
||||||
nfasprintf( &nname, "%s.new", dname );
|
nfasprintf( &nname, "%s.new", dname );
|
||||||
nfasprintf( &lname, "%s.lock", dname );
|
nfasprintf( &lname, "%s.lock", dname );
|
||||||
|
@ -405,18 +417,12 @@ sync_boxes( store_t *ctx[], const char *names[], channel_conf_t *chan )
|
||||||
#if F_WRLCK != 0
|
#if F_WRLCK != 0
|
||||||
lck.l_type = F_WRLCK;
|
lck.l_type = F_WRLCK;
|
||||||
#endif
|
#endif
|
||||||
line = 0;
|
|
||||||
if ((lfd = open( lname, O_WRONLY|O_CREAT, 0666 )) < 0) {
|
if ((lfd = open( lname, O_WRONLY|O_CREAT, 0666 )) < 0) {
|
||||||
if (errno != ENOENT) {
|
fprintf( stderr, "Error: cannot create lock file %s: %s\n", lname, strerror(errno) );
|
||||||
lferr:
|
ret = SYNC_FAIL;
|
||||||
fprintf( stderr, "Error: cannot create lock file %s: %s\n", lname, strerror(errno) );
|
goto bail2;
|
||||||
ret = SYNC_FAIL;
|
|
||||||
goto bail2;
|
|
||||||
}
|
|
||||||
goto skiprd;
|
|
||||||
}
|
}
|
||||||
if (fcntl( lfd, F_SETLK, &lck )) {
|
if (fcntl( lfd, F_SETLK, &lck )) {
|
||||||
lckerr:
|
|
||||||
fprintf( stderr, "Error: channel :%s:%s-:%s:%s is locked\n",
|
fprintf( stderr, "Error: channel :%s:%s-:%s:%s is locked\n",
|
||||||
chan->stores[M]->name, ctx[M]->name, chan->stores[S]->name, ctx[S]->name );
|
chan->stores[M]->name, ctx[M]->name, chan->stores[S]->name, ctx[S]->name );
|
||||||
ret = SYNC_FAIL;
|
ret = SYNC_FAIL;
|
||||||
|
@ -477,6 +483,7 @@ sync_boxes( store_t *ctx[], const char *names[], channel_conf_t *chan )
|
||||||
goto bail;
|
goto bail;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
line = 0;
|
||||||
if ((jfp = fopen( jname, "r" ))) {
|
if ((jfp = fopen( jname, "r" ))) {
|
||||||
if (!stat( nname, &st ) && fgets( buf, sizeof(buf), jfp )) {
|
if (!stat( nname, &st ) && fgets( buf, sizeof(buf), jfp )) {
|
||||||
debug( "recovering journal ...\n" );
|
debug( "recovering journal ...\n" );
|
||||||
|
@ -618,7 +625,20 @@ sync_boxes( store_t *ctx[], const char *names[], channel_conf_t *chan )
|
||||||
goto bail;
|
goto bail;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
skiprd:
|
if (!(nfp = fopen( nname, "w" ))) {
|
||||||
|
fprintf( stderr, "Error: cannot write new sync state %s\n", nname );
|
||||||
|
ret = SYNC_FAIL;
|
||||||
|
goto bail;
|
||||||
|
}
|
||||||
|
if (!(jfp = fopen( jname, "a" ))) {
|
||||||
|
fprintf( stderr, "Error: cannot write journal %s\n", jname );
|
||||||
|
fclose( nfp );
|
||||||
|
ret = SYNC_FAIL;
|
||||||
|
goto bail;
|
||||||
|
}
|
||||||
|
setlinebuf( jfp );
|
||||||
|
if (!line)
|
||||||
|
Fprintf( jfp, JOURNAL_VERSION "\n" );
|
||||||
|
|
||||||
opts[M] = opts[S] = 0;
|
opts[M] = opts[S] = 0;
|
||||||
for (t = 0; t < 2; t++) {
|
for (t = 0; t < 2; t++) {
|
||||||
|
@ -687,35 +707,9 @@ sync_boxes( store_t *ctx[], const char *names[], channel_conf_t *chan )
|
||||||
if (suidval && suidval != ctx[S]->uidvalidity) {
|
if (suidval && suidval != ctx[S]->uidvalidity) {
|
||||||
fprintf( stderr, "Error: UIDVALIDITY of slave changed\n" );
|
fprintf( stderr, "Error: UIDVALIDITY of slave changed\n" );
|
||||||
ret = SYNC_FAIL;
|
ret = SYNC_FAIL;
|
||||||
goto bail;
|
goto finish;
|
||||||
}
|
}
|
||||||
info( "%d messages, %d recent\n", ctx[S]->count, ctx[S]->recent );
|
info( "%d messages, %d recent\n", ctx[S]->count, ctx[S]->recent );
|
||||||
|
|
||||||
s = strrchr( dname, '/' );
|
|
||||||
*s = 0;
|
|
||||||
mkdir( dname, 0700 );
|
|
||||||
*s = '/';
|
|
||||||
if (lfd < 0) {
|
|
||||||
if ((lfd = open( lname, O_WRONLY|O_CREAT, 0666 )) < 0)
|
|
||||||
goto lferr;
|
|
||||||
if (fcntl( lfd, F_SETLK, &lck ))
|
|
||||||
goto lckerr;
|
|
||||||
}
|
|
||||||
if (!(nfp = fopen( nname, "w" ))) {
|
|
||||||
fprintf( stderr, "Error: cannot write new sync state %s\n", nname );
|
|
||||||
ret = SYNC_FAIL;
|
|
||||||
goto bail;
|
|
||||||
}
|
|
||||||
if (!(jfp = fopen( jname, "a" ))) {
|
|
||||||
fprintf( stderr, "Error: cannot write journal %s\n", jname );
|
|
||||||
fclose( nfp );
|
|
||||||
ret = SYNC_FAIL;
|
|
||||||
goto bail;
|
|
||||||
}
|
|
||||||
setlinebuf( jfp );
|
|
||||||
if (!line)
|
|
||||||
Fprintf( jfp, JOURNAL_VERSION "\n" );
|
|
||||||
|
|
||||||
if ((ret = findmsgs( recs, ctx, S, line ? jfp : 0 )) != SYNC_OK)
|
if ((ret = findmsgs( recs, ctx, S, line ? jfp : 0 )) != SYNC_OK)
|
||||||
goto finish;
|
goto finish;
|
||||||
|
|
||||||
|
@ -799,7 +793,6 @@ sync_boxes( store_t *ctx[], const char *names[], channel_conf_t *chan )
|
||||||
goto finish;
|
goto finish;
|
||||||
}
|
}
|
||||||
info( "%d messages, %d recent\n", ctx[M]->count, ctx[M]->recent );
|
info( "%d messages, %d recent\n", ctx[M]->count, ctx[M]->recent );
|
||||||
|
|
||||||
if ((ret = findmsgs( recs, ctx, M, line ? jfp : 0 )) != SYNC_OK)
|
if ((ret = findmsgs( recs, ctx, M, line ? jfp : 0 )) != SYNC_OK)
|
||||||
goto finish;
|
goto finish;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user