From dae5b59337674304495b3f9f678088c317f002c5 Mon Sep 17 00:00:00 2001 From: Marc Dionne Date: Sat, 29 Jan 2011 12:31:24 -0500 Subject: [PATCH] ubik: remove unused OLD_URECOVERY code OLD_URECOVERY is never defined and only serves to preserve unused code. Change-Id: Iefc0fcfd177fa134a74cee05b0b45e6bf075ad1c Reviewed-on: http://gerrit.openafs.org/3969 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/ubik/recovery.c | 29 ----------------------------- src/ubik/remote.c | 28 ++-------------------------- 2 files changed, 2 insertions(+), 55 deletions(-) diff --git a/src/ubik/recovery.c b/src/ubik/recovery.c index cc5d951c9..3ce383feb 100644 --- a/src/ubik/recovery.c +++ b/src/ubik/recovery.c @@ -468,11 +468,9 @@ urecovery_Interact(void *dummy) struct ubik_stat ubikstat; struct in_addr inAddr; char hoststr[16]; -#ifndef OLD_URECOVERY char pbuffer[1028]; int fd = -1; afs_int32 pass; -#endif /* otherwise, begin interaction */ urecovery_state = 0; @@ -611,15 +609,6 @@ urecovery_Interact(void *dummy) goto FetchEndCall; } -#ifdef OLD_URECOVERY - /* Truncate the file first */ - code = (*ubik_dbase->truncate) (ubik_dbase, file, 0); - if (code) { - ubik_dprint("truncate io error=%d\n", code); - goto FetchEndCall; - } - tversion.counter = 0; -#endif /* give invalid label during file transit */ tversion.epoch = 0; code = (*ubik_dbase->setlabel) (ubik_dbase, file, &tversion); @@ -627,7 +616,6 @@ urecovery_Interact(void *dummy) ubik_dprint("setlabel io error=%d\n", code); goto FetchEndCall; } -#ifndef OLD_URECOVERY afs_snprintf(pbuffer, sizeof(pbuffer), "%s.DB%s%d.TMP", ubik_dbase->pathName, (file<0)?"SYS":"", (file<0)?-file:file); fd = open(pbuffer, O_CREAT | O_RDWR | O_TRUNC, 0600); if (fd < 0) { @@ -639,7 +627,6 @@ urecovery_Interact(void *dummy) close(fd); goto FetchEndCall; } -#endif pass = 0; while (length > 0) { @@ -655,14 +642,8 @@ urecovery_Interact(void *dummy) close(fd); goto FetchEndCall; } -#ifdef OLD_URECOVERY - nbytes = - (*ubik_dbase->write) (ubik_dbase, file, tbuffer, offset, - tlen); -#else nbytes = write(fd, tbuffer, tlen); pass++; -#endif if (nbytes != tlen) { code = UIOERROR; close(fd); @@ -671,11 +652,9 @@ urecovery_Interact(void *dummy) offset += tlen; length -= tlen; } -#ifndef OLD_URECOVERY code = close(fd); if (code) goto FetchEndCall; -#endif code = EndDISK_GetFile(rxcall, &tversion); FetchEndCall: tcode = rx_EndCall(rxcall, code); @@ -686,9 +665,6 @@ urecovery_Interact(void *dummy) urecovery_state |= UBIK_RECHAVEDB; memcpy(&ubik_dbase->version, &tversion, sizeof(struct ubik_version)); -#ifdef OLD_URECOVERY - (*ubik_dbase->sync) (ubik_dbase, 0); /* get data out first */ -#else afs_snprintf(tbuffer, sizeof(tbuffer), "%s.DB%s%d", ubik_dbase->pathName, (file<0)?"SYS":"", (file<0)?-file:file); #ifdef AFS_NT40_ENV afs_snprintf(pbuffer, sizeof(pbuffer), "%s.DB%s%d.OLD", ubik_dbase->pathName, (file<0)?"SYS":"", (file<0)?-file:file); @@ -701,27 +677,22 @@ urecovery_Interact(void *dummy) code = rename(pbuffer, tbuffer); if (!code) { (*ubik_dbase->open) (ubik_dbase, file); -#endif /* after data is good, sync disk with correct label */ code = (*ubik_dbase->setlabel) (ubik_dbase, 0, &ubik_dbase->version); -#ifndef OLD_URECOVERY } #ifdef AFS_NT40_ENV afs_snprintf(pbuffer, sizeof(pbuffer), "%s.DB%s%d.OLD", ubik_dbase->pathName, (file<0)?"SYS":"", (file<0)?-file:file); unlink(pbuffer); -#endif #endif } 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; ubik_print("Ubik: Synchronize database failed (error = %d)\n", diff --git a/src/ubik/remote.c b/src/ubik/remote.c index a6ca567a3..a256a8a49 100644 --- a/src/ubik/remote.c +++ b/src/ubik/remote.c @@ -475,12 +475,10 @@ SDISK_SendFile(struct rx_call *rxcall, afs_int32 file, struct rx_connection *tconn; afs_uint32 otherHost = 0; char hoststr[16]; -#ifndef OLD_URECOVERY char pbuffer[1028]; int fd = -1; afs_int32 epoch = 0; afs_int32 pass; -#endif /* send the file back to the requester */ @@ -518,15 +516,8 @@ SDISK_SendFile(struct rx_call *rxcall, afs_int32 file, afs_inet_ntoa_r(otherHost, hoststr)); offset = 0; -#ifdef OLD_URECOVERY - (*dbase->truncate) (dbase, file, 0); /* truncate first */ - tversion.counter = 0; -#else - epoch = -#endif - tversion.epoch = 0; /* start off by labelling in-transit db as invalid */ + epoch = tversion.epoch = 0; /* start off by labelling in-transit db as invalid */ (*dbase->setlabel) (dbase, file, &tversion); /* setlabel does sync */ -#ifndef OLD_URECOVERY afs_snprintf(pbuffer, sizeof(pbuffer), "%s.DB%s%d.TMP", ubik_dbase->pathName, (file<0)?"SYS":"", (file<0)?-file:file); fd = open(pbuffer, O_CREAT | O_RDWR | O_TRUNC, 0600); if (fd < 0) { @@ -539,11 +530,10 @@ SDISK_SendFile(struct rx_call *rxcall, afs_int32 file, goto failed; } 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 !defined(AFS_PTHREAD_ENV) if (pass % 4 == 0) IOMGR_Poll(); #endif @@ -555,12 +545,8 @@ SDISK_SendFile(struct rx_call *rxcall, afs_int32 file, close(fd); goto failed; } -#ifdef OLD_URECOVERY - code = (*dbase->write) (dbase, file, tbuffer, offset, tlen); -#else code = write(fd, tbuffer, tlen); pass++; -#endif if (code != tlen) { DBRELE(dbase); ubik_dprint("write failed error=%d\n", code); @@ -571,17 +557,12 @@ SDISK_SendFile(struct rx_call *rxcall, afs_int32 file, offset += tlen; length -= tlen; } -#ifndef OLD_URECOVERY code = close(fd); if (code) goto failed; -#endif /* sync data first, then write label and resync (resync done by setlabel call). * This way, good label is only on good database. */ -#ifdef OLD_URECOVERY - (*ubik_dbase->sync) (dbase, file); -#else afs_snprintf(tbuffer, sizeof(tbuffer), "%s.DB%s%d", ubik_dbase->pathName, (file<0)?"SYS":"", (file<0)?-file:file); #ifdef AFS_NT40_ENV afs_snprintf(pbuffer, sizeof(pbuffer), "%s.DB%s%d.OLD", ubik_dbase->pathName, (file<0)?"SYS":"", (file<0)?-file:file); @@ -594,14 +575,11 @@ SDISK_SendFile(struct rx_call *rxcall, afs_int32 file, code = rename(pbuffer, tbuffer); if (!code) { (*ubik_dbase->open) (ubik_dbase, file); -#endif code = (*ubik_dbase->setlabel) (dbase, file, avers); -#ifndef OLD_URECOVERY } #ifdef AFS_NT40_ENV afs_snprintf(pbuffer, sizeof(pbuffer), "%s.DB%s%d.OLD", ubik_dbase->pathName, (file<0)?"SYS":"", (file<0)?-file:file); unlink(pbuffer); -#endif #endif memcpy(&ubik_dbase->version, avers, sizeof(struct ubik_version)); udisk_Invalidate(dbase, file); /* new dbase, flush disk buffers */ @@ -613,14 +591,12 @@ SDISK_SendFile(struct rx_call *rxcall, afs_int32 file, DBRELE(dbase); failed: if (code) { -#ifndef OLD_URECOVERY unlink(pbuffer); /* Failed to sync. Allow reads again for now. */ if (dbase != NULL) { tversion.epoch = epoch; (*dbase->setlabel) (dbase, file, &tversion); } -#endif ubik_print ("Ubik: Synchronize database with server %s failed (error = %d)\n", afs_inet_ntoa_r(otherHost, hoststr), code); -- 2.39.5