#endif
/* Local Prototypes */
-int PrintDiagnostics(char *astring, afs_int32 acode);
-int GetVolumeInfo(afs_uint32 volid, afs_uint32 *server, afs_int32 *part,
- afs_int32 *voltype, struct nvldbentry *rentry);
+static int PrintDiagnostics(char *astring, afs_int32 acode);
+static int GetVolumeInfo(afs_uint32 volid, afs_uint32 *server, afs_int32 *part,
+ afs_int32 *voltype, struct nvldbentry *rentry);
struct tqElem {
afs_uint32 volid;
struct tqElem *next;
};
-#define COMMONPARMS cmd_Seek(ts, 12);\
-cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell name");\
-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");\
-cmd_AddParm(ts, "-encrypt", CMD_FLAG, CMD_OPTIONAL, "encrypt commands");\
-cmd_AddParm(ts, "-noresolve", CMD_FLAG, CMD_OPTIONAL, "don't resolve addresses"); \
-cmd_AddParm(ts, "-config", CMD_SINGLE, CMD_OPTIONAL, "config location"); \
+enum {
+ COMMONPARM_OFFSET_CELL = 25,
+ COMMONPARM_OFFSET_NOAUTH = 26,
+ COMMONPARM_OFFSET_LOCALAUTH = 27,
+ COMMONPARM_OFFSET_VERBOSE = 28,
+ COMMONPARM_OFFSET_ENCRYPT = 29,
+ COMMONPARM_OFFSET_NORESOLVE = 30,
+ COMMONPARM_OFFSET_CONFIG = 31,
+ COMMONPARM_OFFSET_RXGK = 32,
+};
+
+#define COMMONPARMS \
+cmd_AddParmAtOffset(ts, COMMONPARM_OFFSET_CELL, \
+ "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell name");\
+cmd_AddParmAlias(ts, COMMONPARM_OFFSET_CELL, "-c"); /* original -cell option */ \
+cmd_AddParmAtOffset(ts, COMMONPARM_OFFSET_NOAUTH, \
+ "-noauth", CMD_FLAG, CMD_OPTIONAL, "don't authenticate");\
+cmd_AddParmAtOffset(ts, COMMONPARM_OFFSET_LOCALAUTH, \
+ "-localauth",CMD_FLAG,CMD_OPTIONAL,"use server tickets");\
+cmd_AddParmAtOffset(ts, COMMONPARM_OFFSET_VERBOSE, \
+ "-verbose", CMD_FLAG, CMD_OPTIONAL, "verbose");\
+cmd_AddParmAtOffset(ts, COMMONPARM_OFFSET_ENCRYPT, \
+ "-encrypt", CMD_FLAG, CMD_OPTIONAL, "encrypt commands");\
+cmd_AddParmAtOffset(ts, COMMONPARM_OFFSET_NORESOLVE, \
+ "-noresolve", CMD_FLAG, CMD_OPTIONAL, "don't resolve addresses"); \
+cmd_AddParmAtOffset(ts, COMMONPARM_OFFSET_CONFIG, \
+ "-config", CMD_SINGLE, CMD_OPTIONAL, "config location"); \
+cmd_AddParmAtOffset(ts, COMMONPARM_OFFSET_RXGK, \
+ "-rxgk", CMD_SINGLE, CMD_OPTIONAL, "rxgk security level to use"); \
#define ERROR_EXIT(code) do { \
error = (code); \
return;
}
-
static void
qPut(struct tqHead *ahead, afs_uint32 volid)
{
{
size_t total;
-
total = strlen(name);
if (!strcmp(&name[total - 9], ".readonly")) {
return 0;
return result;
}
-
/*
* Parse a server dotted address and return the address in network byte order
*/
-afs_uint32
+static afs_uint32
GetServerNoresolve(char *aname)
{
int b1, b2, b3, b4;
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
+static afs_uint32
GetServer(char *aname)
{
struct hostent *th;
afs_uint32 addr; /* in network byte order */
afs_int32 code;
char hostname[MAXHOSTCHARS];
+ afs_uint32 **addr_list;
+ 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 && th->h_addrtype == AF_INET) {
+ addr_list = (afs_uint32 **)th->h_addr_list;
+ for(i = 0; addr_list[i] != NULL; i++) {
+ if (!rx_IsLoopbackAddr(ntohl(*addr_list[i]))) {
+ memcpy(&addr, 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 && th->h_addrtype == AF_INET) {
+ addr_list = (afs_uint32 **)th->h_addr_list;
+ for (i=0; addr_list[i] != NULL; i++) {
+ if (!rx_IsLoopbackAddr(ntohl(*addr_list[i]))) {
+ memcpy(&addr, addr_list[i], sizeof(addr));
+ return addr;
+ }
+ }
+ }
+ }
}
- return (addr);
-}
-
-afs_int32
-GetVolumeType(char *aname)
-{
-
- if (!strcmp(aname, "ro"))
- return (ROVOL);
- else if (!strcmp(aname, "rw"))
- return (RWVOL);
- else if (!strcmp(aname, "bk"))
- return (BACKVOL);
- else
- return (-1);
+ /*
+ * No non-loopback address could be obtained for 'aname'.
+ */
+ return 0;
}
-int
+static int
IsPartValid(afs_int32 partId, afs_uint32 server, afs_int32 *code)
{
struct partList dummyPartList;
return success;
}
-
-
/*sends the contents of file associated with <fd> and <blksize> to Rx Stream
* associated with <call> */
-int
+static int
SendFile(usd_handle_t ufd, struct rx_call *call, long blksize)
{
char *buffer = (char *)0;
afs_int32 error = 0;
- int done = 0;
afs_uint32 nbytes;
buffer = malloc(blksize);
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));
+ afs_error_message(error));
break;
}
- if (nbytes == 0) {
- done = 1;
+
+ if (nbytes == 0)
break;
- }
+
if (rx_Write(call, buffer, nbytes) != nbytes) {
error = -1;
break;
/* function invoked by UV_RestoreVolume, reads the data from rx_trx_stream and
* writes it out to the volume. */
-afs_int32
+static afs_int32
WriteData(struct rx_call *call, void *rock)
{
char *filename = (char *) rock;
}
if (code) {
fprintf(STDERR, "Could not access file '%s': %s\n", filename,
- afs_error_message(code));
+ afs_error_message(code));
error = VOLSERBADOP;
goto wfail;
}
/* Receive data from <call> stream into file associated
* with <fd> <blksize>
*/
-int
+static int
ReceiveFile(usd_handle_t ufd, struct rx_call *call, long blksize)
{
char *buffer = NULL;
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) {
fprintf(STDERR, "File system write failed: %s\n",
- afs_error_message(error));
+ afs_error_message(error));
ERROR_EXIT(-1);
}
}
return (error);
}
-afs_int32
+static afs_int32
DumpFunction(struct rx_call *call, void *rock)
{
char *filename = (char *)rock;
}
if (code) {
fprintf(STDERR, "Could not create file '%s': %s\n", filename,
- afs_error_message(code));
+ afs_error_message(code));
ERROR_EXIT(VOLSERBADOP);
}
}
* Volume's status is OK - all the fields are valid.
*/
- static long server_cache = -1, partition_cache = -1;
- static char hostname[256], address[32], pname[16];
- int i,ai[] = {VOLINT_STATS_TIME_IDX_0,VOLINT_STATS_TIME_IDX_1,VOLINT_STATS_TIME_IDX_2,
- VOLINT_STATS_TIME_IDX_3,VOLINT_STATS_TIME_IDX_4,VOLINT_STATS_TIME_IDX_5};
+ static long server_cache = -1, partition_cache = -1;
+ static char hostname[256], address[32], pname[16];
+ int i,ai[] = {VOLINT_STATS_TIME_IDX_0,VOLINT_STATS_TIME_IDX_1,VOLINT_STATS_TIME_IDX_2,
+ VOLINT_STATS_TIME_IDX_3,VOLINT_STATS_TIME_IDX_4,VOLINT_STATS_TIME_IDX_5};
if (a_servID != server_cache) {
struct in_addr s;
fprintf(STDOUT, "id\t\t%lu\n", afs_printable_uint32_lu(a_xInfoP->volid));
fprintf(STDOUT, "serv\t\t%s\t%s\n", address, hostname);
fprintf(STDOUT, "part\t\t%s\n", pname);
- fprintf(STDOUT, "status\t\tOK\n");
+ fprintf(STDOUT, "status\t\tOK\n");
fprintf(STDOUT, "backupID\t%lu\n",
afs_printable_uint32_lu(a_xInfoP->backupID));
fprintf(STDOUT, "parentID\t%lu\n",
fprintf(STDOUT, "filecount\t%u\n", a_xInfoP->filecount);
fprintf(STDOUT, "dayUse\t\t%u\n", a_xInfoP->dayUse);
-
-
fprintf(STDOUT,"reads_same_net\t%8d\n",a_xInfoP->stat_reads[VOLINT_STATS_SAME_NET]);
fprintf(STDOUT,"reads_same_net_auth\t%8d\n",a_xInfoP->stat_reads[VOLINT_STATS_SAME_NET_AUTH]);
fprintf(STDOUT,"reads_diff_net\t%8d\n",a_xInfoP->stat_reads[VOLINT_STATS_DIFF_NET]);
fprintf(STDOUT, "inUse\t%d\n",a_xInfoP->inUse);
if (a_xInfoP->inUse == 1)
- (*a_totalOKP)++;
+ (*a_totalOKP)++;
else
(*a_totalNotOKP)++;
}
if (pntr->status == VOK)
- fprintf(STDOUT, "name\t\t%s\n", pntr->name);
+ fprintf(STDOUT, "name\t\t%s\n", pntr->name);
fprintf(STDOUT, "id\t\t%lu\n",
afs_printable_uint32_lu(pntr->volid));
} /*XDisplayVolumes2 */
-
-/* set <server> and <part> to the correct values depending on
- * <voltype> and <entry> */
-static void
+/**
+ * Retrieve the sites (i.e., server id, partition id) from a vldb entry for a
+ * given volume type. May be called repeatedly to get each read-only site.
+ *
+ * @param[in] entry vldb entry from a previous vldb query
+ * @param[in] voltype type of volume of interest (rw, ro, bk)
+ * @param[out] server vldb entry server number for voltype
+ * @param[out] part vldb part id for voltype
+ * @param[inout] previdx cursor; should be initialized to -1
+ * before first call on a given entry.
+ *
+ * @returns true when a volume site has been found
+ */
+static int
GetServerAndPart(struct nvldbentry *entry, int voltype, afs_uint32 *server,
afs_int32 *part, int *previdx)
{
int i, istart, vtype;
- *server = -1;
- *part = -1;
-
- /* Doesn't check for non-existance of backup volume */
+ /* Doesn't check for non-existence of backup volume */
if ((voltype == RWVOL) || (voltype == BACKVOL)) {
- vtype = ITSRWVOL;
- istart = 0; /* seach the entire entry */
+ vtype = VLSF_RWVOL;
+ istart = 0; /* search the entire entry */
} else {
- vtype = ITSROVOL;
- /* Seach from beginning of entry or pick up where we left off */
+ vtype = VLSF_ROVOL;
+ /* Search from beginning of entry or pick up where we left off */
istart = ((*previdx < 0) ? 0 : *previdx + 1);
}
*server = entry->serverNumber[i];
*part = entry->serverPartition[i];
*previdx = i;
- return;
+ return 1;
}
}
- /* Didn't find any, return -1 */
+ /* Didn't find any more, reset index. */
*previdx = -1;
- return;
+ return 0;
}
static void
return code;
}
-
/*------------------------------------------------------------------------
* PRIVATE ExamineVolume
*
* It its a BK vol, get the RW entry (even if VLDB may say the BK doen't exist).
* If its a RO vol, get the next RO entry.
*/
- GetServerAndPart(&entry, ((voltype == ROVOL) ? ROVOL : RWVOL),
- &aserver, &apart, &previdx);
- if (previdx == -1) { /* searched all entries */
- if (!foundentry) {
- fprintf(STDERR, "Volume %s does not exist in VLDB\n\n",
- as->parms[0].items->data);
- error = ENOENT;
- }
+ foundentry = GetServerAndPart(&entry, ((voltype == ROVOL) ? ROVOL : RWVOL),
+ &aserver, &apart, &previdx);
+ if (!foundentry) { /* searched all entries */
+ fprintf(STDERR, "Volume %s does not exist in VLDB\n\n",
+ as->parms[0].items->data);
+ error = ENOENT;
break;
}
- foundentry = 1;
/* Get information about the volume from the server */
if (verbose) {
if (code) {
error = code;
if (code == ENODEV) {
- if ((voltype == BACKVOL) && !(entry.flags & BACK_EXISTS)) {
+ if ((voltype == BACKVOL) && !(entry.flags & VLF_BACKEXISTS)) {
/* The VLDB says there is no backup volume and its not on disk */
fprintf(STDERR, "Volume %s does not exist\n",
as->parms[0].items->data);
} else
VolumeStats_int(pntr, &entry, aserver, apart, voltype);
- if ((voltype == BACKVOL) && !(entry.flags & BACK_EXISTS)) {
+ if ((voltype == BACKVOL) && !(entry.flags & VLF_BACKEXISTS)) {
/* The VLDB says there is no backup volume yet we found one on disk */
fprintf(STDERR, "Volume %s does not exist in VLDB\n",
as->parms[0].items->data);
afs_uint32 aserver;
afs_int32 apart;
int previdx = -1;
+ int have_field = 0;
+ int found;
volid = vsu_GetVolumeID(as->parms[0].items->data, cstruct, &err); /* -id */
if (volid == 0) {
}
MapHostToNetwork(&entry);
- GetServerAndPart(&entry, RWVOL, &aserver, &apart, &previdx);
- if (previdx == -1) {
+ found = GetServerAndPart(&entry, RWVOL, &aserver, &apart, &previdx);
+ if (!found) {
fprintf(STDERR, "Volume %s does not exist in VLDB\n\n",
as->parms[0].items->data);
return (ENOENT);
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,
return 0;
}
-#if 0
-static afs_int32
-DeleteAll(struct nvldbentry *entry)
-{
- int i;
- afs_int32 error, code, curserver, curpart;
- afs_uint32 volid;
-
- MapHostToNetwork(entry);
- error = 0;
- for (i = 0; i < entry->nServers; i++) {
- curserver = entry->serverNumber[i];
- curpart = entry->serverPartition[i];
- if (entry->serverFlags[i] & ITSROVOL) {
- volid = entry->volumeId[ROVOL];
- } else {
- volid = entry->volumeId[RWVOL];
- }
- code = UV_DeleteVolume(curserver, curpart, volid);
- if (code && !error)
- error = code;
- }
- return error;
-}
-#endif
-
static int
DeleteVolume(struct cmd_syndesc *as, void *arock)
{
char pname[10];
afs_int32 idx, j;
+ if (as->parms[1].items && !as->parms[0].items) {
+ fprintf(STDERR, "vos: The -partition option requires the -server option.\n");
+ return EINVAL;
+ }
+
if (as->parms[0].items) {
server = GetServer(as->parms[0].items->data);
if (!server) {
return (code);
}
- if (((volid == entry.volumeId[RWVOL]) && (entry.flags & RW_EXISTS))
+ if (((volid == entry.volumeId[RWVOL]) && (entry.flags & VLF_RWEXISTS))
|| ((volid == entry.volumeId[BACKVOL])
- && (entry.flags & BACK_EXISTS))) {
+ && (entry.flags & VLF_BACKEXISTS))) {
idx = Lp_GetRwIndex(&entry);
if ((idx == -1) || (server && (server != entry.serverNumber[idx]))
|| ((partition != -1)
return ENOENT;
}
} else if ((volid == entry.volumeId[ROVOL])
- && (entry.flags & RO_EXISTS)) {
+ && (entry.flags & VLF_ROEXISTS)) {
for (idx = -1, j = 0; j < entry.nServers; j++) {
- if (entry.serverFlags[j] != ITSROVOL)
+ if (!(entry.serverFlags[j] & VLSF_ROVOL))
continue;
if (((server == 0) || (server == entry.serverNumber[j]))
partition = entry.serverPartition[idx];
}
-
code = UV_DeleteVolume(server, partition, volid);
if (code) {
PrintDiagnostics("remove", code);
return 0;
}
-
static int
ShadowVolume(struct cmd_syndesc *as, void *arock)
{
return 0;
}
-
static int
CloneVolume(struct cmd_syndesc *as, void *arock)
{
"vos : partition %s does not exist on the server\n",
as->parms[2].items->data);
return ENOENT;
- }
+ }
} else {
code = GetVolumeInfo(volid, &server, &part, &voltype, &entry);
if (code)
volname, VOLSER_OLDMAXVOLNAME - 1);
return E2BIG;
}
-#if 0
- /*
- * In order that you be able to make clones of RO or BK, this
- * check must be omitted.
- */
- if (!VolNameOK(volname)) {
- fprintf(STDERR,
- "Illegal volume name %s, should not end in .readonly or .backup\n",
- volname);
- return EINVAL;
- }
-#endif
if (IsNumeric(volname)) {
fprintf(STDERR,
"Illegal volume name %s, should not be a number\n",
if (as->parms[6].items) flags |= RV_RDONLY;
if (as->parms[7].items) flags |= RV_RWONLY;
-
code =
UV_CloneVolume(server, part, volid, cloneid, volname, flags);
return 0;
}
-
static int
BackupVolume(struct cmd_syndesc *as, void *arock)
{
/* is there a backup volume already? */
- if (entry.flags & BACK_EXISTS) {
+ if (entry.flags & VLF_BACKEXISTS) {
/* yep, where is it? */
buvolid = entry.volumeId[BACKVOL];
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 */
+ fprintf(STDERR, "vos: -stayonline not supported\n");
+ return EINVAL;
+ }
+ 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);
&& entry.volumeId[voltype] != avolid) {
avolid = entry.volumeId[voltype];
}
- aparentid = entry.volumeId[RWVOL];
+ aparentid = entry.volumeId[RWVOL];
}
else { /* volume exists - do we do a full incremental or abort */
&& entry.volumeId[voltype] != avolid) {
avolid = entry.volumeId[voltype];
}
- aparentid = entry.volumeId[RWVOL];
+ aparentid = entry.volumeId[RWVOL];
/* A file name was specified - check if volume is on another partition */
vcode = GetVolumeInfo(avolid, &Oserver, &Opart, &Otype, &Oentry);
restoreflags |= RV_NODEL;
}
-
code =
UV_RestoreVolume2(aserver, apart, avolid, aparentid,
- avolname, restoreflags, WriteData, afilename);
+ avolname, restoreflags, WriteData, afilename);
if (code) {
PrintDiagnostics("restore", code);
exit(1);
}
MapPartIdIntoName(apart, apartName);
- /*
- * patch typo here - originally "parms[1]", should be "parms[0]"
- */
-
fprintf(STDOUT, "Restored volume %s on %s %s\n", avolname,
as->parms[0].items->data, apartName);
return 0;
as->parms[1].items->data);
exit(1);
}
-/*
- *skip the partition validity check, since it is possible that the partition
- *has since been decomissioned.
- */
-/*
- if (!IsPartValid(apart,aserver,&code)){
- if(code) PrintError("",code);
- else fprintf(STDERR,"vos : partition %s does not exist on the server\n",as->parms[1].items->data);
- exit(1);
- }
-*/
+ /*
+ * The partition validity check is skipped, since it is possible that the
+ * partition has already been decomissioned.
+ */
+
code = UV_RemoveSite(aserver, apart, avolid);
if (code) {
PrintDiagnostics("remsite", code);
exit(1);
}
-
code = UV_ListPartitions(aserver, &dummyPartList, &cnt);
if (code) {
PrintDiagnostics("listpart", code);
afs_uint32 tserver;
tserver = 0;
+
+ if (as->parms[1].items && !as->parms[0].items) {
+ fprintf(STDERR, "vos: The -partition option requires the -server option.\n");
+ exit(1);
+ }
+
if (as->parms[0].items) {
tserver = GetServer(as->parms[0].items->data);
if (!tserver) {
exit(1);
}
flags = 1;
-
- if (!tserver) {
- fprintf(STDERR,
- "The -partition option requires a -server option\n");
- exit(1);
- }
}
if (as->parms[3].items) {
}
flags = 1;
} else {
- pnum = -1;
+ pnum = -1;
}
if (as->parms[2].items) {
}
if (pntr->iflags) {
fprintf(STDOUT, "attachFlags: ");
- switch (pntr->iflags) {
- case ITOffline:
+ if ((pntr->iflags & ITOffline) != 0) {
fprintf(STDOUT, "offline ");
- break;
- case ITBusy:
+ }
+ if ((pntr->iflags & ITBusy) != 0) {
fprintf(STDOUT, "busy ");
- break;
- case ITReadOnly:
+ }
+ if ((pntr->iflags & ITReadOnly) != 0) {
fprintf(STDOUT, "readonly ");
- break;
- case ITCreate:
+ }
+ if ((pntr->iflags & ITCreate) != 0) {
fprintf(STDOUT, "create ");
- break;
- case ITCreateVolID:
+ }
+ if ((pntr->iflags & ITCreateVolID) != 0) {
fprintf(STDOUT, "create volid ");
- break;
}
fprintf(STDOUT, "\n");
}
if (pntr->vflags) {
fprintf(STDOUT, "volumeStatus: ");
- switch (pntr->vflags) {
- case VTDeleteOnSalvage:
+ if ((pntr->vflags & VTDeleteOnSalvage) != 0) {
fprintf(STDOUT, "deleteOnSalvage ");
- case VTOutOfService:
+ }
+ if ((pntr->vflags & VTOutOfService) != 0) {
fprintf(STDOUT, "outOfService ");
- case VTDeleted:
+ }
+ if ((pntr->vflags & VTDeleted) != 0) {
fprintf(STDOUT, "deleted ");
}
fprintf(STDOUT, "\n");
static int
RenameVolume(struct cmd_syndesc *as, void *arock)
{
- afs_int32 code1, code2, code;
+ afs_int32 code;
struct nvldbentry entry;
+ struct nvldbentry entry2;
- code1 = VLDB_GetEntryByName(as->parms[0].items->data, &entry);
- if (code1) {
+ /* Get the entry of the volume to be renamed (-oldname), by name or id. */
+ code = VLDB_GetEntryByName(as->parms[0].items->data, &entry);
+ if (code) {
fprintf(STDERR, "vos: Could not find entry for volume %s\n",
as->parms[0].items->data);
+ PrintError("", code);
exit(1);
}
- code2 = VLDB_GetEntryByName(as->parms[1].items->data, &entry);
- if ((!code1) && (!code2)) { /*the newname already exists */
- fprintf(STDERR, "vos: volume %s already exists\n",
+
+ /*
+ * Verify the new name is available before attempting to rename.
+ * Allow renaming of the same volume in order to complete a
+ * previously interrupted rename.
+ */
+ code = VLDB_GetEntryByName(as->parms[1].items->data, &entry2);
+ if (code != 0 && code != VL_NOENT) {
+ fprintf(STDERR, "vos: Could not check entry for volume %s\n",
as->parms[1].items->data);
+ PrintError("", code);
exit(1);
}
-
- if (code1 && code2) {
- fprintf(STDERR, "vos: Could not find entry for volume %s or %s\n",
- as->parms[0].items->data, as->parms[1].items->data);
+ if (code == 0 && entry.volumeId[RWVOL] != entry2.volumeId[RWVOL]) {
+ fprintf(STDERR, "vos: Cannot rename volume %s (%lu) to %s;"
+ " volume %s (%lu) already exists\n",
+ as->parms[0].items->data,
+ (unsigned long)entry.volumeId[RWVOL],
+ as->parms[1].items->data,
+ as->parms[1].items->data,
+ (unsigned long)entry2.volumeId[RWVOL]);
exit(1);
}
if (!VolNameOK(as->parms[0].items->data)) {
return 0;
}
-int
+static int
GetVolumeInfo(afs_uint32 volid, afs_uint32 *server, afs_int32 *part, afs_int32 *voltype,
- struct nvldbentry *rentry)
+ struct nvldbentry *rentry)
{
afs_int32 vcode;
int i, index = -1;
if (volid == rentry->volumeId[ROVOL]) {
*voltype = ROVOL;
for (i = 0; i < rentry->nServers; i++) {
- if ((index == -1) && (rentry->serverFlags[i] & ITSROVOL)
- && !(rentry->serverFlags[i] & RO_DONTUSE))
+ if ((index == -1) && (rentry->serverFlags[i] & VLSF_ROVOL)
+ && !(rentry->serverFlags[i] & VLSF_DONTUSE))
index = i;
}
if (index == -1) {
return 0;
}
fprintf(STDERR,
- "unexpected volume type for volume %lu\n",
- (unsigned long)volid);
+ "unexpected volume type for volume %lu\n",
+ (unsigned long)volid);
return -1;
}
return 0;
}
-
static int
CompareVldbEntryByName(const void *p1, const void *p2)
{
return (strcmp(arg1->name, arg2->name));
}
-/*
-static int CompareVldbEntry(char *p1, char *p2)
-{
- struct nvldbentry *arg1,*arg2;
- int i;
- int pos1, pos2;
- char comp1[100],comp2[100];
- char temp1[20],temp2[20];
-
- arg1 = (struct nvldbentry *)p1;
- arg2 = (struct nvldbentry *)p2;
- pos1 = -1;
- pos2 = -1;
-
- for(i = 0; i < arg1->nServers; i++)
- if(arg1->serverFlags[i] & ITSRWVOL) pos1 = i;
- for(i = 0; i < arg2->nServers; i++)
- if(arg2->serverFlags[i] & ITSRWVOL) pos2 = i;
- if(pos1 == -1 || pos2 == -1){
- pos1 = 0;
- pos2 = 0;
- }
- sprintf(comp1,"%10u",arg1->serverNumber[pos1]);
- sprintf(comp2,"%10u",arg2->serverNumber[pos2]);
- sprintf(temp1,"%10u",arg1->serverPartition[pos1]);
- sprintf(temp2,"%10u",arg2->serverPartition[pos2]);
- strcat(comp1,temp1);
- strcat(comp2,temp2);
- strcat(comp1,arg1->name);
- strcat(comp1,arg2->name);
- return(strcmp(comp1,comp2));
-
-}
-
-*/
static int
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;
+ memset(&attributes, 0, sizeof(attributes));
lock = (as->parms[3].items ? 1 : 0); /* -lock flag */
quiet = (as->parms[4].items ? 1 : 0); /* -quit flag */
sort = (as->parms[5].items ? 0 : 1); /* -nosort flag */
/* 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 if (centries > 0) {
if (!tarray) {
/* malloc the first bulk entries array */
- tarraysize = centries * sizeof(struct nvldbentry);
- tarray = malloc(tarraysize);
+ tarraysize = centries * sizeof(struct nvldbentry);
+ tarray = malloc(tarraysize);
if (!tarray) {
fprintf(STDERR,
"Could not allocate enough space for the VLDB entries\n");
goto bypass;
}
- memcpy((char*)tarray, arrayEntries.nbulkentries_val, tarraysize);
+ memcpy((char*)tarray, arrayEntries.nbulkentries_val, tarraysize);
} else {
/* Grow the tarray to keep the extra entries */
parraysize = (centries * sizeof(struct nvldbentry));
}
/* Free the bulk array */
- xdr_free((xdrproc_t) xdr_nbulkentries, &arrayEntries);
+ xdr_free((xdrproc_t) xdr_nbulkentries, &arrayEntries);
}
/* Here is where we now sort all the entries and print them */
#ifndef HAVE_POSIX_REGEX
char *ccode;
#endif
+ int found;
memset(&attributes, 0, sizeof(struct VldbListByAttributes));
attributes.Mask = 0;
continue;
}
- if (!(vllist->flags & RW_EXISTS)) {
+ if (!(vllist->flags & VLF_RWEXISTS)) {
if (verbose) {
fprintf(STDOUT,
"Omitting to backup %s since RW volume does not exist \n",
avolid = vllist->volumeId[RWVOL];
MapHostToNetwork(vllist);
- GetServerAndPart(vllist, RWVOL, &aserver1, &apart1, &previdx);
- if (aserver1 == -1 || apart1 == -1) {
+ found = GetServerAndPart(vllist, RWVOL, &aserver1, &apart1, &previdx);
+ if (!found) {
fprintf(STDOUT, "could not backup %s, invalid VLDB entry\n",
vllist->name);
totalFail++;
apart = -1;
totalE = 0;
- attributes.Mask = 0;
+ memset(&attributes, 0, sizeof(attributes));
if (as->parms[0].items) { /* server specified */
aserver = GetServer(as->parms[0].items->data);
as->parms[1].items->data);
exit(1);
}
- if (!IsPartValid(apart, aserver, &code)) { /*check for validity of the partition */
- if (code)
- PrintError("", code);
- else
- fprintf(STDERR,
- "vos : partition %s does not exist on the server\n",
- as->parms[1].items->data);
- exit(1);
+ if (aserver) {
+ /* Check for validity of the partition if a server was given. */
+ if (!IsPartValid(apart, aserver, &code)) {
+ if (code)
+ PrintError("", code);
+ else
+ fprintf(STDERR,
+ "vos : partition %s does not exist on the server\n",
+ as->parms[1].items->data);
+ exit(1);
+ }
}
attributes.partition = apart;
attributes.Mask |= VLLIST_PARTITION;
SplitInt64(in,hi,lo);
if (hi == 0) {
- units = "KB";
+ units = "KB";
} else if (!(hi & 0xFFFFFC00)) {
- units = "MB";
- lo = (hi << 22) | (lo >> 10);
+ units = "MB";
+ lo = (hi << 22) | (lo >> 10);
} else if (!(hi & 0xFFF00000)) {
- units = "GB";
- lo = (hi << 12) | (lo >> 20);
+ units = "GB";
+ lo = (hi << 12) | (lo >> 20);
} else if (!(hi & 0xC0000000)) {
- units = "TB";
- lo = (hi << 2) | (lo >> 30);
+ units = "TB";
+ lo = (hi << 2) | (lo >> 30);
} else {
- units = "PB";
- lo = (hi >> 8);
+ units = "PB";
+ lo = (hi >> 8);
}
sprintf(output,"%u %s", lo, units);
return output;
cnt = 1;
}
if (as->parms[2].items) {
- printSummary = 1;
+ printSummary = 1;
}
if (apart != -1) {
if (!IsPartValid(apart, aserver, &code)) { /*check for validity of the partition */
"Free space on partition %s: %" AFS_INT64_FMT " K blocks out of total %" AFS_INT64_FMT "\n",
pname, partition.free, partition.minFree);
sumPartitions++;
- AddUInt64(sumFree,partition.free,&sumFree);
- AddUInt64(sumStorage,partition.minFree,&sumStorage);
+ AddUInt64(sumFree,partition.free,&sumFree);
+ AddUInt64(sumStorage,partition.minFree,&sumStorage);
}
}
if (printSummary) {
- fprintf(STDOUT,
+ fprintf(STDOUT,
"Summary: %s free out of ",
PrintInt64Size(sumFree));
- fprintf(STDOUT,
- "%s on %d partitions\n",
- PrintInt64Size(sumStorage),
- sumPartitions);
+ fprintf(STDOUT,
+ "%s on %d partitions\n",
+ PrintInt64Size(sumStorage),
+ sumPartitions);
}
return 0;
}
{
afs_int32 ip1, ip2, vcode;
int remove = 0;
+ int force = 0;
if (noresolve)
ip1 = GetServerNoresolve(as->parms[0].items->data);
return (EINVAL);
}
+ if (as->parms[3].items) {
+ force = 1;
+ }
+
if (as->parms[1].items) {
if (noresolve)
ip2 = GetServerNoresolve(as->parms[1].items->data);
ip1 = 0xffffffff;
}
+ if (!remove && !force) {
+ afs_int32 m_nentries;
+ bulkaddrs m_addrs;
+ afs_int32 m_uniq = 0;
+ afsUUID m_uuid;
+ ListAddrByAttributes m_attrs;
+ struct uuid_fmtbuf buffer;
+
+ memset(&m_attrs, 0, sizeof(m_attrs));
+ memset(&m_uuid, 0, sizeof(m_uuid));
+ memset(&m_addrs, 0, sizeof(m_addrs));
+
+ m_attrs.Mask = VLADDR_IPADDR;
+ m_attrs.ipaddr = ntohl(ip1); /* -oldaddr */
+
+ vcode =
+ ubik_VL_GetAddrsU(cstruct, UBIK_CALL_NEW, &m_attrs, &m_uuid,
+ &m_uniq, &m_nentries, &m_addrs);
+ xdr_free((xdrproc_t) xdr_bulkaddrs, &m_addrs);
+ switch (vcode) {
+ case 0: /* mh entry detected */
+ afsUUID_to_string(&m_uuid, &buffer);
+ fprintf(STDERR, "vos: Refusing to change address in multi-homed server entry.\n");
+ fprintf(STDERR, " -oldaddr address is registered to file server UUID %s\n",
+ buffer.buffer);
+ fprintf(STDERR, " Please restart the file server or use vos setaddrs.\n");
+ return EINVAL;
+ case VL_NOENT:
+ break;
+ default:
+ fprintf(STDERR, "vos: could not list the server addresses\n");
+ PrintError("", vcode);
+ return vcode;
+ }
+ }
+
vcode = ubik_VL_ChangeAddr(cstruct, UBIK_CALL_NEW, ntohl(ip1), ntohl(ip2));
if (vcode) {
char hoststr1[16], hoststr2[16];
int print)
{
int i;
- afs_uint32 *addrp;
- char buf[1024];
+ afs_uint32 addr;
+ struct uuid_fmtbuf buf;
if (print) {
- afsUUID_to_string(m_uuid, buf, sizeof(buf));
- printf("UUID: %s\n", buf);
+ afsUUID_to_string(m_uuid, &buf);
+ printf("UUID: %s\n", buf.buffer);
}
/* print out the list of all the server */
- addrp = (afs_uint32 *) addrs->bulkaddrs_val;
- for (i = 0; i < nentries; i++, addrp++) {
- *addrp = htonl(*addrp);
+ for (i = 0; i < addrs->bulkaddrs_len; i++) {
+ addr = htonl(addrs->bulkaddrs_val[i]);
if (noresolve) {
char hoststr[16];
- printf("%s\n", afs_inet_ntoa_r(*addrp, hoststr));
+ printf("%s\n", afs_inet_ntoa_r(addr, hoststr));
} else {
- printf("%s\n", hostutil_GetNameByINet(*addrp));
+ printf("%s\n", hostutil_GetNameByINet(addr));
}
}
afs_int32 m_nentries;
if (as->parms[0].items && as->parms[1].items) {
- fprintf(STDERR, "vos: Can't use the -uuid and -host flags together\n");
- exit(-1);
+ fprintf(STDERR, "vos: Can't use the -uuid and -host flags together\n");
+ exit(-1);
}
memset(&m_attrs, 0, sizeof(struct ListAddrByAttributes));
memset(&askuuid, 0, sizeof(afsUUID));
if (as->parms[0].items) {
/* -uuid */
- if (afsUUID_from_string(as->parms[0].items->data, &askuuid) < 0) {
+ if (afsUUID_from_string(as->parms[0].items->data, &askuuid) < 0) {
fprintf(STDERR, "vos: invalid UUID '%s'\n",
as->parms[0].items->data);
exit(-1);
m_attrs.Mask = VLADDR_IPADDR;
m_attrs.ipaddr = ntohl(saddr);
} else {
- /* by index */
- m_attrs.Mask = VLADDR_INDEX;
+ /* by index */
+ m_attrs.Mask = VLADDR_INDEX;
}
if (as->parms[2].items) {
}
for (i = 1, m_nentries = 0; nentries; i++) {
- m_attrs.index = i;
-
- xdr_free((xdrproc_t)xdr_bulkaddrs, &m_addrs); /* reset addr list */
- vcode =
- ubik_VL_GetAddrsU(cstruct, UBIK_CALL_NEW, &m_attrs, &m_uuid,
- &m_uniq, &m_nentries, &m_addrs);
- switch (vcode) {
- case 0: /* success */
- print_addrs(&m_addrs, &m_uuid, m_nentries, printuuid);
- nentries--;
- break;
-
- case VL_NOENT:
- if (m_attrs.Mask == VLADDR_UUID) {
- fprintf(STDERR, "vos: no entry for UUID '%s' found in VLDB\n",
- as->parms[0].items->data);
- exit(-1);
- } else if (m_attrs.Mask == VLADDR_IPADDR) {
- fprintf(STDERR, "vos: no entry for host '%s' [0x%08x] found in VLDB\n",
- as->parms[1].items->data, m_attrs.ipaddr);
- exit(-1);
- }
- continue;
-
- case VL_INDEXERANGE:
- vcode = 0; /* not an error, just means we're done */
- goto out;
-
- default: /* any other error */
- fprintf(STDERR, "vos: could not list the server addresses\n");
- PrintError("", vcode);
- goto out;
- }
-
- /* if -uuid or -host, only list one response */
- if (as->parms[1].items || as->parms[0].items)
- break;
+ m_attrs.index = i;
+
+ xdr_free((xdrproc_t)xdr_bulkaddrs, &m_addrs); /* reset addr list */
+ vcode =
+ ubik_VL_GetAddrsU(cstruct, UBIK_CALL_NEW, &m_attrs, &m_uuid,
+ &m_uniq, &m_nentries, &m_addrs);
+ switch (vcode) {
+ case 0: /* success */
+ print_addrs(&m_addrs, &m_uuid, m_nentries, printuuid);
+ nentries--;
+ break;
+
+ case VL_NOENT:
+ if (m_attrs.Mask == VLADDR_UUID) {
+ fprintf(STDERR, "vos: no entry for UUID '%s' found in VLDB\n",
+ as->parms[0].items->data);
+ exit(-1);
+ } else if (m_attrs.Mask == VLADDR_IPADDR) {
+ fprintf(STDERR, "vos: no entry for host '%s' [0x%08x] found in VLDB\n",
+ as->parms[1].items->data, m_attrs.ipaddr);
+ exit(-1);
+ }
+ continue;
+
+ case VL_INDEXERANGE:
+ vcode = 0; /* not an error, just means we're done */
+ goto out;
+
+ default: /* any other error */
+ fprintf(STDERR, "vos: could not list the server addresses\n");
+ PrintError("", vcode);
+ goto out;
+ }
+
+ /* if -uuid or -host, only list one response */
+ if (as->parms[1].items || as->parms[0].items)
+ break;
}
out:
return vcode;
}
-
static int
SetAddrs(struct cmd_syndesc *as, void *arock)
{
memset(&askuuid, 0, sizeof(afsUUID));
if (as->parms[0].items) {
/* -uuid */
- if (afsUUID_from_string(as->parms[0].items->data, &askuuid) < 0) {
+ if (afsUUID_from_string(as->parms[0].items->data, &askuuid) < 0) {
fprintf(STDERR, "vos: invalid UUID '%s'\n",
as->parms[0].items->data);
exit(-1);
}
static int
+RemoveAddrs(struct cmd_syndesc *as, void *arock)
+{
+ afs_int32 code;
+ ListAddrByAttributes attrs;
+ afsUUID uuid;
+ afs_int32 uniq = 0;
+ afs_int32 nentries = 0;
+ bulkaddrs addrs;
+ afs_uint32 ip1;
+ afs_uint32 ip2;
+
+ memset(&attrs, 0, sizeof(ListAddrByAttributes));
+ memset(&addrs, 0, sizeof(bulkaddrs));
+ memset(&uuid, 0, sizeof(afsUUID));
+ attrs.Mask = VLADDR_UUID;
+
+ if (as->parms[0].items) { /* -uuid */
+ if (afsUUID_from_string(as->parms[0].items->data, &attrs.uuid) < 0) {
+ fprintf(STDERR, "vos: invalid UUID '%s'\n",
+ as->parms[0].items->data);
+ return EINVAL;
+ }
+ }
+
+ code =
+ ubik_VL_GetAddrsU(cstruct, UBIK_CALL_NEW, &attrs, &uuid, &uniq,
+ &nentries, &addrs);
+ if (code == VL_NOENT) {
+ fprintf(STDERR, "vos: UUID not found\n");
+ goto out;
+ }
+ if (code != 0) {
+ fprintf(STDERR, "vos: could not list the server addresses\n");
+ PrintError("", code);
+ goto out;
+ }
+ if (addrs.bulkaddrs_len == 0) {
+ fprintf(STDERR, "vos: no addresses found for UUID\n");
+ goto out;
+ }
+
+ ip2 = addrs.bulkaddrs_val[0]; /* network byte order */
+ ip1 = 0xffffffff; /* indicates removal mode */
+
+ if (verbose) {
+ printf("vos: Removing UUID with hosts:\n");
+ print_addrs(&addrs, &uuid, nentries, 1);
+ }
+
+ code = ubik_VL_ChangeAddr(cstruct, UBIK_CALL_NEW, ip1, ip2);
+ if (code) {
+ fprintf(STDERR, "Could not remove server entry from the VLDB.\n");
+ PrintError("", code);
+ }
+
+ out:
+ xdr_free((xdrproc_t) xdr_bulkaddrs, &addrs);
+ return code;
+}
+
+static int
LockEntry(struct cmd_syndesc *as, void *arock)
{
afs_uint32 avolid;
afs_uint32 volid;
afs_uint32 server;
afs_int32 code, i, same;
- struct nvldbentry entry, checkEntry, 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);
MapHostToNetwork(&entry);
for (i = 0; i < entry.nServers; i++) {
- if (entry.serverFlags[i] & ITSRWVOL) {
- rwindex = i;
+ if (entry.serverFlags[i] & VLSF_RWVOL) {
rwserver = entry.serverNumber[i];
rwpartition = entry.serverPartition[i];
if (roserver)
break;
- } else if ((entry.serverFlags[i] & ITSROVOL) && !roserver) {
+ } else if ((entry.serverFlags[i] & VLSF_ROVOL) && !roserver) {
same = VLDB_IsSameAddrs(server, entry.serverNumber[i], &code);
if (code) {
fprintf(STDERR,
return ENOENT;
}
if (same) {
- roindex = i;
roserver = entry.serverNumber[i];
ropartition = entry.serverPartition[i];
if (rwserver)
}
}
- vcode =
- ubik_VL_SetLock(cstruct, 0, entry.volumeId[RWVOL], RWVOL,
- VLOP_MOVE);
- if (vcode) {
- fprintf(STDERR,
- "Unable to lock volume %lu, code %d\n",
- (unsigned long)entry.volumeId[RWVOL],vcode);
- PrintError("", vcode);
- return -1;
- }
-
- /* make sure the VLDB entry hasn't changed since we started */
- memset(&checkEntry, 0, sizeof(checkEntry));
- vcode = VLDB_GetEntryByID(volid, -1, &checkEntry);
- if (vcode) {
- fprintf(STDERR,
- "Could not fetch the entry for volume %lu from VLDB\n",
- (unsigned long)volid);
- PrintError("convertROtoRW ", vcode);
- code = vcode;
- goto error_exit;
- }
-
- MapHostToNetwork(&checkEntry);
- entry.flags &= ~VLOP_ALLOPERS; /* clear any stale lock operation flags */
- entry.flags |= VLOP_MOVE; /* set to match SetLock operation above */
- if (memcmp(&entry, &checkEntry, sizeof(entry)) != 0) {
- fprintf(STDERR,
- "VLDB entry for volume %lu has changed; please reissue the command.\n",
- (unsigned long)volid);
- code = -1;
- goto error_exit;
- }
-
- 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);
- goto error_exit;
- }
- /* Update the VLDB to match what we did on disk as much as possible. */
- /* If the converted RO was in the VLDB, make it look like the new RW. */
- if (roserver) {
- entry.serverFlags[roindex] = ITSRWVOL;
- } else {
- /* Add a new site entry for the newly created RW. It's possible
- * (but unlikely) that we are already at MAXNSERVERS and that this
- * new site will invalidate the whole VLDB entry; however,
- * VLDB_ReplaceEntry will detect this and return VL_BADSERVER,
- * so we need no extra guard logic here.
- */
- afs_int32 newrwindex = entry.nServers;
- (entry.nServers)++;
- entry.serverNumber[newrwindex] = server;
- entry.serverPartition[newrwindex] = partition;
- entry.serverFlags[newrwindex] = ITSRWVOL;
- }
- entry.flags |= RW_EXISTS;
- entry.flags &= ~BACK_EXISTS;
-
- /* if the old RW was in the VLDB, remove it by decrementing the number */
- /* of servers, replacing the RW entry with the last entry, and zeroing */
- /* out the last entry. */
- 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);
- }
+ code = UV_ConvertRO(server, partition, volid, &entry);
- error_exit:
- vcode = UV_LockRelease(entry.volumeId[RWVOL]);
- if (vcode) {
- fprintf(STDERR,
- "Unable to unlock volume %lu, code %d\n",
- (unsigned long)entry.volumeId[RWVOL],vcode);
- PrintError("", vcode);
- }
return code;
}
return 0;
}
-int
+static int
PrintDiagnostics(char *astring, afs_int32 acode)
{
- if (acode == EACCES) {
+ switch (acode) {
+ case EACCES:
fprintf(STDERR,
"You are not authorized to perform the 'vos %s' command (%d)\n",
astring, acode);
- } else {
+ break;
+ case EXDEV:
+ fprintf(STDERR, "Error in vos %s command.\n", astring);
+ fprintf(STDERR, "Clone volume is not in the same partition as the read-write volume.\n");
+ break;
+ default:
fprintf(STDERR, "Error in vos %s command.\n", astring);
PrintError("", acode);
+ break;
}
return 0;
}
-
#ifdef AFS_NT40_ENV
static DWORD
win32_enableCrypt(void)
/* Look up configuration parameters in Registry */
code = RegOpenKeyEx(HKEY_LOCAL_MACHINE, AFSREG_CLT_SVC_PARAM_SUBKEY,
- 0, (IsWow64()?KEY_WOW64_64KEY:0)|KEY_QUERY_VALUE, &parmKey);
+ 0, (IsWow64()?KEY_WOW64_64KEY:0)|KEY_QUERY_VALUE, &parmKey);
if (code != ERROR_SUCCESS) {
- dummyLen = sizeof(cryptall);
- RegQueryValueEx(parmKey, "SecurityLevel", NULL, NULL,
- (BYTE *) &cryptall, &dummyLen);
+ dummyLen = sizeof(cryptall);
+ RegQueryValueEx(parmKey, "SecurityLevel", NULL, NULL,
+ (BYTE *) &cryptall, &dummyLen);
}
RegCloseKey (parmKey);
MyBeforeProc(struct cmd_syndesc *as, void *arock)
{
char *tcell;
+ char *rxgk_seclevel_str = NULL;
afs_int32 code;
int secFlags;
secFlags = AFSCONF_SECOPTS_FALLBACK_NULL;
tcell = NULL;
- if (as->parms[12].items) /* if -cell specified */
- tcell = as->parms[12].items->data;
+ if (as->parms[COMMONPARM_OFFSET_CELL].items) /* if -cell specified */
+ tcell = as->parms[COMMONPARM_OFFSET_CELL].items->data;
- if (as->parms[13].items)
+ if (as->parms[COMMONPARM_OFFSET_NOAUTH].items)
secFlags |= AFSCONF_SECOPTS_NOAUTH;
- if (as->parms[14].items) { /* -localauth specified */
+ if (as->parms[COMMONPARM_OFFSET_LOCALAUTH].items) { /* -localauth specified */
secFlags |= AFSCONF_SECOPTS_LOCALAUTH;
confdir = AFSDIR_SERVER_ETC_DIRPATH;
}
- if (as->parms[16].items /* -encrypt specified */
+ if (as->parms[COMMONPARM_OFFSET_ENCRYPT].items /* -encrypt specified */
#ifdef AFS_NT40_ENV
- || win32_enableCrypt()
+ || win32_enableCrypt()
#endif /* AFS_NT40_ENV */
- )
+ )
secFlags |= AFSCONF_SECOPTS_ALWAYSENCRYPT;
- if (as->parms[18].items) /* -config flag set */
- confdir = as->parms[18].items->data;
+ if (as->parms[COMMONPARM_OFFSET_CONFIG].items) /* -config flag set */
+ confdir = as->parms[COMMONPARM_OFFSET_CONFIG].items->data;
+
+ if (cmd_OptionAsString(as, COMMONPARM_OFFSET_RXGK, &rxgk_seclevel_str) == 0) {
+ if (strcmp(rxgk_seclevel_str, "clear") == 0)
+ secFlags |= AFSCONF_SECOPTS_ALWAYSCLEAR;
+ else if (strcmp(rxgk_seclevel_str, "auth") == 0)
+ secFlags |= AFSCONF_SECOPTS_NEVERENCRYPT;
+ else if (strcmp(rxgk_seclevel_str, "crypt") == 0) {
+ /* don't need to set any flags; this is the default for rxgk */
+ } else {
+ fprintf(STDERR, "Invalid argument to -rxgk: %s\n", rxgk_seclevel_str);
+ exit(1);
+ }
+ secFlags |= AFSCONF_SECOPTS_RXGK;
+
+ free(rxgk_seclevel_str);
+ rxgk_seclevel_str = NULL;
+ }
if ((code = vsu_ClientInit(confdir, tcell, secFlags, UV_SetSecurity,
&cstruct))) {
exit(1);
}
rxInitDone = 1;
- if (as->parms[15].items) /* -verbose flag set */
+ if (as->parms[COMMONPARM_OFFSET_VERBOSE].items) /* -verbose flag set */
verbose = 1;
else
verbose = 0;
- if (as->parms[17].items) /* -noresolve flag set */
+ if (as->parms[COMMONPARM_OFFSET_NORESOLVE].items) /* -noresolve flag set */
noresolve = 1;
else
noresolve = 0;
return 0;
}
-int
-osi_audit(void)
-{
-/* this sucks but it works for now.
-*/
- return 0;
-}
-
#include "AFS_component_version_number.c"
int
cmd_SetBeforeProc(MyBeforeProc, NULL);
- ts = cmd_CreateSyntax("create", CreateVolume, NULL, "create a new volume");
+ ts = cmd_CreateSyntax("create", CreateVolume, NULL, 0, "create a new volume");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name");
cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "volume name");
"initial quota (KB)");
cmd_AddParm(ts, "-id", CMD_SINGLE, CMD_OPTIONAL, "volume ID");
cmd_AddParm(ts, "-roid", CMD_SINGLE, CMD_OPTIONAL, "readonly volume ID");
-#ifdef notdef
- cmd_AddParm(ts, "-minquota", CMD_SINGLE, CMD_OPTIONAL, "");
-#endif
COMMONPARMS;
- ts = cmd_CreateSyntax("remove", DeleteVolume, NULL, "delete a volume");
+ ts = cmd_CreateSyntax("remove", DeleteVolume, NULL, 0, "delete a volume");
cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "machine name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
COMMONPARMS;
- ts = cmd_CreateSyntax("move", MoveVolume, NULL, "move a volume");
+ ts = cmd_CreateSyntax("move", MoveVolume, NULL, 0, "move a volume");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
cmd_AddParm(ts, "-fromserver", CMD_SINGLE, 0, "machine name on source");
cmd_AddParm(ts, "-frompartition", CMD_SINGLE, 0,
"copy live volume without cloning");
COMMONPARMS;
- ts = cmd_CreateSyntax("copy", CopyVolume, NULL, "copy a volume");
+ ts = cmd_CreateSyntax("copy", CopyVolume, NULL, 0, "copy a volume");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID on source");
cmd_AddParm(ts, "-fromserver", CMD_SINGLE, 0, "machine name on source");
cmd_AddParm(ts, "-frompartition", CMD_SINGLE, 0,
"copy live volume without cloning");
COMMONPARMS;
- ts = cmd_CreateSyntax("shadow", ShadowVolume, NULL,
+ ts = cmd_CreateSyntax("shadow", ShadowVolume, NULL, 0,
"make or update a shadow volume");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID on source");
cmd_AddParm(ts, "-fromserver", CMD_SINGLE, 0, "machine name on source");
"do incremental update if target exists");
COMMONPARMS;
- ts = cmd_CreateSyntax("backup", BackupVolume, NULL,
+ ts = cmd_CreateSyntax("backup", BackupVolume, NULL, 0,
"make backup of a volume");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
COMMONPARMS;
- ts = cmd_CreateSyntax("clone", CloneVolume, NULL,
+ ts = cmd_CreateSyntax("clone", CloneVolume, NULL, 0,
"make clone of a volume");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "server");
"make clone volume readwrite, not read-only");
COMMONPARMS;
- ts = cmd_CreateSyntax("release", ReleaseVolume, NULL, "release a volume");
+ ts = cmd_CreateSyntax("release", ReleaseVolume, NULL, 0, "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");
- cmd_AddParm(ts, "-stayonline", CMD_FLAG, CMD_OPTIONAL,
+ "force a complete release and full dumps");
+ cmd_AddParmAlias(ts, 1, "-f"); /* original force option */
+ /* keep this reserved */
+ cmd_AddParm(ts, "-stayonline", CMD_FLAG, CMD_OPTIONAL|CMD_HIDDEN,
"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");
+ ts = cmd_CreateSyntax("dump", DumpVolumeCmd, NULL, 0, "dump a volume");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
cmd_AddParm(ts, "-time", CMD_SINGLE, CMD_OPTIONAL, "dump from time");
cmd_AddParm(ts, "-file", CMD_SINGLE, CMD_OPTIONAL, "dump file");
"omit unchanged directories from an incremental dump");
COMMONPARMS;
- ts = cmd_CreateSyntax("restore", RestoreVolumeCmd, NULL,
+ ts = cmd_CreateSyntax("restore", RestoreVolumeCmd, NULL, 0,
"restore a volume");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name");
"do not delete old site when restoring to a new site");
COMMONPARMS;
- ts = cmd_CreateSyntax("unlock", LockReleaseCmd, NULL,
+ ts = cmd_CreateSyntax("unlock", LockReleaseCmd, NULL, 0,
"release lock on VLDB entry for a volume");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
COMMONPARMS;
- ts = cmd_CreateSyntax("changeloc", ChangeLocation, NULL,
+ ts = cmd_CreateSyntax("changeloc", ChangeLocation, NULL, 0,
"change an RW volume's location in the VLDB");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0,
"machine name for new location");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
COMMONPARMS;
- ts = cmd_CreateSyntax("addsite", AddSite, NULL, "add a replication site");
+ ts = cmd_CreateSyntax("addsite", AddSite, NULL, 0, "add a replication site");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name for new site");
cmd_AddParm(ts, "-partition", CMD_SINGLE, 0,
"partition name for new site");
cmd_AddParm(ts, "-valid", CMD_FLAG, CMD_OPTIONAL, "publish as an up-to-date site in VLDB");
COMMONPARMS;
- ts = cmd_CreateSyntax("remsite", RemoveSite, NULL,
+ ts = cmd_CreateSyntax("remsite", RemoveSite, NULL, 0,
"remove a replication site");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
COMMONPARMS;
- ts = cmd_CreateSyntax("listpart", ListPartitions, NULL, "list partitions");
+ ts = cmd_CreateSyntax("listpart", ListPartitions, NULL, 0, "list partitions");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name");
COMMONPARMS;
- ts = cmd_CreateSyntax("listvol", ListVolumes, NULL,
+ ts = cmd_CreateSyntax("listvol", ListVolumes, NULL, 0,
"list volumes on server (bypass VLDB)");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name");
"machine readable format");
COMMONPARMS;
- ts = cmd_CreateSyntax("syncvldb", SyncVldb, NULL,
+ ts = cmd_CreateSyntax("syncvldb", SyncVldb, NULL, 0,
"synchronize VLDB with server");
cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "machine name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name");
cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "list what would be done, don't do it");
COMMONPARMS;
- ts = cmd_CreateSyntax("syncserv", SyncServer, NULL,
+ ts = cmd_CreateSyntax("syncserv", SyncServer, NULL, 0,
"synchronize server with VLDB");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name");
cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "list what would be done, don't do it");
COMMONPARMS;
- ts = cmd_CreateSyntax("examine", ExamineVolume, NULL,
+ ts = cmd_CreateSyntax("examine", ExamineVolume, NULL, 0,
"everything about the volume");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
cmd_AddParm(ts, "-extended", CMD_FLAG, CMD_OPTIONAL,
"machine readable format");
COMMONPARMS;
cmd_CreateAlias(ts, "volinfo");
+ cmd_CreateAlias(ts, "e");
- ts = cmd_CreateSyntax("setfields", SetFields, NULL,
+ ts = cmd_CreateSyntax("setfields", SetFields, NULL, 0,
"change volume info fields");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
cmd_AddParm(ts, "-maxquota", CMD_SINGLE, CMD_OPTIONAL, "quota (KB)");
cmd_AddParm(ts, "-clearVolUpCounter", CMD_FLAG, CMD_OPTIONAL, "clear volUpdateCounter");
COMMONPARMS;
- ts = cmd_CreateSyntax("offline", volOffline, NULL, "force the volume status to offline");
+ ts = cmd_CreateSyntax("offline", volOffline, NULL, 0, "force the volume status to offline");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "server name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
cmd_AddParm(ts, "-busy", CMD_FLAG, CMD_OPTIONAL, "busy volume");
COMMONPARMS;
- ts = cmd_CreateSyntax("online", volOnline, NULL, "force the volume status to online");
+ ts = cmd_CreateSyntax("online", volOnline, NULL, 0, "force the volume status to online");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "server name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
COMMONPARMS;
- ts = cmd_CreateSyntax("zap", VolumeZap, NULL,
+ ts = cmd_CreateSyntax("zap", VolumeZap, NULL, 0,
"delete the volume, don't bother with VLDB");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name");
"also delete backup volume if one is found");
COMMONPARMS;
- ts = cmd_CreateSyntax("status", VolserStatus, NULL,
+ ts = cmd_CreateSyntax("status", VolserStatus, NULL, 0,
"report on volser status");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name");
COMMONPARMS;
- ts = cmd_CreateSyntax("rename", RenameVolume, NULL, "rename a volume");
+ ts = cmd_CreateSyntax("rename", RenameVolume, NULL, 0, "rename a volume");
cmd_AddParm(ts, "-oldname", CMD_SINGLE, 0, "old volume name ");
cmd_AddParm(ts, "-newname", CMD_SINGLE, 0, "new volume name ");
COMMONPARMS;
- ts = cmd_CreateSyntax("listvldb", ListVLDB, NULL,
+ ts = cmd_CreateSyntax("listvldb", ListVLDB, NULL, 0,
"list volumes in the VLDB");
cmd_AddParm(ts, "-name", CMD_SINGLE, CMD_OPTIONAL, "volume name or ID");
cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "machine name");
"do not alphabetically sort the volume names");
COMMONPARMS;
- ts = cmd_CreateSyntax("backupsys", BackSys, NULL, "en masse backups");
+ ts = cmd_CreateSyntax("backupsys", BackSys, NULL, 0, "en masse backups");
cmd_AddParm(ts, "-prefix", CMD_LIST, CMD_OPTIONAL,
"common prefix on volume(s)");
cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "machine name");
cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "list what would be done, don't do it");
COMMONPARMS;
- ts = cmd_CreateSyntax("delentry", DeleteEntry, NULL,
+ ts = cmd_CreateSyntax("delentry", DeleteEntry, NULL, 0,
"delete VLDB entry for a volume");
cmd_AddParm(ts, "-id", CMD_LIST, CMD_OPTIONAL, "volume name or ID");
cmd_AddParm(ts, "-prefix", CMD_SINGLE, CMD_OPTIONAL,
"list what would be done, don't do it");
COMMONPARMS;
- ts = cmd_CreateSyntax("partinfo", PartitionInfo, NULL,
+ ts = cmd_CreateSyntax("partinfo", PartitionInfo, NULL, 0,
"list partition information");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name");
"print storage summary");
COMMONPARMS;
- ts = cmd_CreateSyntax("unlockvldb", UnlockVLDB, NULL,
+ ts = cmd_CreateSyntax("unlockvldb", UnlockVLDB, NULL, 0,
"unlock all the locked entries in the VLDB");
cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "machine name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name");
COMMONPARMS;
- ts = cmd_CreateSyntax("lock", LockEntry, NULL,
+ ts = cmd_CreateSyntax("lock", LockEntry, NULL, 0,
"lock VLDB entry for a volume");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
COMMONPARMS;
- ts = cmd_CreateSyntax("changeaddr", ChangeAddr, NULL,
+ ts = cmd_CreateSyntax("changeaddr", ChangeAddr, NULL, 0,
"change the IP address of a file server");
cmd_AddParm(ts, "-oldaddr", CMD_SINGLE, 0, "original IP address");
cmd_AddParm(ts, "-newaddr", CMD_SINGLE, CMD_OPTIONAL, "new IP address");
cmd_AddParm(ts, "-remove", CMD_FLAG, CMD_OPTIONAL,
"remove the IP address from the VLDB");
+ cmd_AddParm(ts, "-force", CMD_FLAG, CMD_OPTIONAL,
+ "allow multi-homed server entry change (not recommended)");
COMMONPARMS;
- ts = cmd_CreateSyntax("listaddrs", ListAddrs, NULL,
+ ts = cmd_CreateSyntax("listaddrs", ListAddrs, NULL, 0,
"list the IP address of all file servers registered in the VLDB");
cmd_AddParm(ts, "-uuid", CMD_SINGLE, CMD_OPTIONAL, "uuid of server");
cmd_AddParm(ts, "-host", CMD_SINGLE, CMD_OPTIONAL, "address of host");
"print uuid of hosts");
COMMONPARMS;
- ts = cmd_CreateSyntax("convertROtoRW", ConvertRO, NULL,
+ ts = cmd_CreateSyntax("convertROtoRW", ConvertRO, NULL, 0,
"convert a RO volume into a RW volume (after loss of old RW volume)");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name");
cmd_AddParm(ts, "-force", CMD_FLAG, CMD_OPTIONAL, "don't ask");
COMMONPARMS;
- ts = cmd_CreateSyntax("size", Sizes, NULL,
+ ts = cmd_CreateSyntax("size", Sizes, NULL, 0,
"obtain various sizes of the volume.");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name");
cmd_AddParm(ts, "-time", CMD_SINGLE, CMD_OPTIONAL, "dump from time");
COMMONPARMS;
- ts = cmd_CreateSyntax("endtrans", EndTrans, NULL,
+ ts = cmd_CreateSyntax("endtrans", EndTrans, NULL, 0,
"end a volserver transaction");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name");
cmd_AddParm(ts, "-transaction", CMD_SINGLE, 0,
"transaction ID");
COMMONPARMS;
- ts = cmd_CreateSyntax("setaddrs", SetAddrs, NULL,
- "set the list of IP address for a given UUID in the VLDB");
+ ts = cmd_CreateSyntax("setaddrs", SetAddrs, NULL, 0,
+ "set the list of IP addresses for a given UUID in the VLDB");
cmd_AddParm(ts, "-uuid", CMD_SINGLE, 0, "uuid of server");
cmd_AddParm(ts, "-host", CMD_LIST, 0, "address of host");
+ COMMONPARMS;
+ ts = cmd_CreateSyntax("remaddrs", RemoveAddrs, NULL, 0,
+ "remove the list of IP addresses for a given UUID in the VLDB");
+ cmd_AddParm(ts, "-uuid", CMD_SINGLE, 0, "uuid of server");
COMMONPARMS;
+
code = cmd_Dispatch(argc, argv);
if (rxInitDone) {
/* Shut down the ubik_client and rx connections */
git://git.openafs.org / openafs.git / blobdiff