[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v4 25/28] COLO NIC: Implement NIC checkpoint and
From: |
zhanghailiang |
Subject: |
[Qemu-devel] [RFC PATCH v4 25/28] COLO NIC: Implement NIC checkpoint and failover |
Date: |
Thu, 26 Mar 2015 13:29:31 +0800 |
Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Li Zhijian <address@hidden>
---
include/net/colo-nic.h | 3 ++-
migration/colo.c | 22 +++++++++++++++++++---
net/colo-nic.c | 19 +++++++++++++++++++
3 files changed, 40 insertions(+), 4 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 1c4b222..54ae184 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -122,6 +122,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) {
@@ -144,6 +149,8 @@ static void master_do_failover(void)
vm_stop_force_state(RUN_STATE_COLO);
}
+ colo_proxy_destroy(COLO_PRIMARY_MODE);
+
if (s->state != MIGRATION_STATUS_FAILED) {
migrate_set_state(s, MIGRATION_STATUS_COLO,
MIGRATION_STATUS_COMPLETED);
}
@@ -267,6 +274,11 @@ static int colo_do_checkpoint_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;
@@ -413,8 +425,6 @@ out:
qemu_bh_schedule(s->cleanup_bh);
qemu_mutex_unlock_iothread();
- colo_proxy_destroy(COLO_PRIMARY_MODE);
-
return NULL;
}
@@ -542,6 +552,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;
@@ -618,6 +634,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 */
@@ -642,6 +659,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
- [Qemu-devel] [RFC PATCH v4 02/28] migration: Introduce capability 'colo' to migration, (continued)
- [Qemu-devel] [RFC PATCH v4 02/28] migration: Introduce capability 'colo' to migration, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 23/28] COLO: Improve checkpoint efficiency by do additional periodic checkpoint, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 18/28] COLO NIC: Init/remove colo nic devices when add/cleanup tap devices, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 19/28] COLO NIC: Implement colo nic device interface configure(), zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 05/28] migration: Integrate COLO checkpoint process into loadvm, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 26/28] COLO: Disable qdev hotplug when VM is in COLO mode, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 28/28] COLO: Add block replication into colo process, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 22/28] COLO: Do checkpoint according to the result of net packets comparing, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 27/28] COLO: Implement shutdown checkpoint, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 20/28] COLO NIC : Implement colo nic init/destroy function, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 25/28] COLO NIC: Implement NIC checkpoint and failover,
zhanghailiang <=
- [Qemu-devel] [RFC PATCH v4 24/28] COLO: Add colo-set-checkpoint-period command, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 14/28] COLO failover: Introduce a new command to trigger a failover, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 13/28] COLO RAM: Flush cached RAM into SVM's memory, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 16/28] COLO failover: Don't do failover during loading VM's state, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 15/28] COLO failover: Implement COLO master/slave failover work, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 17/28] COLO: Add new command parameter 'colo_nicname' 'colo_script' for net, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 21/28] COLO NIC: Some init work related with proxy module, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 10/28] COLO RAM: Load PVM's dirty page into SVM's RAM cache temporarily, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 03/28] COLO: migrate colo related info to slave, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 06/28] COLO: Implement colo checkpoint protocol, zhanghailiang, 2015/03/26