#ifndef OLD_URECOVERY
char pbuffer[1028];
int flen, fd = -1;
+ afs_int32 epoch, pass;
#endif
/* otherwise, begin interaction */
ubik_dprint("truncate io error=%d\n", code);
goto FetchEndCall;
}
-
+ tversion.counter = 0;
+#endif
/* give invalid label during file transit */
tversion.epoch = 0;
- tversion.counter = 0;
code = (*ubik_dbase->setlabel) (ubik_dbase, file, &tversion);
if (code) {
ubik_dprint("setlabel io error=%d\n", code);
goto FetchEndCall;
}
-#else
+#ifndef OLD_URECOVERY
flen = length;
afs_snprintf(pbuffer, sizeof(pbuffer), "%s.DB0.TMP", ubik_dbase->pathName);
fd = open(pbuffer, O_CREAT | O_RDWR | O_TRUNC, 0600);
while (length > 0) {
tlen = (length > sizeof(tbuffer) ? sizeof(tbuffer) : length);
+#ifndef AFS_PTHREAD_ENV
+ if (pass % 4 == 0)
+ IOMGR_Poll();
+#endif
nbytes = rx_Read(rxcall, tbuffer, tlen);
if (nbytes != tlen) {
ubik_dprint("Rx-read bulk error=%d\n", code = BULK_ERROR);
tlen);
#else
nbytes = write(fd, tbuffer, tlen);
+ pass++;
#endif
if (nbytes != tlen) {
code = UIOERROR;
if (code) {
#ifndef OLD_URECOVERY
unlink(pbuffer);
+ /*
+ * We will effectively invalidate the old data forever now.
+ * Unclear if we *should* but we do.
+ */
#endif
ubik_dbase->version.epoch = 0;
ubik_dbase->version.counter = 0;
code);
} else {
ubik_print("Ubik: Synchronize database completed\n");
+ urecovery_state |= UBIK_RECHAVEDB;
}
udisk_Invalidate(ubik_dbase, 0); /* data has changed */
LWP_NoYieldSignal(&ubik_dbase->version);
#ifndef OLD_URECOVERY
char pbuffer[1028];
int flen, fd = -1;
+ afs_int32 epoch, pass;
#endif
/* send the file back to the requester */
offset = 0;
#ifdef OLD_URECOVERY
(*dbase->truncate) (dbase, file, 0); /* truncate first */
- tversion.epoch = 0; /* start off by labelling in-transit db as invalid */
tversion.counter = 0;
- (*dbase->setlabel) (dbase, file, &tversion); /* setlabel does sync */
#else
+ epoch =
+#endif
+ tversion.epoch = 0; /* start off by labelling in-transit db as invalid */
+ (*dbase->setlabel) (dbase, file, &tversion); /* setlabel does sync */
+#ifndef OLD_URECOVERY
flen = length;
afs_snprintf(pbuffer, sizeof(pbuffer), "%s.DB0.TMP", ubik_dbase->pathName);
fd = open(pbuffer, O_CREAT | O_RDWR | O_TRUNC, 0600);
close(fd);
goto failed;
}
+#else
+ pass = 0;
#endif
memcpy(&ubik_dbase->version, &tversion, sizeof(struct ubik_version));
while (length > 0) {
tlen = (length > sizeof(tbuffer) ? sizeof(tbuffer) : length);
+#if !defined(OLD_URECOVERY) && defined(AFS_PTHREAD_ENV)
+ if (pass % 4 == 0)
+ IOMGR_Poll();
+#endif
code = rx_Read(rxcall, tbuffer, tlen);
if (code != tlen) {
DBRELE(dbase);
code = (*dbase->write) (dbase, file, tbuffer, offset, tlen);
#else
code = write(fd, tbuffer, tlen);
+ pass++;
#endif
if (code != tlen) {
DBRELE(dbase);
if (code) {
#ifndef OLD_URECOVERY
unlink(pbuffer);
+ /* Failed to sync. Allow reads again for now. */
+ tversion.epoch = epoch;
+ (*dbase->setlabel) (dbase, file, &tversion);
#endif
ubik_print
("Ubik: Synchronize database with server %s failed (error = %d)\n",