jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 15:00:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vos: Open dump file before deleting volume in vos restore

Browse Source 
When doing a full volume restore (vos restore -overwrite full), the
target volume is deleted by UV_RestoreVolume2() before the dump file is
opened.

After the target volume is deleted, UV_RestoreVolume2() calls the
WriteData() callback function to open the dump file and send the volume
data to the volume server.  If the volume dump file cannot be opened at
that point, then the volume restore operation is aborted before sending
any dump data, but the target volume was unnecessarily destroyed.

Currently, a precheck is done by the FileExists() function, but the file
handled acquired by FileExists() is discarded, and a new file handle is
opened in the WriteData() function.

To improve this situation, change the sequence to open the dump file
before calling UV_RestoreVolume2() and pass the opened file handle,
instead of the filename string, and close the file handle after
UV_RestoreVolume2() returns.

The FileExists() function is no longer needed since we no longer discard
the opened file handle when processing the vos restore arguments, so
remove the now unused FileExists() function.

Also remove the afilename string from RestoreVolumeCmd() and pass the
opened file handle to UV_RestoreVolume2() instead.

Because of this refactoring, we no longer report an error when the
USC_CLOSE of the dump file handle fails, and we no longer run
USD_IOCTL_GETSIZE when opening the dump file (and exit with an error if
it fails.)

Change-Id: I6092e43a5dcaa795191143b65388ad1117b582f3
Reviewed-on: https://gerrit.openafs.org/15069
Reviewed-by: Cheyenne Wills <cwills@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
This commit is contained in:
Michael Meffie 2022-07-15 13:47:42 -04:00 committed by Andrew Deason
parent 55f27294a3
commit a193d76070
1 changed files with 15 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/volser/vos.c
View File

@ -147,26 +147,6 @@ qGet(struct tqHead *ahead, afs_uint32 *volid)
return;
}
/* returns 1 if <filename> exists else 0 */
static int
FileExists(char *filename)
{
usd_handle_t ufd;
int code;
afs_int64 size;
code = usd_Open(filename, USD_OPEN_RDONLY, 0, &ufd);
if (code) {
return 0;
}
code = USD_IOCTL(ufd, USD_IOCTL_GETSIZE, &size);
USD_CLOSE(ufd);
if (code) {
return 0;
}
return 1;
}
/* returns 1 if <name> doesnot end in .readonly or .backup, else 0 */
static int
VolNameOK(char *name)
@ -368,24 +348,11 @@ SendFile(usd_handle_t ufd, struct rx_call *call)
static afs_int32
WriteData(struct rx_call *call, void *rock)
{
char *filename = (char *) rock;
usd_handle_t ufd = NULL;
usd_handle_t ufd = (usd_handle_t)rock;
afs_int32 error = 0;
afs_int32 code;
int is_seekable = 0;
if (!filename || !*filename) {
usd_StandardInput(&ufd);
} else {
code = usd_Open(filename, USD_OPEN_RDONLY, 0, &ufd);
if (code) {
fprintf(STDERR, "Could not access file '%s': %s\n", filename,
afs_error_message(code));
error = VOLSERBADOP;
goto wfail;
}
}
/* Test if we have a valid dump. */
code = USD_IOCTL(ufd, USD_IOCTL_ISSEEKABLE, &is_seekable);
if (code != 0) {
@ -440,14 +407,6 @@ WriteData(struct rx_call *call, void *rock)
goto wfail;
}
wfail:
if (ufd != NULL) {
code = USD_CLOSE(ufd);
if (code) {
fprintf(STDERR, "Could not close dump file handle; code=%d\n", code);
if (!error)
error = code;
}
}
return error;
}
@ -3051,9 +3010,10 @@ RestoreVolumeCmd(struct cmd_syndesc *as, void *arock)
afs_int32 acreation = 0, alastupdate = 0;
int restoreflags = 0;
int readonly = 0, offline = 0, voltype = RWVOL;
char afilename[MAXPATHLEN], avolname[VOLSER_MAXVOLNAME + 1], apartName[10];
char avolname[VOLSER_MAXVOLNAME + 1], apartName[10];
char volname[VOLSER_MAXVOLNAME + 1];
struct nvldbentry entry;
usd_handle_t ufd = NULL;
aparentid = 0;
if (as->parms[4].items) {
@ -3163,9 +3123,11 @@ RestoreVolumeCmd(struct cmd_syndesc *as, void *arock)
exit(1);
}
if (as->parms[3].items) {
strcpy(afilename, as->parms[3].items->data);
if (!FileExists(afilename)) {
fprintf(STDERR, "Can't access file %s\n", afilename);
char *filename = as->parms[3].items->data;
code = usd_Open(filename, USD_OPEN_RDONLY, 0, &ufd);
if (code != 0) {
fprintf(STDERR, "Cannot open dump file %s; code=%d\n", filename, code);
exit(1);
}
} else {
@ -3173,7 +3135,11 @@ RestoreVolumeCmd(struct cmd_syndesc *as, void *arock)
fprintf(STDERR, "Can't read dump from tty.\n");
exit(1);
}
strcpy(afilename, "");
code = usd_StandardInput(&ufd);
if (code != 0) {
fprintf(STDERR, "Cannot open stdin file descriptor; code=%d\n", code);
exit(1);
}
}
/* Check if volume exists or not */
@ -3323,7 +3289,8 @@ RestoreVolumeCmd(struct cmd_syndesc *as, void *arock)
code =
UV_RestoreVolume2(aserver, apart, avolid, aparentid,
avolname, restoreflags, WriteData, afilename);
avolname, restoreflags, WriteData, ufd);
USD_CLOSE(ufd);
if (code) {
PrintDiagnostics("restore", code);
exit(1);