[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC v3 24/27] COLO NIC: Implement NIC checkpoint and
From: |
zhanghailiang |
Subject: |
[Qemu-devel] [PATCH RFC v3 24/27] COLO NIC: Implement NIC checkpoint and failover |
Date: |
Thu, 12 Feb 2015 11:17:11 +0800 |
Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Gao feng <address@hidden>
---
include/net/colo-nic.h | 3 ++-
migration/colo.c | 22 ++++++++++++++++++----
net/colo-nic.c | 19 +++++++++++++++++++
3 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/include/net/colo-nic.h b/include/net/colo-nic.h
index 67c9807..ddc21cd 100644
--- a/include/net/colo-nic.h
+++ b/include/net/colo-nic.h
@@ -20,5 +20,6 @@ void colo_add_nic_devices(NetClientState *nc);
void colo_remove_nic_devices(NetClientState *nc);
int colo_proxy_compare(void);
-
+int colo_proxy_failover(void);
+int colo_proxy_checkpoint(void);
#endif
diff --git a/migration/colo.c b/migration/colo.c
index 579aabf..874971c 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -94,6 +94,11 @@ static void slave_do_failover(void)
;
}
+ if (colo_proxy_failover() != 0) {
+ error_report("colo proxy failed to do failover");
+ }
+ colo_proxy_destroy(COLO_SECONDARY_MODE);
+
colo = NULL;
if (!autostart) {
@@ -115,7 +120,7 @@ static void master_do_failover(void)
if (!colo_runstate_is_stopped()) {
vm_stop_force_state(RUN_STATE_COLO);
}
-
+ colo_proxy_destroy(COLO_PRIMARY_MODE);
if (s->state != MIG_STATE_ERROR) {
migrate_set_state(s, MIG_STATE_COLO, MIG_STATE_COMPLETED);
}
@@ -245,6 +250,11 @@ static int do_colo_transaction(MigrationState *s, QEMUFile
*control)
qemu_fflush(trans);
+ ret = colo_proxy_checkpoint();
+ if (ret < 0) {
+ goto out;
+ }
+
ret = colo_ctl_put(s->file, COLO_CHECKPOINT_SEND);
if (ret < 0) {
goto out;
@@ -387,8 +397,6 @@ out:
qemu_bh_schedule(s->cleanup_bh);
qemu_mutex_unlock_iothread();
- colo_proxy_destroy(COLO_PRIMARY_MODE);
-
return NULL;
}
@@ -508,6 +516,12 @@ void *colo_process_incoming_checkpoints(void *opaque)
goto out;
}
+ ret = colo_proxy_checkpoint();
+ if (ret < 0) {
+ goto out;
+ }
+ DPRINTF("proxy begin to do checkpoint\n");
+
ret = colo_ctl_get(f, COLO_CHECKPOINT_SEND);
if (ret < 0) {
goto out;
@@ -584,6 +598,7 @@ out:
* just kill slave
*/
error_report("SVM is going to exit!");
+ colo_proxy_destroy(COLO_SECONDARY_MODE);
exit(1);
} else {
/* if we went here, means master may dead, we are doing failover */
@@ -610,6 +625,5 @@ out:
loadvm_exit_colo();
- colo_proxy_destroy(COLO_SECONDARY_MODE);
return NULL;
}
diff --git a/net/colo-nic.c b/net/colo-nic.c
index 563d661..02a454d 100644
--- a/net/colo-nic.c
+++ b/net/colo-nic.c
@@ -379,6 +379,25 @@ void colo_proxy_destroy(int side)
cp_info.index = -1;
colo_nic_side = -1;
}
+
+int colo_proxy_failover(void)
+{
+ if (colo_proxy_send(NULL, 0, COLO_FAILOVER) < 0) {
+ return -1;
+ }
+
+ return 0;
+}
+
+int colo_proxy_checkpoint(void)
+{
+ if (colo_proxy_send(NULL, 0, COLO_CHECKPOINT) < 0) {
+ return -1;
+ }
+
+ return 0;
+}
+
/*
do checkpoint: return 1
error: return -1
--
1.7.12.4
- Re: [Qemu-devel] [PATCH RFC v3 17/27] COLO: Add new command parameter 'colo_nicname' 'colo_script' for net, (continued)
- [Qemu-devel] [PATCH RFC v3 18/27] COLO NIC: Init/remove colo nic devices when add/cleanup tap devices, zhanghailiang, 2015/02/11
- [Qemu-devel] [PATCH RFC v3 21/27] COLO NIC: Some init work related with proxy module, zhanghailiang, 2015/02/11
- [Qemu-devel] [PATCH RFC v3 19/27] COLO NIC: Implement colo nic device interface configure(), zhanghailiang, 2015/02/11
- [Qemu-devel] [PATCH RFC v3 20/27] COLO NIC : Implement colo nic init/destroy function, zhanghailiang, 2015/02/11
- [Qemu-devel] [PATCH RFC v3 22/27] COLO: Do checkpoint according to the result of net packets comparing, zhanghailiang, 2015/02/11
- [Qemu-devel] [PATCH RFC v3 26/27] COLO: Implement shutdown checkpoint, zhanghailiang, 2015/02/11
- [Qemu-devel] [PATCH RFC v3 25/27] COLO: Disable qdev hotplug when VM is in COLO mode, zhanghailiang, 2015/02/11
- [Qemu-devel] [PATCH RFC v3 24/27] COLO NIC: Implement NIC checkpoint and failover,
zhanghailiang <=
- [Qemu-devel] [PATCH RFC v3 27/27] COLO: Add block replication into colo process, zhanghailiang, 2015/02/11
- [Qemu-devel] [PATCH RFC v3 05/27] migration: Integrate COLO checkpoint process into loadvm, zhanghailiang, 2015/02/11
- [Qemu-devel] [PATCH RFC v3 11/27] COLO RAM: Load PVM's dirty page into SVM's RAM cache temporarily, zhanghailiang, 2015/02/11
- [Qemu-devel] [PATCH RFC v3 14/27] COLO failover: Introduce a new command to trigger a failover, zhanghailiang, 2015/02/11
- [Qemu-devel] [PATCH RFC v3 06/27] migration: Don't send vm description in COLO mode, zhanghailiang, 2015/02/11
- [Qemu-devel] [PATCH RFC v3 23/27] COLO: Improve checkpoint efficiency by do additional periodic checkpoint, zhanghailiang, 2015/02/11