Patchwork [18/19] Introduce -k option to enable FT migration mode (Kemari).

login
register
mail settings
Submitter Yoshiaki Tamura
Date Feb. 8, 2011, 11:01 a.m.
Message ID <1297162901-2629-19-git-send-email-tamura.yoshiaki@lab.ntt.co.jp>
Download mbox | patch
Permalink /patch/82295/
State New
Headers show

Comments

Yoshiaki Tamura - Feb. 8, 2011, 11:01 a.m.
When -k option is set to migrate command, it will turn on ft_mode to
start FT migration mode (Kemari).

Signed-off-by: Yoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp>
---
 hmp-commands.hx |    7 ++++---
 migration.c     |    4 ++++
 qmp-commands.hx |    7 ++++---
 3 files changed, 12 insertions(+), 6 deletions(-)
Paolo Bonzini - Feb. 8, 2011, 12:13 p.m.
On 02/08/2011 12:01 PM, Yoshiaki Tamura wrote:
> When -k option is set to migrate command, it will turn on ft_mode to
> start FT migration mode (Kemari).

This could also use a "kemari:" prefix.

Paolo
Yoshiaki Tamura - Feb. 8, 2011, 12:59 p.m.
2011/2/8 Paolo Bonzini <pbonzini@redhat.com>:
> On 02/08/2011 12:01 PM, Yoshiaki Tamura wrote:
>>
>> When -k option is set to migrate command, it will turn on ft_mode to
>> start FT migration mode (Kemari).
>
> This could also use a "kemari:" prefix.

Sorry, missed that comment.  BTW, the help message would be like

put "kemari:" in front of URI to enable Fault Tolerance mode (Kemari protocol)

If there are comments on this, I would like to take them.

Thanks,

Yoshi

>
> Paolo
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

Patch

diff --git a/hmp-commands.hx b/hmp-commands.hx
index 38e1eb7..3560f32 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -754,13 +754,14 @@  ETEXI
 
     {
         .name       = "migrate",
-        .args_type  = "detach:-d,blk:-b,inc:-i,uri:s",
-        .params     = "[-d] [-b] [-i] uri",
+        .args_type  = "detach:-d,blk:-b,inc:-i,ft:-k,uri:s",
+        .params     = "[-d] [-b] [-i] [-k] uri",
         .help       = "migrate to URI (using -d to not wait for completion)"
 		      "\n\t\t\t -b for migration without shared storage with"
 		      " full copy of disk\n\t\t\t -i for migration without "
 		      "shared storage with incremental copy of disk "
-		      "(base image shared between src and destination)",
+		      "(base image shared between src and destination)"
+		      "\n\t\t\t -k for Fault Tolerance mode (Kemari protocol)",
         .user_print = monitor_user_noop,	
 	.mhandler.cmd_new = do_migrate,
     },
diff --git a/migration.c b/migration.c
index 7837c55..9d2abff 100644
--- a/migration.c
+++ b/migration.c
@@ -99,6 +99,10 @@  int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
         return -1;
     }
 
+    if (qdict_get_try_bool(qdict, "ft", 0)) {
+        ft_mode = FT_INIT;
+    }
+
     if (strstart(uri, "tcp:", &p)) {
         s = tcp_start_outgoing_migration(mon, p, max_throttle, detach,
                                          blk, inc);
diff --git a/qmp-commands.hx b/qmp-commands.hx
index df40a3d..f81a4a2 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -431,13 +431,14 @@  EQMP
 
     {
         .name       = "migrate",
-        .args_type  = "detach:-d,blk:-b,inc:-i,uri:s",
-        .params     = "[-d] [-b] [-i] uri",
+        .args_type  = "detach:-d,blk:-b,inc:-i,ft:-k,uri:s",
+        .params     = "[-d] [-b] [-i] [-k] uri",
         .help       = "migrate to URI (using -d to not wait for completion)"
 		      "\n\t\t\t -b for migration without shared storage with"
 		      " full copy of disk\n\t\t\t -i for migration without "
 		      "shared storage with incremental copy of disk "
-		      "(base image shared between src and destination)",
+		      "(base image shared between src and destination)"
+		      "\n\t\t\t -k for Fault Tolerance mode (Kemari protocol)",
         .user_print = monitor_user_noop,	
 	.mhandler.cmd_new = do_migrate,
     },