#include <roken.h>
+#include <assert.h>
+
+#include <afs/opr.h>
+#ifdef AFS_PTHREAD_ENV
+# include <opr/lock.h>
+#else
+# include <opr/lockstub.h>
+#endif
+
#include <lock.h>
#include <rx/xdr.h>
#include <rx/rx.h>
-#include <errno.h>
#include <afs/afsutil.h>
#define UBIK_INTERNALS
return code;
}
DBHOLD(ubik_dbase);
+ if (urecovery_AllBetter(ubik_dbase, 0) == 0) {
+ code = UNOQUORUM;
+ goto out;
+ }
urecovery_CheckTid(atid, 1);
code = udisk_begin(ubik_dbase, UBIK_WRITETRANS, &ubik_currentTrans);
if (!code && ubik_currentTrans) {
ubik_currentTrans->tid.epoch = atid->epoch;
ubik_currentTrans->tid.counter = atid->counter;
}
+ out:
DBRELE(ubik_dbase);
return code;
}
SDISK_Commit(struct rx_call *rxcall, struct ubik_tid *atid)
{
afs_int32 code;
- struct ubik_dbase *dbase;
if ((code = ubik_CheckAuth(rxcall))) {
return code;
}
-
+ ObtainWriteLock(&ubik_dbase->cache_lock);
+ DBHOLD(ubik_dbase);
if (!ubik_currentTrans) {
- return USYNC;
+ code = USYNC;
+ goto done;
}
/*
* sanity check to make sure only write trans appear here
*/
if (ubik_currentTrans->type != UBIK_WRITETRANS) {
- return UBADTYPE;
+ code = UBADTYPE;
+ goto done;
}
- dbase = ubik_currentTrans->dbase;
-
- ObtainWriteLock(&dbase->cache_lock);
-
- DBHOLD(dbase);
-
urecovery_CheckTid(atid, 0);
if (!ubik_currentTrans) {
- DBRELE(dbase);
- ReleaseWriteLock(&dbase->cache_lock);
- return USYNC;
+ code = USYNC;
+ goto done;
}
code = udisk_commit(ubik_currentTrans);
/* sync site should now match */
uvote_set_dbVersion(ubik_dbase->version);
}
- DBRELE(dbase);
- ReleaseWriteLock(&dbase->cache_lock);
+done:
+ DBRELE(ubik_dbase);
+ ReleaseWriteLock(&ubik_dbase->cache_lock);
return code;
}
afs_int32
SDISK_ReleaseLocks(struct rx_call *rxcall, struct ubik_tid *atid)
{
- struct ubik_dbase *dbase;
afs_int32 code;
if ((code = ubik_CheckAuth(rxcall))) {
return code;
}
+ DBHOLD(ubik_dbase);
+
if (!ubik_currentTrans) {
- return USYNC;
+ code = USYNC;
+ goto done;
}
/* sanity check to make sure only write trans appear here */
if (ubik_currentTrans->type != UBIK_WRITETRANS) {
- return UBADTYPE;
+ code = UBADTYPE;
+ goto done;
}
- dbase = ubik_currentTrans->dbase;
- DBHOLD(dbase);
urecovery_CheckTid(atid, 0);
if (!ubik_currentTrans) {
- DBRELE(dbase);
- return USYNC;
+ code = USYNC;
+ goto done;
}
/* If the thread is not waiting for lock - ok to end it */
udisk_end(ubik_currentTrans);
}
ubik_currentTrans = (struct ubik_trans *)0;
- DBRELE(dbase);
- return 0;
+done:
+ DBRELE(ubik_dbase);
+ return code;
}
afs_int32
SDISK_Abort(struct rx_call *rxcall, struct ubik_tid *atid)
{
afs_int32 code;
- struct ubik_dbase *dbase;
if ((code = ubik_CheckAuth(rxcall))) {
return code;
}
-
+ DBHOLD(ubik_dbase);
if (!ubik_currentTrans) {
- return USYNC;
+ code = USYNC;
+ goto done;
}
/* sanity check to make sure only write trans appear here */
if (ubik_currentTrans->type != UBIK_WRITETRANS) {
- return UBADTYPE;
+ code = UBADTYPE;
+ goto done;
}
- dbase = ubik_currentTrans->dbase;
- DBHOLD(dbase);
urecovery_CheckTid(atid, 0);
if (!ubik_currentTrans) {
- DBRELE(dbase);
- return USYNC;
+ code = USYNC;
+ goto done;
}
code = udisk_abort(ubik_currentTrans);
udisk_end(ubik_currentTrans);
}
ubik_currentTrans = (struct ubik_trans *)0;
- DBRELE(dbase);
+done:
+ DBRELE(ubik_dbase);
return code;
}
afs_int32 afile, afs_int32 apos, afs_int32 alen, afs_int32 atype)
{
afs_int32 code;
- struct ubik_dbase *dbase;
struct ubik_trans *ubik_thisTrans;
if ((code = ubik_CheckAuth(rxcall))) {
return code;
}
+ DBHOLD(ubik_dbase);
if (!ubik_currentTrans) {
- return USYNC;
+ code = USYNC;
+ goto done;
}
/* sanity check to make sure only write trans appear here */
if (ubik_currentTrans->type != UBIK_WRITETRANS) {
- return UBADTYPE;
+ code = UBADTYPE;
+ goto done;
}
if (alen != 1) {
- return UBADLOCK;
+ code = UBADLOCK;
+ goto done;
}
- dbase = ubik_currentTrans->dbase;
- DBHOLD(dbase);
urecovery_CheckTid(atid, 0);
if (!ubik_currentTrans) {
- DBRELE(dbase);
- return USYNC;
+ code = USYNC;
+ goto done;
}
ubik_thisTrans = ubik_currentTrans;
udisk_end(ubik_thisTrans);
code = USYNC;
}
-
- DBRELE(dbase);
+done:
+ DBRELE(ubik_dbase);
return code;
}
iovec_wrt *io_vector, iovec_buf *io_buffer)
{
afs_int32 code, i, offset;
- struct ubik_dbase *dbase;
struct ubik_iovec *iovec;
char *iobuf;
if ((code = ubik_CheckAuth(rxcall))) {
return code;
}
+ DBHOLD(ubik_dbase);
if (!ubik_currentTrans) {
- return USYNC;
+ code = USYNC;
+ goto done;
}
/* sanity check to make sure only write trans appear here */
if (ubik_currentTrans->type != UBIK_WRITETRANS) {
- return UBADTYPE;
+ code = UBADTYPE;
+ goto done;
}
- dbase = ubik_currentTrans->dbase;
- DBHOLD(dbase);
urecovery_CheckTid(atid, 0);
if (!ubik_currentTrans) {
- DBRELE(dbase);
- return USYNC;
+ code = USYNC;
+ goto done;
}
iovec = (struct ubik_iovec *)io_vector->iovec_wrt_val;
offset += iovec[i].length;
}
-
- DBRELE(dbase);
+done:
+ DBRELE(ubik_dbase);
return code;
}
afs_int32 afile, afs_int32 apos, bulkdata *adata)
{
afs_int32 code;
- struct ubik_dbase *dbase;
if ((code = ubik_CheckAuth(rxcall))) {
return code;
}
+ DBHOLD(ubik_dbase);
if (!ubik_currentTrans) {
- return USYNC;
+ code = USYNC;
+ goto done;
}
/* sanity check to make sure only write trans appear here */
if (ubik_currentTrans->type != UBIK_WRITETRANS) {
- return UBADTYPE;
+ code = UBADTYPE;
+ goto done;
}
- dbase = ubik_currentTrans->dbase;
- DBHOLD(dbase);
urecovery_CheckTid(atid, 0);
if (!ubik_currentTrans) {
- DBRELE(dbase);
- return USYNC;
+ code = USYNC;
+ goto done;
}
code =
udisk_write(ubik_currentTrans, afile, adata->bulkdata_val, apos,
adata->bulkdata_len);
- DBRELE(dbase);
+done:
+ DBRELE(ubik_dbase);
return code;
}
afs_int32 afile, afs_int32 alen)
{
afs_int32 code;
- struct ubik_dbase *dbase;
if ((code = ubik_CheckAuth(rxcall))) {
return code;
}
+ DBHOLD(ubik_dbase);
if (!ubik_currentTrans) {
- return USYNC;
+ code = USYNC;
+ goto done;
}
/* sanity check to make sure only write trans appear here */
if (ubik_currentTrans->type != UBIK_WRITETRANS) {
- return UBADTYPE;
+ code = UBADTYPE;
+ goto done;
}
- dbase = ubik_currentTrans->dbase;
- DBHOLD(dbase);
urecovery_CheckTid(atid, 0);
if (!ubik_currentTrans) {
- DBRELE(dbase);
- return USYNC;
+ code = USYNC;
+ goto done;
}
code = udisk_truncate(ubik_currentTrans, afile, alen);
- DBRELE(dbase);
+done:
+ DBRELE(ubik_dbase);
return code;
}
* we are not the sync site any more, all write transactions would
* fail with UNOQUORUM anyway.
*/
+ DBHOLD(ubik_dbase);
if (ubeacon_AmSyncSite()) {
+ DBRELE(ubik_dbase);
return UDEADLOCK;
}
- DBHOLD(ubik_dbase);
code = (*ubik_dbase->getlabel) (ubik_dbase, 0, aversion);
DBRELE(ubik_dbase);
if (code) {
if ((code = ubik_CheckAuth(rxcall))) {
return code;
}
-/* temporarily disabled because it causes problems for migration tool. Hey, it's just
- * a sanity check, anyway.
- if (ubeacon_AmSyncSite()) {
- return UDEADLOCK;
- }
-*/
dbase = ubik_dbase;
DBHOLD(dbase);
code = (*dbase->stat) (dbase, file, &ubikstat);
code = rx_Write(rxcall, (char *)&tlen, sizeof(afs_int32));
if (code != sizeof(afs_int32)) {
DBRELE(dbase);
- ubik_dprint("Rx-write length error=%d\n", code);
+ ViceLog(0, ("Rx-write length error=%d\n", code));
return BULK_ERROR;
}
offset = 0;
code = (*dbase->read) (dbase, file, tbuffer, offset, tlen);
if (code != tlen) {
DBRELE(dbase);
- ubik_dprint("read failed error=%d\n", code);
+ ViceLog(0, ("read failed error=%d\n", code));
return UIOERROR;
}
code = rx_Write(rxcall, tbuffer, tlen);
if (code != tlen) {
DBRELE(dbase);
- ubik_dprint("Rx-write length error=%d\n", code);
+ ViceLog(0, ("Rx-write length error=%d\n", code));
return BULK_ERROR;
}
length -= tlen;
/* send the file back to the requester */
dbase = ubik_dbase;
+ pbuffer[0] = '\0';
if ((code = ubik_CheckAuth(rxcall))) {
- DBHOLD(dbase);
- goto failed;
+ return code;
}
/* next, we do a sanity check to see if the guy sending us the database is
otherHost = ubikGetPrimaryInterfaceAddr(rx_HostOf(tpeer));
if (offset && offset != otherHost) {
/* we *know* this is the wrong guy */
- code = USYNC;
- DBHOLD(dbase);
- goto failed;
+ char sync_hoststr[16];
+ ViceLog(0,
+ ("Ubik: Refusing synchronization with server %s since it is not the sync-site (%s).\n",
+ afs_inet_ntoa_r(otherHost, hoststr),
+ afs_inet_ntoa_r(offset, sync_hoststr)));
+ return USYNC;
}
DBHOLD(dbase);
/* abort any active trans that may scribble over the database */
urecovery_AbortAll(dbase);
- ubik_print("Ubik: Synchronize database with server %s\n",
- afs_inet_ntoa_r(otherHost, hoststr));
+ ViceLog(0, ("Ubik: Synchronize database via DISK_SendFile from server %s\n",
+ afs_inet_ntoa_r(otherHost, hoststr)));
offset = 0;
UBIK_VERSION_LOCK;
#endif
code = rx_Read(rxcall, tbuffer, tlen);
if (code != tlen) {
- ubik_dprint("Rx-read length error=%d\n", code);
+ ViceLog(0, ("Rx-read length error=%d\n", code));
code = BULK_ERROR;
close(fd);
goto failed;
code = write(fd, tbuffer, tlen);
pass++;
if (code != tlen) {
- ubik_dprint("write failed error=%d\n", code);
+ ViceLog(0, ("write failed tlen=%d, error=%d\n", tlen, code));
code = UIOERROR;
close(fd);
goto failed;
memcpy(&ubik_dbase->version, avers, sizeof(struct ubik_version));
udisk_Invalidate(dbase, file); /* new dbase, flush disk buffers */
#ifdef AFS_PTHREAD_ENV
- assert(pthread_cond_broadcast(&dbase->version_cond) == 0);
+ opr_Assert(pthread_cond_broadcast(&dbase->version_cond) == 0);
#else
LWP_NoYieldSignal(&dbase->version);
#endif
failed:
if (code) {
- unlink(pbuffer);
+ if (pbuffer[0] != '\0')
+ unlink(pbuffer);
+
/* Failed to sync. Allow reads again for now. */
if (dbase != NULL) {
UBIK_VERSION_LOCK;
(*dbase->setlabel) (dbase, file, &tversion);
UBIK_VERSION_UNLOCK;
}
- ubik_print
- ("Ubik: Synchronize database with server %s failed (error = %d)\n",
- afs_inet_ntoa_r(otherHost, hoststr), code);
+ ViceLog(0, ("Ubik: Synchronize database with server %s failed (error = %d)\n",
+ afs_inet_ntoa_r(otherHost, hoststr), code));
} else {
- ubik_print("Ubik: Synchronize database completed\n");
+ uvote_set_dbVersion(*avers);
+ ViceLog(0, ("Ubik: Synchronize database completed\n"));
}
DBRELE(dbase);
return code;
/* if (probableMatch) */
/* inconsistent addresses in CellServDB */
if (!probableMatch || found) {
- ubik_print("Inconsistent Cell Info from server: ");
+ ViceLog(0, ("Inconsistent Cell Info from server:\n"));
for (i = 0; i < UBIK_MAX_INTERFACE_ADDR && inAddr->hostAddr[i]; i++)
- ubik_print("%s ", afs_inet_ntoa_r(htonl(inAddr->hostAddr[i]), hoststr));
- ubik_print("\n");
+ ViceLog(0, ("... %s\n", afs_inet_ntoa_r(htonl(inAddr->hostAddr[i]), hoststr)));
fflush(stdout);
fflush(stderr);
printServerInfo();
for (i = 1; i < UBIK_MAX_INTERFACE_ADDR; i++)
ts->addr[i] = htonl(inAddr->hostAddr[i]);
- ubik_print("ubik: A Remote Server has addresses: ");
+ ViceLog(0, ("ubik: A Remote Server has addresses:\n"));
for (i = 0; i < UBIK_MAX_INTERFACE_ADDR && ts->addr[i]; i++)
- ubik_print("%s ", afs_inet_ntoa_r(ts->addr[i], hoststr));
- ubik_print("\n");
+ ViceLog(0, ("... %s\n", afs_inet_ntoa_r(ts->addr[i], hoststr)));
UBIK_ADDR_UNLOCK;
+
+ /*
+ * The most likely cause of a DISK_UpdateInterfaceAddr RPC
+ * is because the server was restarted. Reset its state
+ * so that no DISK_Begin RPCs will be issued until the
+ * known database version is current.
+ */
+ UBIK_BEACON_LOCK;
+ ts->beaconSinceDown = 0;
+ ts->currentDB = 0;
+ urecovery_LostServer(ts);
+ UBIK_BEACON_UNLOCK;
return 0;
}
int i, j = 1;
char hoststr[16];
- ubik_print("Local CellServDB:");
+ ViceLog(0, ("Local CellServDB:\n"));
for (ts = ubik_servers; ts; ts = ts->next, j++) {
- ubik_print("Server %d: ", j);
+ ViceLog(0, (" Server %d:\n", j));
for (i = 0; (i < UBIK_MAX_INTERFACE_ADDR) && ts->addr[i]; i++)
- ubik_print("%s ", afs_inet_ntoa_r(ts->addr[i], hoststr));
+ ViceLog(0, (" ... %s\n", afs_inet_ntoa_r(ts->addr[i], hoststr)));
}
- ubik_print("\n");
}
afs_int32
struct ubik_version *newversionp)
{
afs_int32 code = 0;
- struct ubik_dbase *dbase;
if ((code = ubik_CheckAuth(rxcall))) {
return (code);
}
-
+ DBHOLD(ubik_dbase);
if (!ubik_currentTrans) {
- return USYNC;
+ code = USYNC;
+ goto done;
}
/* sanity check to make sure only write trans appear here */
if (ubik_currentTrans->type != UBIK_WRITETRANS) {
- return UBADTYPE;
+ code = UBADTYPE;
+ goto done;
}
/* Should not get this for the sync site */
if (ubeacon_AmSyncSite()) {
- return UDEADLOCK;
+ code = UDEADLOCK;
+ goto done;
}
- dbase = ubik_currentTrans->dbase;
- DBHOLD(dbase);
urecovery_CheckTid(atid, 0);
if (!ubik_currentTrans) {
- DBRELE(dbase);
- return USYNC;
+ code = USYNC;
+ goto done;
}
- /* Set the label if its version matches the sync-site's */
- if (uvote_eq_dbVersion(*oldversionp)) {
+ /* Set the label if our version matches the sync-site's. Also set the label
+ * if our on-disk version matches the old version, and our view of the
+ * sync-site's version matches the new version. This suggests that
+ * ubik_dbVersion was updated while the sync-site was setting the new
+ * version, and it already told us via VOTE_Beacon. */
+ if (uvote_eq_dbVersion(*oldversionp)
+ || (uvote_eq_dbVersion(*newversionp)
+ && vcmp(ubik_dbase->version, *oldversionp) == 0)) {
UBIK_VERSION_LOCK;
- code = (*dbase->setlabel) (ubik_dbase, 0, newversionp);
+ code = (*ubik_dbase->setlabel) (ubik_dbase, 0, newversionp);
if (!code) {
ubik_dbase->version = *newversionp;
uvote_set_dbVersion(*newversionp);
} else {
code = USYNC;
}
-
- DBRELE(dbase);
+done:
+ DBRELE(ubik_dbase);
return code;
}
git://git.openafs.org / openafs.git / blobdiff