#include <lock.h>
#include <afs/stds.h>
+#include <rx/rx_queue.h>
#include <rx/xdr.h>
#include <rx/rx.h>
#include <rx/rx_globals.h>
#define COMMONPARMS cmd_Seek(ts, 12);\
cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell name");\
+cmd_AddParmAlias(ts, 12, "-c"); /* original -cell option */ \
cmd_AddParm(ts, "-noauth", CMD_FLAG, CMD_OPTIONAL, "don't authenticate");\
cmd_AddParm(ts, "-localauth",CMD_FLAG,CMD_OPTIONAL,"use server tickets");\
cmd_AddParm(ts, "-verbose", CMD_FLAG, CMD_OPTIONAL, "verbose");\
{
struct tqElem *elem;
- elem = (struct tqElem *)malloc(sizeof(struct tqElem));
+ elem = malloc(sizeof(struct tqElem));
elem->next = ahead->next;
elem->volid = volid;
ahead->next = elem;
return 0;
}
/*
- * Parse a server name/address and return the address in network byte order
+ * Parse a server name/address and return a non-loopback address in network byte order
*/
afs_uint32
GetServer(char *aname)
afs_uint32 addr; /* in network byte order */
afs_int32 code;
char hostname[MAXHOSTCHARS];
+ int i;
- if ((addr = GetServerNoresolve(aname)) == 0) {
- th = gethostbyname(aname);
- if (!th)
+ addr = GetServerNoresolve(aname);
+ if (addr != 0) {
+ if (!rx_IsLoopbackAddr(ntohl(addr)))
+ return addr;
+ else
return 0;
- memcpy(&addr, th->h_addr, sizeof(addr));
}
- if (rx_IsLoopbackAddr(ntohl(addr))) { /* local host */
+ th = gethostbyname(aname);
+ if (th != NULL) {
+ for (i=0; i < th->h_length; i++) {
+ if (!rx_IsLoopbackAddr(ntohl(*(afs_uint32 *)th->h_addr_list[i]))) {
+ memcpy(&addr, th->h_addr_list[i], sizeof(addr));
+ return addr;
+ }
+ }
+
+ /*
+ * If we reach this point all of the addresses returned by
+ * gethostbyname() are loopback addresses. We assume that means
+ * that the name is supposed to describe the machine this code
+ * is executing on. Try gethostname() to and check to see if
+ * that name can provide us a non-loopback address.
+ */
code = gethostname(hostname, MAXHOSTCHARS);
- if (code)
- return 0;
- th = gethostbyname(hostname);
- if (!th)
- return 0;
- memcpy(&addr, th->h_addr, sizeof(addr));
+ if (code == 0) {
+ th = gethostbyname(hostname);
+ if (th != NULL) {
+ for (i=0; i < th->h_length; i++) {
+ if (!rx_IsLoopbackAddr(ntohl(*(afs_uint32 *)th->h_addr_list[i]))) {
+ memcpy(&addr, th->h_addr_list[i], sizeof(addr));
+ return addr;
+ }
+ }
+ }
+ }
}
- return (addr);
+ /*
+ * No non-loopback address could be obtained for 'aname'.
+ */
+ return 0;
}
afs_int32
{
char *buffer = (char *)0;
afs_int32 error = 0;
- int done = 0;
afs_uint32 nbytes;
- buffer = (char *)malloc(blksize);
+ buffer = malloc(blksize);
if (!buffer) {
fprintf(STDERR, "malloc failed\n");
return -1;
}
- while (!error && !done) {
-#ifndef AFS_NT40_ENV /* NT csn't select on non-socket fd's */
+ while (!error) {
+#if !defined(AFS_NT40_ENV) && !defined(AFS_PTHREAD_ENV)
+ /* Only for this for non-NT, non-pthread. For NT, we can't select on
+ * non-socket FDs. For pthread environments, we don't need to select at
+ * all, since the following read() will block. */
fd_set in;
FD_ZERO(&in);
FD_SET((intptr_t)(ufd->handle), &in);
/* don't timeout if read blocks */
-#if defined(AFS_PTHREAD_ENV)
- select(((intptr_t)(ufd->handle)) + 1, &in, 0, 0, 0);
-#else
IOMGR_Select(((intptr_t)(ufd->handle)) + 1, &in, 0, 0, 0);
#endif
-#endif
error = USD_READ(ufd, buffer, blksize, &nbytes);
if (error) {
fprintf(STDERR, "File system read failed: %s\n",
afs_error_message(error));
break;
}
- if (nbytes == 0) {
- done = 1;
+
+ if (nbytes == 0)
break;
- }
+
if (rx_Write(call, buffer, nbytes) != nbytes) {
error = -1;
break;
afs_uint32 bytesleft, w;
afs_int32 error = 0;
- buffer = (char *)malloc(blksize);
+ buffer = malloc(blksize);
if (!buffer) {
fprintf(STDERR, "memory allocation failed\n");
ERROR_EXIT(-1);
while ((bytesread = rx_Read(call, buffer, blksize)) > 0) {
for (bytesleft = bytesread; bytesleft; bytesleft -= w) {
-#ifndef AFS_NT40_ENV /* NT csn't select on non-socket fd's */
+#if !defined(AFS_NT40_ENV) && !defined(AFS_PTHREAD_ENV)
+ /* Only for this for non-NT, non-pthread. For NT, we can't select
+ * on non-socket FDs. For pthread environments, we don't need to
+ * select at all, since the following write() will block. */
fd_set out;
FD_ZERO(&out);
FD_SET((intptr_t)(ufd->handle), &out);
/* don't timeout if write blocks */
-#if defined(AFS_PTHREAD_ENV)
- select(((intptr_t)(ufd->handle)) + 1, &out, 0, 0, 0);
-#else
IOMGR_Select(((intptr_t)(ufd->handle)) + 1, 0, &out, 0, 0);
#endif
-#endif
error =
USD_WRITE(ufd, &buffer[bytesread - bytesleft], bytesleft, &w);
if (error) {
afs_uint32 aserver;
afs_int32 apart;
int previdx = -1;
+ int have_field = 0;
volid = vsu_GetVolumeID(as->parms[0].items->data, cstruct, &err); /* -id */
if (volid == 0) {
if (as->parms[1].items) {
/* -max <quota> */
+ have_field = 1;
code = util_GetHumanInt32(as->parms[1].items->data, &info.maxquota);
if (code) {
fprintf(STDERR, "invalid quota value\n");
}
if (as->parms[2].items) {
/* -clearuse */
+ have_field = 1;
info.dayUse = 0;
}
if (as->parms[3].items) {
/* -clearVolUpCounter */
+ have_field = 1;
info.spare2 = 0;
}
+ if (!have_field) {
+ fprintf(STDERR,"Nothing to set.\n");
+ return (1);
+ }
code = UV_SetVolumeInfo(aserver, apart, volid, &info);
if (code)
fprintf(STDERR,
afs_uint32 avolid;
afs_uint32 aserver;
afs_int32 apart, vtype, code, err;
- int force = 0;
- int stayUp = 0;
+ int flags = 0;
+
+ if (as->parms[1].items) /* -force */
+ flags |= (REL_COMPLETE | REL_FULLDUMPS);
+ if (as->parms[2].items) /* -stayonline */
+ flags |= REL_STAYUP;
+ if (as->parms[3].items) /* -force-reclone */
+ flags |= REL_COMPLETE;
- if (as->parms[1].items)
- force = 1;
- if (as->parms[2].items)
- stayUp = 1;
avolid = vsu_GetVolumeID(as->parms[0].items->data, cstruct, &err);
if (avolid == 0) {
if (err)
return E2BIG;
}
- code = UV_ReleaseVolume(avolid, aserver, apart, force, stayUp);
+ code = UV_ReleaseVolume(avolid, aserver, apart, flags);
if (code) {
PrintDiagnostics("release", code);
ListVLDB(struct cmd_syndesc *as, void *arock)
{
afs_int32 apart;
- afs_uint32 aserver;
afs_int32 code;
afs_int32 vcode;
struct VldbListByAttributes attributes;
int quiet, sort, lock;
afs_int32 thisindex, nextindex;
- aserver = 0;
apart = 0;
attributes.Mask = 0;
/* Server specified */
if (as->parms[1].items) {
+ afs_uint32 aserver;
+
aserver = GetServer(as->parms[1].items->data);
if (aserver == 0) {
fprintf(STDERR, "vos: server '%s' not found in host table\n",
} else {
/* Grow the tarray to keep the extra entries */
parraysize = (centries * sizeof(struct nvldbentry));
- ttarray =
- (struct nvldbentry *)realloc(tarray,
- tarraysize + parraysize);
+ ttarray = realloc(tarray, tarraysize + parraysize);
if (!ttarray) {
fprintf(STDERR,
"Could not allocate enough space for the VLDB entries\n");
afs_uint32 volid;
afs_uint32 server;
afs_int32 code, i, same;
- struct nvldbentry entry, storeEntry;
+ struct nvldbentry entry;
afs_int32 vcode;
- afs_int32 rwindex = 0;
afs_uint32 rwserver = 0;
afs_int32 rwpartition = 0;
- afs_int32 roindex = 0;
afs_uint32 roserver = 0;
afs_int32 ropartition = 0;
int force = 0;
- struct rx_connection *aconn;
int c, dc;
server = GetServer(as->parms[0].items->data);
if (as->parms[3].items)
force = 1;
+ memset(&entry, 0, sizeof(entry));
vcode = VLDB_GetEntryByID(volid, -1, &entry);
if (vcode) {
fprintf(STDERR,
}
/* use RO volid even if user specified RW or BK volid */
-
if (volid != entry.volumeId[ROVOL])
volid = entry.volumeId[ROVOL];
MapHostToNetwork(&entry);
for (i = 0; i < entry.nServers; i++) {
if (entry.serverFlags[i] & ITSRWVOL) {
- rwindex = i;
rwserver = entry.serverNumber[i];
rwpartition = entry.serverPartition[i];
if (roserver)
return ENOENT;
}
if (same) {
- roindex = i;
roserver = entry.serverNumber[i];
ropartition = entry.serverPartition[i];
if (rwserver)
if (!roserver) {
fprintf(STDERR, "Warning: RO volume didn't exist in vldb!\n");
}
- if (ropartition != partition) {
+ if (roserver && (ropartition != partition)) {
fprintf(STDERR,
"Warning: RO volume should be in partition %d instead of %d (vldb)\n",
ropartition, partition);
}
}
- vcode =
- ubik_VL_SetLock(cstruct, 0, entry.volumeId[RWVOL], RWVOL,
- VLOP_MOVE);
- aconn = UV_Bind(server, AFSCONF_VOLUMEPORT);
- code = AFSVolConvertROtoRWvolume(aconn, partition, volid);
- if (code) {
- fprintf(STDERR,
- "Converting RO volume %lu to RW volume failed with code %d\n",
- (unsigned long)volid, code);
- PrintError("convertROtoRW ", code);
- return -1;
- }
- entry.serverFlags[roindex] = ITSRWVOL;
- entry.flags |= RW_EXISTS;
- entry.flags &= ~BACK_EXISTS;
- if (rwserver) {
- (entry.nServers)--;
- if (rwindex != entry.nServers) {
- entry.serverNumber[rwindex] = entry.serverNumber[entry.nServers];
- entry.serverPartition[rwindex] =
- entry.serverPartition[entry.nServers];
- entry.serverFlags[rwindex] = entry.serverFlags[entry.nServers];
- entry.serverNumber[entry.nServers] = 0;
- entry.serverPartition[entry.nServers] = 0;
- entry.serverFlags[entry.nServers] = 0;
- }
- }
- entry.flags &= ~RO_EXISTS;
- for (i = 0; i < entry.nServers; i++) {
- if (entry.serverFlags[i] & ITSROVOL) {
- if (!(entry.serverFlags[i] & (RO_DONTUSE | NEW_REPSITE)))
- entry.flags |= RO_EXISTS;
- }
- }
- MapNetworkToHost(&entry, &storeEntry);
- code =
- VLDB_ReplaceEntry(entry.volumeId[RWVOL], RWVOL, &storeEntry,
- (LOCKREL_OPCODE | LOCKREL_AFSID |
- LOCKREL_TIMESTAMP));
- if (code) {
- fprintf(STDERR,
- "Warning: volume converted, but vldb update failed with code %d!\n",
- code);
- }
- vcode = UV_LockRelease(entry.volumeId[RWVOL]);
- if (vcode) {
- PrintDiagnostics("unlock", vcode);
- }
+ code = UV_ConvertRO(server, partition, volid, &entry);
+
return code;
}
ts = cmd_CreateSyntax("release", ReleaseVolume, NULL, "release a volume");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
cmd_AddParm(ts, "-force", CMD_FLAG, CMD_OPTIONAL,
- "force a complete release");
+ "force a complete release and full dumps");
+ cmd_AddParmAlias(ts, 1, "-f"); /* original force option */
cmd_AddParm(ts, "-stayonline", CMD_FLAG, CMD_OPTIONAL,
"release to cloned temp vol, then clone back to repsite RO");
+ cmd_AddParm(ts, "-force-reclone", CMD_FLAG, CMD_OPTIONAL,
+ "force a reclone and complete release with incremental dumps");
COMMONPARMS;
ts = cmd_CreateSyntax("dump", DumpVolumeCmd, NULL, "dump a volume");
"machine readable format");
COMMONPARMS;
cmd_CreateAlias(ts, "volinfo");
+ cmd_CreateAlias(ts, "e");
ts = cmd_CreateSyntax("setfields", SetFields, NULL,
"change volume info fields");
git://git.openafs.org / openafs.git / blobdiff