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"); \
#define ERROR_EXIT(code) do { \
error = (code); \
} while (0)
int rxInitDone = 0;
-struct rx_connection *tconn;
-afs_uint32 tserver;
extern struct ubik_client *cstruct;
const char *confdir;
{
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;
{
usd_handle_t ufd;
int code;
- afs_hyper_t size;
+ afs_int64 size;
code = usd_Open(filename, USD_OPEN_RDONLY, 0, &ufd);
if (code) {
int done = 0;
afs_uint32 nbytes;
- buffer = (char *)malloc(blksize);
+ buffer = malloc(blksize);
if (!buffer) {
fprintf(STDERR, "malloc failed\n");
return -1;
long blksize;
afs_int32 error, code;
int ufdIsOpen = 0;
- afs_hyper_t filesize, currOffset;
+ afs_int64 currOffset;
afs_uint32 buffer;
afs_uint32 got;
goto wfail;
}
/* test if we have a valid dump */
- hset64(filesize, 0, 0);
- USD_SEEK(ufd, filesize, SEEK_END, &currOffset);
- hset64(filesize, hgethi(currOffset), hgetlo(currOffset)-sizeof(afs_uint32));
- USD_SEEK(ufd, filesize, SEEK_SET, &currOffset);
+ USD_SEEK(ufd, 0, SEEK_END, &currOffset);
+ USD_SEEK(ufd, currOffset - sizeof(afs_uint32), SEEK_SET, &currOffset);
USD_READ(ufd, (char *)&buffer, sizeof(afs_uint32), &got);
if ((got != sizeof(afs_uint32)) || (ntohl(buffer) != DUMPENDMAGIC)) {
fprintf(STDERR, "Signature missing from end of file '%s'\n", filename);
error = VOLSERBADOP;
goto wfail;
}
- /* rewind, we are done */
- hset64(filesize, 0, 0);
- USD_SEEK(ufd, filesize, SEEK_SET, &currOffset);
+ USD_SEEK(ufd, 0, SEEK_SET, &currOffset);
}
code = SendFile(ufd, call, blksize);
if (code) {
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);
char *filename = (char *)rock;
usd_handle_t ufd; /* default is to stdout */
afs_int32 error = 0, code;
- afs_hyper_t size;
+ afs_int64 size;
long blksize;
int ufdIsOpen = 0;
usd_Open(filename, USD_OPEN_CREATE | USD_OPEN_RDWR, 0666, &ufd);
if (code == 0) {
ufdIsOpen = 1;
- hzero(size);
+ size = 0;
code = USD_IOCTL(ufd, USD_IOCTL_SETSIZE, &size);
}
if (code == 0) {
VolumeStats_int(volintInfo *pntr, struct nvldbentry *entry, afs_uint32 server,
afs_int32 part, int voltype)
{
- int totalOK, totalNotOK, totalBusy;
+ int totalOK = 0;
+ int totalNotOK = 0;
+ int totalBusy = 0;
DisplayFormat(pntr, server, part, &totalOK, &totalNotOK, &totalBusy, 0, 1,
1);
transflag = (as->parms[4].items ? ITBusy : ITOffline);
sleeptime = (as->parms[3].items ? atol(as->parms[3].items->data) : 0);
- transdone = (sleeptime ? 0 /*online */ : VTOutOfService);
+ transdone = ((sleeptime || as->parms[4].items) ? 0 /*online */ : VTOutOfService);
if (as->parms[4].items && !as->parms[3].items) {
fprintf(STDERR, "-sleep option must be used with -busy flag\n");
return -1;
struct nvldbentry entry;
afs_int32 vcode;
afs_int32 quota;
+ afs_uint32 tserver;
arovolid = &rovolid;
flags = 0;
if (as->parms[5].items) flags |= RV_OFFLINE;
+ if (as->parms[6].items && as->parms[7].items) {
+ fprintf(STDERR, "vos: cannot specify that a volume be -readwrite and -readonly\n");
+ return EINVAL;
+ }
if (as->parms[6].items) flags |= RV_RDONLY;
+ if (as->parms[7].items) flags |= RV_RWONLY;
code =
afs_uint32 aserver;
afs_int32 apart, vtype, code, err;
int force = 0;
+ int stayUp = 0;
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);
+ code = UV_ReleaseVolume(avolid, aserver, apart, force, stayUp);
+
if (code) {
PrintDiagnostics("release", code);
return code;
if (rxConn == 0)
break;
rx_SetConnDeadTime(rxConn, rx_connDeadTime);
- if (rxConn->service)
- rxConn->service->connDeadTime = rx_connDeadTime;
+ if (rx_ServiceOf(rxConn))
+ rx_ServiceOf(rxConn)->connDeadTime = rx_connDeadTime;
}
avolid = vsu_GetVolumeID(as->parms[0].items->data, cstruct, &err);
}
code = UV_ChangeLocation(aserver, apart, avolid);
if (code) {
- PrintDiagnostics("addsite", code);
+ PrintDiagnostics("changeloc", code);
exit(1);
}
MapPartIdIntoName(apart, apartName);
&pntr, &count);
if (code) {
PrintDiagnostics("listvol", code);
- if (pntr)
- free(pntr);
exit(1);
}
if (wantExtendedInfo) {
char part[10];
int flags = 0;
char *volname = 0;
+ afs_uint32 tserver;
tserver = 0;
if (as->parms[0].items) {
{
afs_int32 pnum, code; /* part name */
char part[10];
+ afs_uint32 tserver;
int flags = 0;
itp->data);
continue;
}
- if (as->parms[4].items) { /* -noexecute */
+ if (as->parms[4].items || as->parms[5].items) {
+ /* -noexecute (hidden) or -dryrun */
fprintf(STDOUT, "Would have deleted VLDB entry for %s \n",
itp->data);
fflush(STDOUT);
}
}
- if (as->parms[4].items) { /* -noexecute */
+ if (as->parms[4].items || as->parms[5].items) {
+ /* -noexecute (hidden) or -dryrun */
fprintf(STDOUT, "Would have deleted VLDB entry for %s \n",
vllist->name);
fflush(STDOUT);
avolid = vllist->volumeId[RWVOL];
vcode = ubik_VL_DeleteEntry(cstruct, 0, avolid, RWVOL);
if (vcode) {
- fprintf(STDOUT, "Could not delete VDLB entry for %s\n",
+ fprintf(STDOUT, "Could not delete VLDB entry for %s\n",
vllist->name);
totalFail++;
PrintError("", vcode);
} 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");
print_addrs(const bulkaddrs * addrs, afsUUID * m_uuid, int nentries,
int print)
{
- afs_int32 vcode, m_uniq=0;
- afs_int32 i, j;
+ int i;
afs_uint32 *addrp;
- bulkaddrs m_addrs;
- ListAddrByAttributes m_attrs;
- afs_int32 m_nentries;
- afs_uint32 *m_addrp;
- afs_int32 base, index;
char buf[1024];
if (print) {
/* print out the list of all the server */
addrp = (afs_uint32 *) addrs->bulkaddrs_val;
for (i = 0; i < nentries; i++, addrp++) {
- /* If it is a multihomed address, then we will need to
- * get the addresses for this multihomed server from
- * the vlserver and print them.
- */
- if (((*addrp & 0xff000000) == 0xff000000) && ((*addrp) & 0xffff)) {
- /* Get the list of multihomed fileservers */
- base = (*addrp >> 16) & 0xff;
- index = (*addrp) & 0xffff;
-
- if ((base >= 0) && (base <= VL_MAX_ADDREXTBLKS) && (index >= 1)
- && (index <= VL_MHSRV_PERBLK)) {
- m_attrs.Mask = VLADDR_INDEX;
- m_attrs.index = (base * VL_MHSRV_PERBLK) + index;
- m_nentries = 0;
- m_addrs.bulkaddrs_val = 0;
- m_addrs.bulkaddrs_len = 0;
- vcode =
- ubik_VL_GetAddrsU(cstruct, 0, &m_attrs, m_uuid,
- &m_uniq, &m_nentries,
- &m_addrs);
- if (vcode) {
- fprintf(STDERR,
- "vos: could not list the multi-homed server addresses\n");
- PrintError("", vcode);
- }
-
- /* Print the list */
- m_addrp = (afs_uint32 *) m_addrs.bulkaddrs_val;
- for (j = 0; j < m_nentries; j++, m_addrp++) {
- *m_addrp = htonl(*m_addrp);
- if (noresolve) {
- char hoststr[16];
- printf("%s ", afs_inet_ntoa_r(*m_addrp, hoststr));
- } else {
- printf("%s ", hostutil_GetNameByINet(*m_addrp));
- }
- }
- if (j == 0) {
- printf("<unknown>\n");
- } else {
- printf("\n");
- }
-
- continue;
- }
- }
-
- /* Otherwise, it is a non-multihomed entry and contains
- * the IP address of the server - print it.
- */
*addrp = htonl(*addrp);
if (noresolve) {
char hoststr[16];
afsUUID m_uuid, askuuid;
afs_int32 m_nentries;
- memset(&m_attrs, 0, sizeof(struct ListAddrByAttributes));
- m_attrs.Mask = VLADDR_INDEX;
+ if (as->parms[0].items && as->parms[1].items) {
+ fprintf(STDERR, "vos: Can't use the -uuid and -host flags together\n");
+ exit(-1);
+ }
- memset(&m_addrs, 0, sizeof(bulkaddrs));
+ memset(&m_attrs, 0, sizeof(struct ListAddrByAttributes));
memset(&askuuid, 0, sizeof(afsUUID));
if (as->parms[0].items) {
/* -uuid */
}
m_attrs.Mask = VLADDR_UUID;
m_attrs.uuid = askuuid;
- }
- if (as->parms[1].items) {
+ } else if (as->parms[1].items) {
/* -host */
struct hostent *he;
afs_uint32 saddr;
memcpy(&saddr, he->h_addr, 4);
m_attrs.Mask = VLADDR_IPADDR;
m_attrs.ipaddr = ntohl(saddr);
+ } else {
+ /* by index */
+ m_attrs.Mask = VLADDR_INDEX;
}
+
if (as->parms[2].items) {
printuuid = 1;
}
- m_addrs.bulkaddrs_val = 0;
- m_addrs.bulkaddrs_len = 0;
+ memset(&m_addrs, 0, sizeof(bulkaddrs));
+ memset(&vlcb, 0, sizeof(struct VLCallBack));
vcode =
ubik_VL_GetAddrs(cstruct, UBIK_CALL_NEW, 0, 0, &vlcb, &nentries,
if (vcode) {
fprintf(STDERR, "vos: could not list the server addresses\n");
PrintError("", vcode);
- return (vcode);
- }
-
- m_nentries = 0;
- m_addrs.bulkaddrs_val = 0;
- m_addrs.bulkaddrs_len = 0;
- i = 1;
- while (1) {
- m_attrs.index = i;
-
- vcode =
- ubik_VL_GetAddrsU(cstruct, UBIK_CALL_NEW, &m_attrs, &m_uuid,
- &m_uniq, &m_nentries, &m_addrs);
-
- if (vcode == 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);
- } else {
- i++;
- nentries++;
- continue;
- }
- }
-
- if (vcode == VL_INDEXERANGE) {
- break;
- }
-
- if (vcode) {
- fprintf(STDERR, "vos: could not list the server addresses\n");
- PrintError("", vcode);
- return (vcode);
- }
-
- print_addrs(&m_addrs, &m_uuid, m_nentries, printuuid);
- i++;
+ goto out;
+ }
+
+ 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 ((as->parms[1].items) || (as->parms[0].items) || (i > nentries))
- break;
+ /* if -uuid or -host, only list one response */
+ if (as->parms[1].items || as->parms[0].items)
+ break;
}
- return 0;
+out:
+ xdr_free((xdrproc_t)xdr_bulkaddrs, &m_addrs);
+ return vcode;
}
if (vcode) {
if (vcode == VL_MULTIPADDR) {
fprintf(STDERR, "vos: VL_RegisterAddrs rpc failed; The IP address exists on a different server; repair it\n");
- PrintError("", vcode);
- return vcode;
} else if (vcode == RXGEN_OPCODE) {
fprintf(STDERR, "vlserver doesn't support VL_RegisterAddrs rpc; ignored\n");
- PrintError("", vcode);
- return vcode;
+ } else {
+ fprintf(STDERR, "vos: VL_RegisterAddrs rpc failed\n");
}
+ PrintError("", vcode);
+ return vcode;
}
if (verbose) {
fprintf(STDOUT, "vos: Changed UUID with addresses:\n");
afs_uint32 volid;
afs_uint32 server;
afs_int32 code, i, same;
- struct nvldbentry entry, storeEntry;
+ struct nvldbentry entry, checkEntry, storeEntry;
afs_int32 vcode;
afs_int32 rwindex = 0;
afs_uint32 rwserver = 0;
PrintError("", code);
else
fprintf(STDERR, "Unknown volume ID or name '%s'\n",
- as->parms[0].items->data);
+ as->parms[2].items->data);
return -1;
}
if (as->parms[3].items)
force = 1;
+ memset(&entry, 0, sizeof(entry));
vcode = VLDB_GetEntryByID(volid, -1, &entry);
if (vcode) {
fprintf(STDERR,
"Could not fetch the entry for volume %lu from VLDB\n",
(unsigned long)volid);
- PrintError("convertROtoRW", code);
+ PrintError("convertROtoRW ", vcode);
return vcode;
}
/* use RO volid even if user specified RW or BK volid */
-
if (volid != entry.volumeId[ROVOL])
volid = entry.volumeId[ROVOL];
rwindex = i;
rwserver = entry.serverNumber[i];
rwpartition = entry.serverPartition[i];
- }
- if (entry.serverFlags[i] & ITSROVOL) {
+ if (roserver)
+ break;
+ } else if ((entry.serverFlags[i] & ITSROVOL) && !roserver) {
same = VLDB_IsSameAddrs(server, entry.serverNumber[i], &code);
if (code) {
fprintf(STDERR,
roindex = i;
roserver = entry.serverNumber[i];
ropartition = entry.serverPartition[i];
- break;
+ if (rwserver)
+ break;
}
}
}
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);
+ 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) {
"Converting RO volume %lu to RW volume failed with code %d\n",
(unsigned long)volid, code);
PrintError("convertROtoRW ", code);
- return -1;
+ 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.serverFlags[roindex] = 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) {
"Warning: volume converted, but vldb update failed with code %d!\n",
code);
}
+
+ error_exit:
vcode = UV_LockRelease(entry.volumeId[RWVOL]);
if (vcode) {
- PrintDiagnostics("unlock", vcode);
+ fprintf(STDERR,
+ "Unable to unlock volume %lu, code %d\n",
+ (unsigned long)entry.volumeId[RWVOL],vcode);
+ PrintError("", vcode);
}
return code;
}
if (rxConn == 0)
break;
rx_SetConnDeadTime(rxConn, rx_connDeadTime);
- if (rxConn->service)
- rxConn->service->connDeadTime = rx_connDeadTime;
+ if (rx_ServiceOf(rxConn))
+ rx_ServiceOf(rxConn)->connDeadTime = rx_connDeadTime;
}
avolid = vsu_GetVolumeID(as->parms[0].items->data, cstruct, &err);
{
char *tcell;
afs_int32 code;
- afs_int32 sauth;
+ int secFlags;
/* Initialize the ubik_client connection */
rx_SetRxDeadTime(90);
- cstruct = (struct ubik_client *)0;
+ cstruct = NULL;
+ secFlags = AFSCONF_SECOPTS_FALLBACK_NULL;
- sauth = 0;
tcell = NULL;
if (as->parms[12].items) /* if -cell specified */
tcell = as->parms[12].items->data;
- if (as->parms[14].items) /* -serverauth specified */
- sauth = 1;
+
+ if (as->parms[13].items)
+ secFlags |= AFSCONF_SECOPTS_NOAUTH;
+
+ if (as->parms[14].items) { /* -localauth specified */
+ secFlags |= AFSCONF_SECOPTS_LOCALAUTH;
+ confdir = AFSDIR_SERVER_ETC_DIRPATH;
+ }
+
if (as->parms[16].items /* -encrypt specified */
#ifdef AFS_NT40_ENV
|| win32_enableCrypt()
#endif /* AFS_NT40_ENV */
)
- vsu_SetCrypt(1);
- if ((code =
- vsu_ClientInit((as->parms[13].items != 0), confdir, tcell, sauth,
- &cstruct, UV_SetSecurity))) {
+ secFlags |= AFSCONF_SECOPTS_ALWAYSENCRYPT;
+
+ if (as->parms[18].items) /* -config flag set */
+ confdir = as->parms[18].items->data;
+
+ if ((code = vsu_ClientInit(confdir, tcell, secFlags, UV_SetSecurity,
+ &cstruct))) {
fprintf(STDERR, "could not initialize VLDB library (code=%lu) \n",
(unsigned long)code);
exit(1);
noresolve = 1;
else
noresolve = 0;
+
return 0;
}
"leave clone volume offline");
cmd_AddParm(ts, "-readonly", CMD_FLAG, CMD_OPTIONAL,
"make clone volume read-only, not readwrite");
+ cmd_AddParm(ts, "-readwrite", CMD_FLAG, CMD_OPTIONAL,
+ "make clone volume readwrite, not read-only");
COMMONPARMS;
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");
+ cmd_AddParm(ts, "-stayonline", CMD_FLAG, CMD_OPTIONAL,
+ "release to cloned temp vol, then clone back to repsite RO");
COMMONPARMS;
ts = cmd_CreateSyntax("dump", DumpVolumeCmd, NULL, "dump 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, "-volume", CMD_SINGLE, CMD_OPTIONAL, "volume name or ID");
- cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "report without updating");
+ cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "list what would be done, don't do it");
COMMONPARMS;
ts = cmd_CreateSyntax("syncserv", SyncServer, NULL,
"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, "report without updating");
+ cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "list what would be done, don't do it");
COMMONPARMS;
ts = cmd_CreateSyntax("examine", ExamineVolume, NULL,
"exclude common prefix volumes");
cmd_AddParm(ts, "-xprefix", CMD_LIST, CMD_OPTIONAL,
"negative prefix on volume(s)");
- cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "no action");
+ cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "list what would be done, don't do it");
COMMONPARMS;
ts = cmd_CreateSyntax("delentry", DeleteEntry, NULL,
"prefix of the volume whose VLDB entry is to be deleted");
cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "machine name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name");
- cmd_AddParm(ts, "-noexecute", CMD_FLAG, CMD_OPTIONAL,
- "no execute");
+ cmd_AddParm(ts, "-noexecute", CMD_FLAG, CMD_OPTIONAL|CMD_HIDDEN, "");
+ cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL,
+ "list what would be done, don't do it");
COMMONPARMS;
ts = cmd_CreateSyntax("partinfo", PartitionInfo, NULL,
git://git.openafs.org / openafs.git / blobdiff