External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 04:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

virLockDaemonPostExecRestart: Refactor cleanup

Browse Source 
Move the unlinking of the state file earlier and get rid of the cleanup
label.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-12-01 09:25:25 +01:00
parent bec4f09fff
commit fe51612611
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/locking/lock_daemon.c
View File

@ -608,59 +608,57 @@ virLockDaemonPostExecRestart(const char *state_file,
{
const char *gotmagic;
g_autofree char *wantmagic = NULL;
int ret = -1;
g_autofree char *state = NULL;
g_autoptr(virJSONValue) object = NULL;
int rc;
VIR_DEBUG("Running post-restart exec");
if (!virFileExists(state_file)) {
VIR_DEBUG("No restart state file %s present",
state_file);
ret = 0;
goto cleanup;
return 0;
}
if (virFileReadAll(state_file,
1024 * 1024 * 10, /* 10 MB */
&state) < 0)
goto cleanup;
rc = virFileReadAll(state_file,
1024 * 1024 * 10, /* 10 MB */
&state);
unlink(state_file);
if (rc < 0)
return -1;
VIR_DEBUG("Loading state %s", state);
if (!(object = virJSONValueFromString(state)))
goto cleanup;
return -1;
gotmagic = virJSONValueObjectGetString(object, "magic");
if (!gotmagic) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Missing magic data in JSON document"));
goto cleanup;
return -1;
}
if (!(wantmagic = virLockDaemonGetExecRestartMagic()))
goto cleanup;
return -1;
if (STRNEQ(gotmagic, wantmagic)) {
VIR_WARN("Found restart exec file with old magic %s vs wanted %s",
gotmagic, wantmagic);
ret = 0;
goto cleanup;
return 0;
}
/* Re-claim PID file now as we will not be daemonizing */
if (pid_file &&
(*pid_file_fd = virPidFileAcquirePath(pid_file, false, getpid())) < 0)
goto cleanup;
return -1;
if (!(lockDaemon = virLockDaemonNewPostExecRestart(object, privileged)))
goto cleanup;
return -1;
ret = 1;
cleanup:
unlink(state_file);
return ret;
return 1;
}