From patchwork Thu Nov 8 12:36:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomoki Sekiyama X-Patchwork-Id: 197829 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 241D12C00A4 for ; Thu, 8 Nov 2012 23:36:16 +1100 (EST) Received: from localhost ([::1]:37540 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TWRLC-0001Yg-6f for incoming@patchwork.ozlabs.org; Thu, 08 Nov 2012 07:36:14 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55237) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TWRL3-0001YR-7y for qemu-devel@nongnu.org; Thu, 08 Nov 2012 07:36:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TWRKw-0006jg-T9 for qemu-devel@nongnu.org; Thu, 08 Nov 2012 07:36:05 -0500 Received: from mail7.hitachi.co.jp ([133.145.228.42]:40562) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TWRKw-0006j3-8B for qemu-devel@nongnu.org; Thu, 08 Nov 2012 07:35:58 -0500 Received: from mlsv4.hitachi.co.jp (unknown [133.144.234.166]) by mail7.hitachi.co.jp (Postfix) with ESMTP id 9E4ED37AC2; Thu, 8 Nov 2012 21:35:54 +0900 (JST) Received: from mfilter03.hitachi.co.jp by mlsv4.hitachi.co.jp (8.13.1/8.13.1) id qA8CZsKW006974; Thu, 8 Nov 2012 21:35:54 +0900 Received: from vshuts01.hitachi.co.jp (vshuts01.hitachi.co.jp [10.201.6.83]) by mfilter03.hitachi.co.jp (Switch-3.3.4/Switch-3.3.4) with ESMTP id qA8CZr0F009718; Thu, 8 Nov 2012 21:35:54 +0900 Received: from vshuts2.hitachi.co.jp (unknown [10.201.6.71]) by vshuts01.hitachi.co.jp (Postfix) with ESMTP id 8173F2F0084; Thu, 8 Nov 2012 21:35:53 +0900 (JST) X-AuditID: b753bd60-94fe2ba000004744-75-509ba7290830 Received: from hsdlmain.sdl.hitachi.co.jp (unknown [133.144.14.194]) by vshuts2.hitachi.co.jp (Symantec Mail Security) with ESMTP id 50FD18B038D; Thu, 8 Nov 2012 21:35:53 +0900 (JST) Received: from hsdlvgate2.sdl.hitachi.co.jp by hsdlmain.sdl.hitachi.co.jp (8.13.8/3.7W11021512) id qA8CZrsP000988; Thu, 8 Nov 2012 21:35:53 +0900 X-AuditID: b753bd60-94fe2ba000004744-75-509ba7290830 Received: from sdl99w.sdl.hitachi.co.jp (sdl99w.sdl.hitachi.co.jp [133.144.14.250]) by hsdlvgate2.sdl.hitachi.co.jp (Symantec Mail Security) with ESMTP id 185AE236561; Thu, 8 Nov 2012 21:35:53 +0900 (JST) Received: from mailc.sdl.hitachi.co.jp (sdl99c.sdl.hitachi.co.jp [133.144.14.198]) by sdl99w.sdl.hitachi.co.jp (Postfix) with ESMTP id BC12453C158; Thu, 8 Nov 2012 21:35:55 +0900 (JST) Received: from [127.0.0.1] (unknown [10.232.28.238]) by mailc.sdl.hitachi.co.jp (Postfix) with ESMTP id 13F00495BBC; Thu, 8 Nov 2012 21:35:53 +0900 (JST) Message-ID: <509BA74D.5080709@hitachi.com> Date: Thu, 08 Nov 2012 21:36:29 +0900 From: Tomoki Sekiyama User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:16.0) Gecko/20121005 Thunderbird/16.0 MIME-Version: 1.0 To: qemu-devel@nongnu.org X-Brightmail-Tracker: AAAAAA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 133.145.228.42 Cc: mdroth@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 1/2] qemu-ga: execute script to quiesce the guest on fsfreeze-freeze/thaw X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org To use the online disk snapshot for online-backup, application-level consistency of the snapshot image is required. However, currently the guest agent can provide only filesystem-level consistency, and the snapshot may contain dirty data, for example, incomplete transactions. This patch provides the opportunity to quiesce applications before snapshot is taken. When the qemu-ga receives fsfreeze-freeze command, the script specified in --fsfreeze-script option is executed with "freeze" argument before the filesystem is frozen. For fsfreeze-thaw command, the script is executed with "thaw" argument after the filesystem is thawed. Signed-off-by: Tomoki Sekiyama --- qemu-ga.c | 42 +++++++++++++++++++++++++++++++++++++++++- qga/commands-posix.c | 34 ++++++++++++++++++++++++++++++++++ qga/guest-agent-core.h | 2 ++ 3 files changed, 77 insertions(+), 1 deletion(-) diff --git a/qemu-ga.c b/qemu-ga.c index 9b59a52..7cb682e 100644 --- a/qemu-ga.c +++ b/qemu-ga.c @@ -34,6 +34,12 @@ #include "qga/service-win32.h" #include #endif +#ifdef __linux__ +#include +#ifdef FIFREEZE +#define CONFIG_FSFREEZE +#endif +#endif #ifndef _WIN32 #define QGA_VIRTIO_PATH_DEFAULT "/dev/virtio-ports/org.qemu.guest_agent.0" @@ -42,6 +48,9 @@ #endif #define QGA_STATEDIR_DEFAULT CONFIG_QEMU_LOCALSTATEDIR "/run" #define QGA_PIDFILE_DEFAULT QGA_STATEDIR_DEFAULT "/qemu-ga.pid" +#ifdef CONFIG_FSFREEZE +#define QGA_FSFREEZE_SCRIPT_DEFAULT CONFIG_QEMU_CONFDIR "/fsfreeze.sh" +#endif #define QGA_SENTINEL_BYTE 0xFF struct GAState { @@ -64,6 +73,9 @@ struct GAState { const char *log_filepath; const char *pid_filepath; } deferred_options; +#ifdef CONFIG_FSFREEZE + const char *fsfreeze_script; +#endif }; struct GAState *ga_state; @@ -153,6 +165,10 @@ static void usage(const char *cmd) " %s)\n" " -l, --logfile set logfile path, logs to stderr by default\n" " -f, --pidfile specify pidfile (default is %s)\n" +#ifdef CONFIG_FSFREEZE +" -F, --fsfreeze_script\n" +" specify fsfreeze script (default is %s)\n" +#endif " -t, --statedir specify dir to store state information (absolute paths\n" " only, default is %s)\n" " -v, --verbose log extra debugging information\n" @@ -167,6 +183,9 @@ static void usage(const char *cmd) "\n" "Report bugs to \n" , cmd, QEMU_VERSION, QGA_VIRTIO_PATH_DEFAULT, QGA_PIDFILE_DEFAULT, +#ifdef CONFIG_FSFREEZE + QGA_FSFREEZE_SCRIPT_DEFAULT, +#endif QGA_STATEDIR_DEFAULT); } @@ -401,6 +420,13 @@ void ga_unset_frozen(GAState *s) } } +#ifdef CONFIG_FSFREEZE +const char *ga_fsfreeze_script(GAState *s) +{ + return s->fsfreeze_script; +} +#endif + static void become_daemon(const char *pidfile) { #ifndef _WIN32 @@ -678,10 +704,13 @@ VOID WINAPI service_main(DWORD argc, TCHAR *argv[]) int main(int argc, char **argv) { - const char *sopt = "hVvdm:p:l:f:b:s:t:"; + const char *sopt = "hVvdm:p:l:f:F:b:s:t:"; const char *method = NULL, *path = NULL; const char *log_filepath = NULL; const char *pid_filepath = QGA_PIDFILE_DEFAULT; +#ifdef CONFIG_FSFREEZE + const char *fsfreeze_script = QGA_FSFREEZE_SCRIPT_DEFAULT; +#endif const char *state_dir = QGA_STATEDIR_DEFAULT; #ifdef _WIN32 const char *service = NULL; @@ -691,6 +720,9 @@ int main(int argc, char **argv) { "version", 0, NULL, 'V' }, { "logfile", 1, NULL, 'l' }, { "pidfile", 1, NULL, 'f' }, +#ifdef CONFIG_FSFREEZE + { "fsfreeze-script", 1, NULL, 'F' }, +#endif { "verbose", 0, NULL, 'v' }, { "method", 1, NULL, 'm' }, { "path", 1, NULL, 'p' }, @@ -723,6 +755,11 @@ int main(int argc, char **argv) case 'f': pid_filepath = optarg; break; +#ifdef CONFIG_FSFREEZE + case 'F': + fsfreeze_script = optarg; + break; +#endif case 't': state_dir = optarg; break; @@ -786,6 +823,9 @@ int main(int argc, char **argv) s = g_malloc0(sizeof(GAState)); s->log_level = log_level; s->log_file = stderr; +#ifdef CONFIG_FSFREEZE + s->fsfreeze_script = fsfreeze_script; +#endif g_log_set_default_handler(ga_log, s); g_log_set_fatal_mask(NULL, G_LOG_LEVEL_ERROR); ga_enable_logging(s); diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 726930a..007c0a3 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -13,6 +13,7 @@ #include #include +#include #include #include #include "qga/guest-agent-core.h" @@ -396,6 +397,34 @@ GuestFsfreezeStatus qmp_guest_fsfreeze_status(Error **err) return GUEST_FSFREEZE_STATUS_THAWED; } +int execute_fsfreeze_script(const char *arg) +{ + int ret = -1; + const char *fsfreeze_script; + char *cmdline; + struct stat st; + + fsfreeze_script = ga_fsfreeze_script(ga_state); + if (fsfreeze_script && stat(fsfreeze_script, &st) == 0) { + if (S_ISREG(st.st_mode) && (st.st_mode & S_IXUSR)) { + slog("executing fsfreeze script with arg `%s'", arg); + cmdline = malloc(strlen(fsfreeze_script) + strlen(arg) + 2); + if (cmdline) { + sprintf(cmdline, "%s %s", fsfreeze_script, arg); + ret = system(cmdline); + free(cmdline); + } + if (ret > 0) { + g_warning("fsfreeze script failed with status=%d", ret); + } else if (ret == -1) { + g_warning("execution of fsfreeze script failed: %s", + strerror(errno)); + } + } + } + return ret; +} + /* * Walk list of mounted file systems in the guest, and freeze the ones which * are real local file systems. @@ -410,6 +439,8 @@ int64_t qmp_guest_fsfreeze_freeze(Error **err) slog("guest-fsfreeze called"); + execute_fsfreeze_script("freeze"); + QTAILQ_INIT(&mounts); ret = build_fs_mount_list(&mounts); if (ret < 0) { @@ -513,6 +544,9 @@ int64_t qmp_guest_fsfreeze_thaw(Error **err) ga_unset_frozen(ga_state); free_fs_mount_list(&mounts); + + execute_fsfreeze_script("thaw"); + return i; } diff --git a/qga/guest-agent-core.h b/qga/guest-agent-core.h index 49a7abe..b466bfd 100644 --- a/qga/guest-agent-core.h +++ b/qga/guest-agent-core.h @@ -34,6 +34,8 @@ void ga_set_response_delimited(GAState *s); bool ga_is_frozen(GAState *s); void ga_set_frozen(GAState *s); void ga_unset_frozen(GAState *s); +const char *ga_fsfreeze_script(GAState *s); +int execute_fsfreeze_script(const char *arg); #ifndef _WIN32 void reopen_fd_to_null(int fd);