("$Header$");
#include <sys/types.h>
+#include <string.h>
#ifdef AFS_NT40_ENV
#include <fcntl.h>
#include <io.h>
#endif
#include <errno.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
#include <lock.h>
#include <afs/stds.h>
#include <rx/xdr.h>
#include <signal.h>
#endif
#include "volser_prototypes.h"
+#include "vsutils_prototypes.h"
+#include "lockprocs_prototypes.h"
#ifdef HAVE_POSIX_REGEX
#include <regex.h>
#endif
+/* Local Prototypes */
+int PrintDiagnostics(char *astring, afs_int32 acode);
+int GetVolumeInfo(afs_int32 volid, afs_int32 *server, afs_int32 *part,
+ afs_int32 *voltype, struct nvldbentry *rentry);
+
struct tqElem {
afs_int32 volid;
struct tqElem *next;
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"); \
#define ERROR_EXIT(code) {error=(code); goto error_exit;}
-extern int verbose;
int rxInitDone = 0;
struct rx_connection *tconn;
afs_int32 tserver;
FD_ZERO(&in);
FD_SET((int)(ufd->handle), &in);
/* don't timeout if read blocks */
+#if defined(AFS_PTHREAD_ENV)
+ select(((int)(ufd->handle)) + 1, &in, 0, 0, 0);
+#else
IOMGR_Select(((int)(ufd->handle)) + 1, &in, 0, 0, 0);
#endif
+#endif
error = USD_READ(ufd, buffer, blksize, &nbytes);
if (error) {
fprintf(STDERR, "File system read failed\n");
USD_SEEK(ufd, filesize, SEEK_END, &currOffset);
hset64(filesize, hgethi(currOffset), hgetlo(currOffset)-sizeof(afs_uint32));
USD_SEEK(ufd, filesize, SEEK_SET, &currOffset);
- USD_READ(ufd, &buffer, sizeof(afs_uint32), &got);
+ 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;
FD_ZERO(&out);
FD_SET((int)(ufd->handle), &out);
/* don't timeout if write blocks */
+#if defined(AFS_PTHREAD_ENV)
+ select(((int)(ufd->handle)) + 1, &out, 0, 0, 0);
+#else
IOMGR_Select(((int)(ufd->handle)) + 1, 0, &out, 0, 0);
#endif
+#endif
error =
USD_WRITE(ufd, &buffer[bytesread - bytesleft], bytesleft, &w);
if (error) {
return (error);
}
-#if SIZEOF_TIME_T!=4
static char *
vos_ctime(afs_int32 *timep)
{
time_t foo = *timep;
return ctime(&foo);
}
-#else
-#define vos_ctime ctime
-#endif
static void
DisplayFormat(pntr, server, part, totalOK, totalNotOK, totalBusy, fast,
}
static void
-PostVolumeStats(entry)
- struct nvldbentry *entry;
+PostVolumeStats(struct nvldbentry *entry)
{
SubEnumerateEntry(entry);
/* Check for VLOP_ALLOPERS */
} /*XVolumeStats */
static void
-VolumeStats(pntr, entry, server, part, voltype)
- volintInfo *pntr;
- struct nvldbentry *entry;
- int voltype;
- afs_int32 server, part;
+VolumeStats_int(volintInfo *pntr, struct nvldbentry *entry, afs_int32 server,
+ afs_int32 part, int voltype)
{
int totalOK, totalNotOK, totalBusy;
}
/* command to forcibly remove a volume */
-static
-NukeVolume(as)
- register struct cmd_syndesc *as;
+static int
+NukeVolume(register struct cmd_syndesc *as)
{
register afs_int32 code;
afs_int32 volID, err;
* As advertised.
*------------------------------------------------------------------------
*/
-static
-ExamineVolume(as)
- register struct cmd_syndesc *as;
+static int
+ExamineVolume(register struct cmd_syndesc *as, void *arock)
{
struct nvldbentry entry;
afs_int32 vcode = 0;
EnumerateEntry(&entry);
} else
#endif /* FULL_LISTVOL_SWITCH */
- VolumeStats(pntr, &entry, aserver, apart, voltype);
+ VolumeStats_int(pntr, &entry, aserver, apart, voltype);
if ((voltype == BACKVOL) && !(entry.flags & BACK_EXISTS)) {
/* The VLDB says there is no backup volume yet we found one on disk */
* As advertised.
*------------------------------------------------------------------------
*/
-static
-SetFields(as)
- register struct cmd_syndesc *as;
+static int
+SetFields(register struct cmd_syndesc *as, void *arock)
{
struct nvldbentry entry;
afs_int32 vcode = 0;
* As advertised.
*------------------------------------------------------------------------
*/
-static
-volOnline(as)
- register struct cmd_syndesc *as;
+static int
+volOnline(register struct cmd_syndesc *as, void *arock)
{
afs_int32 server, partition, volid;
afs_int32 code, err = 0;
*------------------------------------------------------------------------
*/
static int
-volOffline(register struct cmd_syndesc *as)
+volOffline(register struct cmd_syndesc *as, void *arock)
{
afs_int32 server, partition, volid;
afs_int32 code, err = 0;
}
static int
-CreateVolume(register struct cmd_syndesc *as)
+CreateVolume(register struct cmd_syndesc *as, void *arock)
{
afs_int32 pnum;
char part[10];
return error;
}
-static
-DeleteVolume(as)
- struct cmd_syndesc *as;
+static int
+DeleteVolume(struct cmd_syndesc *as, void *arock)
{
afs_int32 err, code = 0;
afs_int32 server = 0, partition = -1, volid;
#define TESTM 0 /* set for move space tests, clear for production */
static
-MoveVolume(as)
- register struct cmd_syndesc *as;
+MoveVolume(register struct cmd_syndesc *as, void *arock)
{
afs_int32 volid, fromserver, toserver, frompart, topart;
afs_int32 flags, code, err;
char fromPartName[10], toPartName[10];
- struct diskPartition partition; /* for space check */
+ struct diskPartition64 partition; /* for space check */
volintInfo *p;
volid = vsu_GetVolumeID(as->parms[0].items->data, cstruct, &err);
* check target partition for space to move volume
*/
- code = UV_PartitionInfo(toserver, toPartName, &partition);
+ code = UV_PartitionInfo64(toserver, toPartName, &partition);
if (code) {
fprintf(STDERR, "vos: cannot access partition %s\n", toPartName);
exit(1);
return 0;
}
-static
-CopyVolume(as)
- register struct cmd_syndesc *as;
+static int
+CopyVolume(register struct cmd_syndesc *as, void *arock)
{
afs_int32 volid, fromserver, toserver, frompart, topart, code, err, flags;
char fromPartName[10], toPartName[10], *tovolume;
struct nvldbentry entry;
- struct diskPartition partition; /* for space check */
+ struct diskPartition64 partition; /* for space check */
volintInfo *p;
volid = vsu_GetVolumeID(as->parms[0].items->data, cstruct, &err);
* check target partition for space to move volume
*/
- code = UV_PartitionInfo(toserver, toPartName, &partition);
+ code = UV_PartitionInfo64(toserver, toPartName, &partition);
if (code) {
fprintf(STDERR, "vos: cannot access partition %s\n", toPartName);
exit(1);
}
-static
-ShadowVolume(as)
- register struct cmd_syndesc *as;
+static int
+ShadowVolume(register struct cmd_syndesc *as, void *arock)
{
afs_int32 volid, fromserver, toserver, frompart, topart, tovolid;
afs_int32 code, err, flags;
char fromPartName[10], toPartName[10], toVolName[32], *tovolume;
- struct nvldbentry entry;
- struct diskPartition partition; /* for space check */
+ struct diskPartition64 partition; /* for space check */
volintInfo *p, *q;
p = (volintInfo *) 0;
* check target partition for space to move volume
*/
- code = UV_PartitionInfo(toserver, toPartName, &partition);
+ code = UV_PartitionInfo64(toserver, toPartName, &partition);
if (code) {
fprintf(STDERR, "vos: cannot access partition %s\n", toPartName);
exit(1);
}
-static
-CloneVolume(as)
- register struct cmd_syndesc *as;
+static int
+CloneVolume(register struct cmd_syndesc *as, void *arock)
{
afs_int32 server, part, volid, cloneid, voltype;
char partName[10], *volname;
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",
return code;
}
MapPartIdIntoName(part, partName);
- fprintf(STDOUT, "Created clone for volume %lu\n",
+ fprintf(STDOUT, "Created clone for volume %s\n",
as->parms[0].items->data);
return 0;
}
-static
-BackupVolume(as)
- register struct cmd_syndesc *as;
+static int
+BackupVolume(register struct cmd_syndesc *as, void *arock)
{
afs_int32 avolid, aserver, apart, vtype, code, err;
struct nvldbentry entry;
return 0;
}
-static
-ReleaseVolume(as)
- register struct cmd_syndesc *as;
+static int
+ReleaseVolume(register struct cmd_syndesc *as, void *arock)
{
struct nvldbentry entry;
}
static
-DumpVolume(as)
- register struct cmd_syndesc *as;
-
+DumpVolume(register struct cmd_syndesc *as, void *arock)
{
afs_int32 avolid, aserver, apart, voltype, fromdate = 0, code, err, i, flags;
char filename[MAXPATHLEN];
#define TS_KEEP 2
#define TS_NEW 3
-static
-RestoreVolume(as)
- register struct cmd_syndesc *as;
-
+static int
+RestoreVolume(register struct cmd_syndesc *as, void *arock)
{
afs_int32 avolid, aparentid, aserver, apart, code, vcode, err;
afs_int32 aoverwrite = ASK;
default:
restoreflags |= RV_LUDUMP;
}
+ if (as->parms[10].items) {
+ restoreflags |= RV_NODEL;
+ }
+
code =
UV_RestoreVolume2(aserver, apart, avolid, aparentid,
return 0;
}
-static
-LockReleaseCmd(as)
- register struct cmd_syndesc *as;
-
+static int
+LockReleaseCmd(register struct cmd_syndesc *as, void *arock)
{
afs_int32 avolid, code, err;
return 0;
}
-static
-AddSite(as)
- register struct cmd_syndesc *as;
+static int
+AddSite(register struct cmd_syndesc *as, void *arock)
{
- afs_int32 avolid, aserver, apart, code, err;
+ afs_int32 avolid, aserver, apart, code, err, valid = 0;
char apartName[10], avolname[VOLSER_MAXVOLNAME + 1];
vsu_ExtractName(avolname, as->parms[2].items->data);;
as->parms[1].items->data);
exit(1);
}
- code = UV_AddSite(aserver, apart, avolid);
+ if (as->parms[3].items) {
+ valid = 1;
+ }
+ code = UV_AddSite(aserver, apart, avolid, valid);
if (code) {
PrintDiagnostics("addsite", code);
exit(1);
return 0;
}
-static
-RemoveSite(as)
- register struct cmd_syndesc *as;
+static int
+RemoveSite(register struct cmd_syndesc *as, void *arock)
{
afs_int32 avolid, aserver, apart, code, err;
return 0;
}
-static
-ChangeLocation(as)
- register struct cmd_syndesc *as;
+static int
+ChangeLocation(register struct cmd_syndesc *as, void *arock)
{
afs_int32 avolid, aserver, apart, code, err;
char apartName[10];
return 0;
}
-static
-ListPartitions(as)
- register struct cmd_syndesc *as;
+static int
+ListPartitions(register struct cmd_syndesc *as, void *arock)
{
afs_int32 aserver, code;
struct partList dummyPartList;
*------------------------------------------------------------------------*/
static
-ListVolumes(as)
- register struct cmd_syndesc *as;
+ListVolumes(register struct cmd_syndesc *as, void *arock)
{
afs_int32 apart, int32list, fast;
afs_int32 aserver, code;
return 0;
}
-static
-SyncVldb(as)
- register struct cmd_syndesc *as;
+static int
+SyncVldb(register struct cmd_syndesc *as, void *arock)
{
afs_int32 pnum = 0, code; /* part name */
char part[10];
}
}
+ if (as->parms[3].items) {
+ flags |= 2; /* don't update */
+ }
+
if (as->parms[2].items) {
/* Synchronize an individual volume */
volname = as->parms[2].items->data;
if (tserver) {
fprintf(STDOUT, " with state of server %s", as->parms[0].items->data);
}
- if (flags) {
+ if (flags & 1) {
MapPartIdIntoName(pnum, part);
fprintf(STDOUT, " partition %s\n", part);
}
return 0;
}
-static
-SyncServer(as)
- register struct cmd_syndesc *as;
-
+static int
+SyncServer(register struct cmd_syndesc *as, void *arock)
{
afs_int32 pnum, code; /* part name */
char part[10];
pnum = -1;
}
+ if (as->parms[2].items) {
+ flags |= 2; /* don't update */
+ }
code = UV_SyncServer(tserver, pnum, flags, 0 /*unused */ );
if (code) {
PrintDiagnostics("syncserv", code);
exit(1);
}
- if (flags) {
+ if (flags & 1) {
MapPartIdIntoName(pnum, part);
fprintf(STDOUT, "Server %s partition %s synchronized with VLDB\n",
as->parms[0].items->data, part);
return 0;
}
-static
-VolumeZap(as)
- register struct cmd_syndesc *as;
-
+static int
+VolumeZap(register struct cmd_syndesc *as, void *arock)
{
struct nvldbentry entry;
afs_int32 volid, code, server, part, zapbackupid = 0, backupid = 0, err;
return 0;
}
-static
-VolserStatus(as)
- register struct cmd_syndesc *as;
-
+static int
+VolserStatus(register struct cmd_syndesc *as, void *arock)
{
afs_int32 server, code;
transDebugInfo *pntr, *oldpntr;
return 0;
}
-static
-RenameVolume(as)
- register struct cmd_syndesc *as;
+static int
+RenameVolume(register struct cmd_syndesc *as, void *arock)
{
afs_int32 code1, code2, code;
struct nvldbentry entry;
return 0;
}
-GetVolumeInfo(volid, server, part, voltype, rentry)
- afs_int32 *server, volid, *part, *voltype;
- register struct nvldbentry *rentry;
+int
+GetVolumeInfo(afs_int32 volid, afs_int32 *server, afs_int32 *part, afs_int32 *voltype,
+ struct nvldbentry *rentry)
{
afs_int32 vcode;
int i, index = -1;
return -1;
}
-static
-DeleteEntry(as)
- register struct cmd_syndesc *as;
-
+static int
+DeleteEntry(register struct cmd_syndesc *as, void *arock)
{
afs_int32 apart;
afs_int32 avolid;
}
*/
-static
-ListVLDB(as)
- struct cmd_syndesc *as;
+static int
+ListVLDB(struct cmd_syndesc *as, void *arock)
{
afs_int32 apart;
afs_int32 aserver, code;
return 0;
}
-static
-BackSys(as)
- register struct cmd_syndesc *as;
+static int
+BackSys(register struct cmd_syndesc *as, void *arock)
{
afs_int32 apart = 0, avolid;
afs_int32 aserver = 0, code, aserver1, apart1;
return 0;
}
-static
-UnlockVLDB(as)
- register struct cmd_syndesc *as;
+static int
+UnlockVLDB(register struct cmd_syndesc *as, void *arock)
{
afs_int32 apart;
afs_int32 aserver, code;
return output;
}
-static
-PartitionInfo(as)
- register struct cmd_syndesc *as;
+static int
+PartitionInfo(register struct cmd_syndesc *as, void *arock)
{
afs_int32 apart;
afs_int32 aserver, code;
char pname[10];
- struct diskPartition partition;
+ struct diskPartition64 partition;
struct partList dummyPartList;
int i, cnt;
int printSummary=0, sumPartitions=0;
- afs_uint64 sumFree, sumStorage, tmp;
+ afs_uint64 sumFree, sumStorage;
ZeroInt64(sumFree);
ZeroInt64(sumStorage);
for (i = 0; i < cnt; i++) {
if (dummyPartList.partFlags[i] & PARTVALID) {
MapPartIdIntoName(dummyPartList.partId[i], pname);
- code = UV_PartitionInfo(aserver, pname, &partition);
+ code = UV_PartitionInfo64(aserver, pname, &partition);
if (code) {
fprintf(STDERR, "Could not get information on partition %s\n",
pname);
exit(1);
}
fprintf(STDOUT,
- "Free space on partition %s: %d K blocks out of total %d\n",
+ "Free space on partition %s: %lld K blocks out of total %lld\n",
pname, partition.free, partition.minFree);
sumPartitions++;
- FillInt64(tmp,0,partition.free);
- AddUInt64(sumFree,tmp,&sumFree);
- FillInt64(tmp,0,partition.minFree);
- AddUInt64(sumStorage,tmp,&sumStorage);
+ AddUInt64(sumFree,partition.free,&sumFree);
+ AddUInt64(sumStorage,partition.minFree,&sumStorage);
}
}
if (printSummary) {
return 0;
}
-static
-ChangeAddr(as)
- register struct cmd_syndesc *as;
-
+static int
+ChangeAddr(register struct cmd_syndesc *as, void *arock)
{
afs_int32 ip1, ip2, vcode;
int remove = 0;
static void
print_addrs(const bulkaddrs * addrs, const afsUUID * m_uuid, int nentries,
- int print, int noresolve)
+ int print)
{
afs_int32 vcode;
afs_int32 i, j;
m_addrs.bulkaddrs_len = 0;
vcode =
ubik_VL_GetAddrsU(cstruct, 0, &m_attrs, &m_uuid,
- &vlcb, &m_nentries, &m_addrs);
+ (afs_int32 *)&vlcb, &m_nentries, &m_addrs);
if (vcode) {
fprintf(STDERR,
"vos: could not list the multi-homed server addresses\n");
return;
}
-static
-ListAddrs(as)
- register struct cmd_syndesc *as;
+static int
+ListAddrs(register struct cmd_syndesc *as, void *arock)
{
afs_int32 vcode;
- afs_int32 i, noresolve = 0, printuuid = 0;
+ afs_int32 i, printuuid = 0;
struct VLCallBack vlcb;
afs_int32 nentries;
bulkaddrs m_addrs;
m_attrs.ipaddr = ntohl(saddr);
}
if (as->parms[2].items) {
- noresolve = 1;
- }
- if (as->parms[3].items) {
printuuid = 1;
}
return (vcode);
}
- print_addrs(&m_addrs, &m_uuid, m_nentries, printuuid, noresolve);
+ print_addrs(&m_addrs, &m_uuid, m_nentries, printuuid);
i++;
if ((as->parms[1].items) || (as->parms[0].items) || (i > nentries))
return 0;
}
-static
-LockEntry(as)
- register struct cmd_syndesc *as;
-
+static int
+LockEntry(register struct cmd_syndesc *as, void *arock)
{
afs_int32 avolid, vcode, err;
return 0;
}
-static
-ConvertRO(as)
- register struct cmd_syndesc *as;
-
+static int
+ConvertRO(register struct cmd_syndesc *as, void *arock)
{
afs_int32 partition = -1;
afs_int32 server, volid, code, i, same;
return code;
}
-static
-Sizes(as)
- register struct cmd_syndesc *as;
+static int
+Sizes(register struct cmd_syndesc *as, void *arock)
{
afs_int32 avolid, aserver, apart, voltype, fromdate = 0, code, err, i;
struct nvldbentry entry;
return 0;
}
-PrintDiagnostics(astring, acode)
- char *astring;
- afs_int32 acode;
+int
+PrintDiagnostics(char *astring, afs_int32 acode)
{
if (acode == EACCES) {
fprintf(STDERR,
}
-static
-MyBeforeProc(as, arock)
- struct cmd_syndesc *as;
- char *arock;
+static int
+MyBeforeProc(struct cmd_syndesc *as, void *arock)
{
register char *tcell;
register afs_int32 code;
verbose = 1;
else
verbose = 0;
+ if (as->parms[17].items) /* -noresolve flag set */
+ noresolve = 1;
+ else
+ noresolve = 0;
return 0;
}
cmd_SetBeforeProc(MyBeforeProc, NULL);
- ts = cmd_CreateSyntax("create", CreateVolume, 0, "create a new volume");
+ ts = cmd_CreateSyntax("create", CreateVolume, NULL, "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");
#endif
COMMONPARMS;
- ts = cmd_CreateSyntax("remove", DeleteVolume, 0, "delete a volume");
+ ts = cmd_CreateSyntax("remove", DeleteVolume, NULL, "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, 0, "move a volume");
+ ts = cmd_CreateSyntax("move", MoveVolume, NULL, "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, 0, "copy a volume");
+ ts = cmd_CreateSyntax("copy", CopyVolume, NULL, "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, 0,
+ ts = cmd_CreateSyntax("shadow", ShadowVolume, NULL,
"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, 0,
+ ts = cmd_CreateSyntax("backup", BackupVolume, NULL,
"make backup of a volume");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
COMMONPARMS;
- ts = cmd_CreateSyntax("clone", CloneVolume, 0,
+ ts = cmd_CreateSyntax("clone", CloneVolume, NULL,
"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 read-only, not readwrite");
COMMONPARMS;
- ts = cmd_CreateSyntax("release", ReleaseVolume, 0, "release a volume");
+ 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");
COMMONPARMS;
- ts = cmd_CreateSyntax("dump", DumpVolume, 0, "dump a volume");
+ ts = cmd_CreateSyntax("dump", DumpVolume, NULL, "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", RestoreVolume, 0, "restore a volume");
+ ts = cmd_CreateSyntax("restore", RestoreVolume, NULL, "restore a 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, "name of volume to be restored");
"dump | keep | new");
cmd_AddParm(ts, "-lastupdate", CMD_SINGLE, CMD_OPTIONAL,
"dump | keep | new");
+ cmd_AddParm(ts, "-nodelete", CMD_FLAG, CMD_OPTIONAL,
+ "do not delete old site when restoring to a new site");
COMMONPARMS;
- ts = cmd_CreateSyntax("unlock", LockReleaseCmd, 0,
+ ts = cmd_CreateSyntax("unlock", LockReleaseCmd, NULL,
"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, 0,
+ ts = cmd_CreateSyntax("changeloc", ChangeLocation, NULL,
"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, 0, "add a replication site");
+ ts = cmd_CreateSyntax("addsite", AddSite, NULL, "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, "-id", CMD_SINGLE, 0, "volume name or ID");
+ cmd_AddParm(ts, "-valid", CMD_FLAG, CMD_OPTIONAL | CMD_HIDE, "publish as an up-to-date site in VLDB");
COMMONPARMS;
- ts = cmd_CreateSyntax("remsite", RemoveSite, 0,
+ ts = cmd_CreateSyntax("remsite", RemoveSite, NULL,
"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, 0, "list partitions");
+ ts = cmd_CreateSyntax("listpart", ListPartitions, NULL, "list partitions");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name");
COMMONPARMS;
- ts = cmd_CreateSyntax("listvol", ListVolumes, 0,
+ ts = cmd_CreateSyntax("listvol", ListVolumes, NULL,
"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");
#endif /* FULL_LISTVOL_SWITCH */
COMMONPARMS;
- ts = cmd_CreateSyntax("syncvldb", SyncVldb, 0,
+ ts = cmd_CreateSyntax("syncvldb", SyncVldb, NULL,
"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, "-volume", CMD_SINGLE, CMD_OPTIONAL, "volume name or ID");
+ cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "report without updating");
COMMONPARMS;
- ts = cmd_CreateSyntax("syncserv", SyncServer, 0,
+ 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");
COMMONPARMS;
- ts = cmd_CreateSyntax("examine", ExamineVolume, 0,
+ ts = cmd_CreateSyntax("examine", ExamineVolume, NULL,
"everything about the volume");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
cmd_AddParm(ts, "-extended", CMD_FLAG, CMD_OPTIONAL,
COMMONPARMS;
cmd_CreateAlias(ts, "volinfo");
- ts = cmd_CreateSyntax("setfields", SetFields, 0,
+ ts = cmd_CreateSyntax("setfields", SetFields, NULL,
"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, 0, (char *)CMD_HIDDEN);
+ ts = cmd_CreateSyntax("offline", volOffline, NULL, (char *)CMD_HIDDEN);
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, 0, (char *)CMD_HIDDEN);
+ ts = cmd_CreateSyntax("online", volOnline, NULL, (char *)CMD_HIDDEN);
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, 0,
+ ts = cmd_CreateSyntax("zap", VolumeZap, NULL,
"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, 0,
+ ts = cmd_CreateSyntax("status", VolserStatus, NULL,
"report on volser status");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name");
COMMONPARMS;
- ts = cmd_CreateSyntax("rename", RenameVolume, 0, "rename a volume");
+ ts = cmd_CreateSyntax("rename", RenameVolume, NULL, "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, 0,
+ ts = cmd_CreateSyntax("listvldb", ListVLDB, NULL,
"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, 0, "en masse backups");
+ ts = cmd_CreateSyntax("backupsys", BackSys, NULL, "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, "no action");
COMMONPARMS;
- ts = cmd_CreateSyntax("delentry", DeleteEntry, 0,
+ ts = cmd_CreateSyntax("delentry", DeleteEntry, NULL,
"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,
"no execute");
COMMONPARMS;
- ts = cmd_CreateSyntax("partinfo", PartitionInfo, 0,
+ ts = cmd_CreateSyntax("partinfo", PartitionInfo, NULL,
"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, 0,
+ ts = cmd_CreateSyntax("unlockvldb", UnlockVLDB, NULL,
"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, 0,
+ ts = cmd_CreateSyntax("lock", LockEntry, NULL,
"lock VLDB entry for a volume");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
COMMONPARMS;
- ts = cmd_CreateSyntax("changeaddr", ChangeAddr, 0,
+ ts = cmd_CreateSyntax("changeaddr", ChangeAddr, NULL,
"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");
"remove the IP address from the VLDB");
COMMONPARMS;
- ts = cmd_CreateSyntax("listaddrs", ListAddrs, 0,
+ ts = cmd_CreateSyntax("listaddrs", ListAddrs, NULL,
"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");
- cmd_AddParm(ts, "-noresolve", CMD_FLAG, CMD_OPTIONAL,
- "don't resolve addresses");
cmd_AddParm(ts, "-printuuid", CMD_FLAG, CMD_OPTIONAL,
"print uuid of hosts");
COMMONPARMS;
- ts = cmd_CreateSyntax("convertROtoRW", ConvertRO, 0,
+ ts = cmd_CreateSyntax("convertROtoRW", ConvertRO, NULL,
"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, 0,
+ ts = cmd_CreateSyntax("size", Sizes, NULL,
"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");
git://git.openafs.org / openafs.git / blobdiff