} /*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 = VLSF_RWVOL;
- istart = 0; /* seach the entire entry */
+ istart = 0; /* search the entire entry */
} else {
vtype = VLSF_ROVOL;
- /* Seach from beginning of entry or pick up where we left off */
+ /* 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
* 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) {
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);
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) {
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) {
}
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");
#ifndef HAVE_POSIX_REGEX
char *ccode;
#endif
+ int found;
memset(&attributes, 0, sizeof(struct VldbListByAttributes));
attributes.Mask = 0;
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++;
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;