#include <roken.h>
-#include <lock.h>
-#include <rx/xdr.h>
+#include <afs/opr.h>
+
+#ifdef AFS_PTHREAD_ENV
+# include <opr/lock.h>
+#else
+# include <opr/lockstub.h>
+#endif
+
#include <rx/rx.h>
#include <afs/afsutil.h>
#include <afs/cellconfig.h>
+
#define UBIK_INTERNALS
#include "ubik.h"
#include "ubik_int.h"
urecovery_ResetState(void)
{
urecovery_state = 0;
-#if !defined(AFS_PTHREAD_ENV)
- /* No corresponding LWP_WaitProcess found anywhere for this -- klm */
- LWP_NoYieldSignal(&urecovery_state);
-#endif
return 0;
}
urecovery_LostServer(struct ubik_server *ts)
{
ubeacon_ReinitServer(ts);
-#if !defined(AFS_PTHREAD_ENV)
- /* No corresponding LWP_WaitProcess found anywhere for this -- klm */
- LWP_NoYieldSignal(&urecovery_state);
-#endif
return 0;
}
{
afs_int32 rcode;
- ubik_dprint_25("allbetter checking\n");
+ ViceLog(25, ("allbetter checking\n"));
rcode = 0;
rcode = 1;
}
- ubik_dprint_25("allbetter: returning %d\n", rcode);
+ ViceLog(25, ("allbetter: returning %d\n", rcode));
return rcode;
}
urecovery_AbortAll(struct ubik_dbase *adbase)
{
struct ubik_trans *tt;
+ int reads = 0, writes = 0;
+
for (tt = adbase->activeTrans; tt; tt = tt->next) {
+ if (tt->type == UBIK_WRITETRANS)
+ writes++;
+ else
+ reads++;
udisk_abort(tt);
}
+ ViceLog(0, ("urecovery_AbortAll: just aborted %d read and %d write transactions\n",
+ reads, writes));
return 0;
}
/* otherwise, skip over the data bytes, too */
tpos += ntohl(buffer[2]) + 3 * sizeof(afs_int32);
} else {
- ubik_print("corrupt log opcode (%d) at position %d\n", opcode,
- tpos);
+ ViceLog(0, ("corrupt log opcode (%d) at position %d\n", opcode,
+ tpos));
break; /* corrupt log! */
}
}
code = (*adbase->setlabel) (adbase, 0, &version);
if (code)
return code;
- ubik_print("Successfully replayed log for interrupted "
+ ViceLog(0, ("Successfully replayed log for interrupted "
"transaction; db version is now %ld.%ld\n",
- (long) version.epoch, (long) version.counter);
+ (long) version.epoch, (long) version.counter));
logIsGood = 1;
break; /* all done now */
} else if (opcode == LOGTRUNCATE) {
len -= thisSize;
}
} else {
- ubik_print("corrupt log opcode (%d) at position %d\n",
- opcode, tpos);
+ ViceLog(0, ("corrupt log opcode (%d) at position %d\n",
+ opcode, tpos));
break; /* corrupt log! */
}
}
if (code)
return code;
} else {
- ubik_print("Log read error on pass 2\n");
+ ViceLog(0, ("Log read error on pass 2\n"));
return UBADLOG;
}
}
adbase->version.counter = 0;
(*adbase->setlabel) (adbase, 0, &adbase->version);
}
-#ifdef AFS_PTHREAD_ENV
- CV_BROADCAST(&adbase->version_cond);
-#else
- LWP_NoYieldSignal(&adbase->version);
-#endif
UBIK_VERSION_UNLOCK;
}
return 0;
void *
urecovery_Interact(void *dummy)
{
- afs_int32 code, tcode;
+ afs_int32 code;
struct ubik_server *bestServer = NULL;
struct ubik_server *ts;
int dbok, doingRPC, now;
IOMGR_Select(0, 0, 0, 0, &tv);
#endif
- ubik_dprint("recovery running in state %x\n", urecovery_state);
+ ViceLog(5, ("recovery running in state %x\n", urecovery_state));
/* Every 30 seconds, check all the down servers and mark them
* as up if they respond. When a server comes up or found to
* most current database, then go find the most current db.
*/
if (!(urecovery_state & UBIK_RECFOUNDDB)) {
+ int okcalls = 0;
DBRELE(ubik_dbase);
bestServer = (struct ubik_server *)0;
bestDBVersion.epoch = 0;
code = DISK_GetVersion(ts->disk_rxcid, &ts->version);
UBIK_ADDR_UNLOCK;
if (code == 0) {
+ okcalls++;
/* perhaps this is the best version */
if (vcmp(ts->version, bestDBVersion) > 0) {
/* new best version */
}
}
}
- /* take into consideration our version. Remember if we,
- * the sync site, have the best version. Also note that
- * we may need to send the best version out.
- */
+
DBHOLD(ubik_dbase);
- if (vcmp(ubik_dbase->version, bestDBVersion) >= 0) {
- bestDBVersion = ubik_dbase->version;
- bestServer = (struct ubik_server *)0;
- urecovery_state |= UBIK_RECHAVEDB;
- } else {
- /* Clear the flag only when we know we have to retrieve
- * the db. Because urecovery_AllBetter() looks at it.
- */
- urecovery_state &= ~UBIK_RECHAVEDB;
- }
- urecovery_state |= UBIK_RECFOUNDDB;
- urecovery_state &= ~UBIK_RECSENTDB;
+
+ if (okcalls + 1 >= ubik_quorum) {
+ /* If we've asked a majority of sites about their db version,
+ * then we can say with confidence that we've found the best db
+ * version. If we haven't contacted most sites (because
+ * GetVersion failed or because we already know the server is
+ * down), then we don't really know if we know about the best
+ * db version. So we can only proceed in here if 'okcalls'
+ * indicates we managed to contact a majority of sites. */
+
+ /* take into consideration our version. Remember if we,
+ * the sync site, have the best version. Also note that
+ * we may need to send the best version out.
+ */
+ if (vcmp(ubik_dbase->version, bestDBVersion) >= 0) {
+ bestDBVersion = ubik_dbase->version;
+ bestServer = (struct ubik_server *)0;
+ urecovery_state |= UBIK_RECHAVEDB;
+ } else {
+ /* Clear the flag only when we know we have to retrieve
+ * the db. Because urecovery_AllBetter() looks at it.
+ */
+ urecovery_state &= ~UBIK_RECHAVEDB;
+ }
+ urecovery_state |= UBIK_RECFOUNDDB;
+ urecovery_state &= ~UBIK_RECSENTDB;
+ }
}
if (!(urecovery_state & UBIK_RECFOUNDDB)) {
DBRELE(ubik_dbase);
UBIK_ADDR_LOCK;
rxcall = rx_NewCall(bestServer->disk_rxcid);
- ubik_print("Ubik: Synchronize database with server %s\n",
- afs_inet_ntoa_r(bestServer->addr[0], hoststr));
+ ViceLog(0, ("Ubik: Synchronize database: receive (via GetFile) "
+ "from server %s begin\n",
+ afs_inet_ntoa_r(bestServer->addr[0], hoststr)));
UBIK_ADDR_UNLOCK;
code = StartDISK_GetFile(rxcall, file);
if (code) {
- ubik_dprint("StartDiskGetFile failed=%d\n", code);
+ ViceLog(0, ("StartDiskGetFile failed=%d\n", code));
goto FetchEndCall;
}
nbytes = rx_Read(rxcall, (char *)&length, sizeof(afs_int32));
length = ntohl(length);
if (nbytes != sizeof(afs_int32)) {
- ubik_dprint("Rx-read length error=%d\n", code = BULK_ERROR);
+ ViceLog(0, ("Rx-read length error=%d\n", BULK_ERROR));
code = EIO;
goto FetchEndCall;
}
code = (*ubik_dbase->setlabel) (ubik_dbase, file, &tversion);
UBIK_VERSION_UNLOCK;
if (code) {
- ubik_dprint("setlabel io error=%d\n", code);
+ ViceLog(0, ("setlabel io error=%d\n", code));
goto FetchEndCall;
}
snprintf(pbuffer, sizeof(pbuffer), "%s.DB%s%d.TMP",
#endif
nbytes = rx_Read(rxcall, tbuffer, tlen);
if (nbytes != tlen) {
- ubik_dprint("Rx-read bulk error=%d\n", code = BULK_ERROR);
+ ViceLog(0, ("Rx-read bulk error=%d\n", BULK_ERROR));
code = EIO;
close(fd);
goto FetchEndCall;
goto FetchEndCall;
code = EndDISK_GetFile(rxcall, &tversion);
FetchEndCall:
- tcode = rx_EndCall(rxcall, code);
- if (!code)
- code = tcode;
+ code = rx_EndCall(rxcall, code);
if (!code) {
/* we got a new file, set up its header */
urecovery_state |= UBIK_RECHAVEDB;
ubik_dbase->version.epoch = 0;
ubik_dbase->version.counter = 0;
UBIK_VERSION_UNLOCK;
- ubik_print("Ubik: Synchronize database failed (error = %d)\n",
- code);
+ ViceLog(0,
+ ("Ubik: Synchronize database: receive (via GetFile) "
+ "from server %s failed (error = %d)\n",
+ afs_inet_ntoa_r(bestServer->addr[0], hoststr), code));
} else {
- ubik_print("Ubik: Synchronize database completed\n");
+ ViceLog(0,
+ ("Ubik: Synchronize database: receive (via GetFile) "
+ "from server %s complete, version: %d.%d\n",
+ afs_inet_ntoa_r(bestServer->addr[0], hoststr),
+ ubik_dbase->version.epoch, ubik_dbase->version.counter));
+
urecovery_state |= UBIK_RECHAVEDB;
}
udisk_Invalidate(ubik_dbase, 0); /* data has changed */
-#ifdef AFS_PTHREAD_ENV
- CV_BROADCAST(&ubik_dbase->version_cond);
-#else
- LWP_NoYieldSignal(&ubik_dbase->version);
-#endif
}
if (!(urecovery_state & UBIK_RECHAVEDB)) {
DBRELE(ubik_dbase);
if (ubik_dbase->version.epoch == 1) {
urecovery_AbortAll(ubik_dbase);
UBIK_VERSION_LOCK;
- version_globals.ubik_epochTime = 2;
- ubik_dbase->version.epoch = version_globals.ubik_epochTime;
+ ubik_dbase->version.epoch = 2;
ubik_dbase->version.counter = 1;
code =
(*ubik_dbase->setlabel) (ubik_dbase, 0, &ubik_dbase->version);
UBIK_VERSION_UNLOCK;
udisk_Invalidate(ubik_dbase, 0); /* data may have changed */
-#ifdef AFS_PTHREAD_ENV
- CV_BROADCAST(&ubik_dbase->version_cond);
-#else
- LWP_NoYieldSignal(&ubik_dbase->version);
-#endif
}
/* Check the other sites and send the database to them if they
UBIK_BEACON_LOCK;
if (!ts->up) {
UBIK_BEACON_UNLOCK;
- ubik_dprint("recovery cannot send version to %s\n",
- afs_inet_ntoa_r(inAddr.s_addr, hoststr));
+ /* It would be nice to have this message at loglevel
+ * 0 as well, but it will log once every 4s for each
+ * down server while in this recovery state. This
+ * should only be changed to loglevel 0 if it is
+ * also rate-limited.
+ */
+ ViceLog(5, ("recovery cannot send version to %s\n",
+ afs_inet_ntoa_r(inAddr.s_addr, hoststr)));
dbok = 0;
continue;
}
UBIK_BEACON_UNLOCK;
- ubik_dprint("recovery sending version to %s\n",
- afs_inet_ntoa_r(inAddr.s_addr, hoststr));
+
if (vcmp(ts->version, ubik_dbase->version) != 0) {
- ubik_dprint("recovery stating local database\n");
+ ViceLog(0, ("Synchronize database: send (via SendFile) "
+ "to server %s begin\n",
+ afs_inet_ntoa_r(inAddr.s_addr, hoststr)));
/* Rx code to do the Bulk Store */
code = (*ubik_dbase->stat) (ubik_dbase, 0, &ubikstat);
StartDISK_SendFile(rxcall, file, length,
&ubik_dbase->version);
if (code) {
- ubik_dprint("StartDiskSendFile failed=%d\n",
- code);
+ ViceLog(0, ("StartDiskSendFile failed=%d\n",
+ code));
goto StoreEndCall;
}
while (length > 0) {
(*ubik_dbase->read) (ubik_dbase, file,
tbuffer, offset, tlen);
if (nbytes != tlen) {
- ubik_dprint("Local disk read error=%d\n",
- code = UIOERROR);
+ code = UIOERROR;
+ ViceLog(0, ("Local disk read error=%d\n", code));
goto StoreEndCall;
}
nbytes = rx_Write(rxcall, tbuffer, tlen);
if (nbytes != tlen) {
- ubik_dprint("Rx-write bulk error=%d\n", code =
- BULK_ERROR);
+ code = BULK_ERROR;
+ ViceLog(0, ("Rx-write bulk error=%d\n", code));
goto StoreEndCall;
}
offset += tlen;
StoreEndCall:
code = rx_EndCall(rxcall, code);
}
+
if (code == 0) {
/* we set a new file, process its header */
ts->version = ubik_dbase->version;
ts->currentDB = 1;
- } else
+ ViceLog(0,
+ ("Ubik: Synchronize database: send (via SendFile) "
+ "to server %s complete, version: %d.%d\n",
+ afs_inet_ntoa_r(inAddr.s_addr, hoststr),
+ ts->version.epoch, ts->version.counter));
+
+ } else {
dbok = 0;
+ ViceLog(0,
+ ("Ubik: Synchronize database: send (via SendFile) "
+ "to server %s failed (error = %d)\n",
+ afs_inet_ntoa_r(inAddr.s_addr, hoststr), code));
+ }
} else {
/* mark file up to date */
ts->currentDB = 1;
}
DBRELE(ubik_dbase);
}
- return NULL;
+ AFS_UNREACHED(return(NULL));
}
/*!
{
struct rx_connection *conns[UBIK_MAX_INTERFACE_ADDR];
struct rx_connection *connSuccess = 0;
- int i, j, success_i = -1;
+ int i, nconns, success_i = -1;
afs_uint32 addr;
char buffer[32];
char hoststr[16];
UBIK_ADDR_LOCK;
- for (i = 0; (addr = server->addr[i]) && (i < UBIK_MAX_INTERFACE_ADDR);
+ for (i = 0; (i < UBIK_MAX_INTERFACE_ADDR) && (addr = server->addr[i]);
i++) {
conns[i] =
rx_NewConnection(addr, ubik_callPortal, DISK_SERVICE_ID,
}
}
UBIK_ADDR_UNLOCK;
- osi_Assert(i); /* at least one interface address for this server */
+ nconns = i;
+ opr_Assert(nconns); /* at least one interface address for this server */
- multi_Rx(conns, i) {
+ multi_Rx(conns, nconns) {
multi_DISK_Probe();
if (!multi_error) { /* first success */
success_i = multi_i;
connSuccess = conns[success_i];
strcpy(buffer, afs_inet_ntoa_r(server->addr[0], hoststr));
- ubik_print("ubik:server %s is back up: will be contacted through %s\n",
- buffer, afs_inet_ntoa_r(addr, hoststr));
+ ViceLog(0, ("ubik:server %s is back up: will be contacted through %s\n",
+ buffer, afs_inet_ntoa_r(addr, hoststr)));
UBIK_ADDR_UNLOCK;
}
/* Destroy all connections except the one on which we succeeded */
- for (j = 0; j < i; j++)
- if (conns[j] != connSuccess)
- rx_DestroyConnection(conns[j]);
+ for (i = 0; i < nconns; i++)
+ if (conns[i] != connSuccess)
+ rx_DestroyConnection(conns[i]);
if (!connSuccess)
- ubik_dprint("ubik:server %s still down\n",
- afs_inet_ntoa_r(server->addr[0], hoststr));
+ ViceLog(5, ("ubik:server %s still down\n",
+ afs_inet_ntoa_r(server->addr[0], hoststr)));
if (connSuccess)
return 0; /* success */
git://git.openafs.org / openafs.git / blobdiff