[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V12 04/19] COLO: integrate colo compare with colo fr
From: |
Zhang Chen |
Subject: |
[Qemu-devel] [PATCH V12 04/19] COLO: integrate colo compare with colo frame |
Date: |
Mon, 3 Sep 2018 12:38:45 +0800 |
For COLO FT, both the PVM and SVM run at the same time,
only sync the state while it needs.
So here, let SVM runs while not doing checkpoint, change
DEFAULT_MIGRATE_X_CHECKPOINT_DELAY to 200*100.
Besides, we forgot to release colo_checkpoint_semd and
colo_delay_timer, fix them here.
Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
---
migration/colo.c | 42 ++++++++++++++++++++++++++++++++++++++++--
migration/migration.c | 6 ++----
2 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/migration/colo.c b/migration/colo.c
index 88936f5962..f4bdfde170 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -25,8 +25,11 @@
#include "qemu/error-report.h"
#include "migration/failover.h"
#include "replication.h"
+#include "net/colo-compare.h"
+#include "net/colo.h"
static bool vmstate_loading;
+static Notifier packets_compare_notifier;
#define COLO_BUFFER_BASE_SIZE (4 * 1024 * 1024)
@@ -343,6 +346,11 @@ static int colo_do_checkpoint_transaction(MigrationState
*s,
goto out;
}
+ colo_notify_compares_event(NULL, COLO_EVENT_CHECKPOINT, &local_err);
+ if (local_err) {
+ goto out;
+ }
+
/* Disable block migration */
migrate_set_block_enabled(false, &local_err);
qemu_savevm_state_header(fb);
@@ -400,6 +408,11 @@ out:
return ret;
}
+static void colo_compare_notify_checkpoint(Notifier *notifier, void *data)
+{
+ colo_checkpoint_notify(data);
+}
+
static void colo_process_checkpoint(MigrationState *s)
{
QIOChannelBuffer *bioc;
@@ -416,6 +429,9 @@ static void colo_process_checkpoint(MigrationState *s)
goto out;
}
+ packets_compare_notifier.notify = colo_compare_notify_checkpoint;
+ colo_compare_register_notifier(&packets_compare_notifier);
+
/*
* Wait for Secondary finish loading VM states and enter COLO
* restore.
@@ -461,11 +477,21 @@ out:
qemu_fclose(fb);
}
- timer_del(s->colo_delay_timer);
-
/* Hope this not to be too long to wait here */
qemu_sem_wait(&s->colo_exit_sem);
qemu_sem_destroy(&s->colo_exit_sem);
+
+ /*
+ * It is safe to unregister notifier after failover finished.
+ * Besides, colo_delay_timer and colo_checkpoint_sem can't be
+ * released befor unregister notifier, or there will be use-after-free
+ * error.
+ */
+ colo_compare_unregister_notifier(&packets_compare_notifier);
+ timer_del(s->colo_delay_timer);
+ timer_free(s->colo_delay_timer);
+ qemu_sem_destroy(&s->colo_checkpoint_sem);
+
/*
* Must be called after failover BH is completed,
* Or the failover BH may shutdown the wrong fd that
@@ -559,6 +585,11 @@ void *colo_process_incoming_thread(void *opaque)
fb = qemu_fopen_channel_input(QIO_CHANNEL(bioc));
object_unref(OBJECT(bioc));
+ qemu_mutex_lock_iothread();
+ vm_start();
+ trace_colo_vm_state_change("stop", "run");
+ qemu_mutex_unlock_iothread();
+
colo_send_message(mis->to_src_file, COLO_MESSAGE_CHECKPOINT_READY,
&local_err);
if (local_err) {
@@ -578,6 +609,11 @@ void *colo_process_incoming_thread(void *opaque)
goto out;
}
+ qemu_mutex_lock_iothread();
+ vm_stop_force_state(RUN_STATE_COLO);
+ trace_colo_vm_state_change("run", "stop");
+ qemu_mutex_unlock_iothread();
+
/* FIXME: This is unnecessary for periodic checkpoint mode */
colo_send_message(mis->to_src_file, COLO_MESSAGE_CHECKPOINT_REPLY,
&local_err);
@@ -631,6 +667,8 @@ void *colo_process_incoming_thread(void *opaque)
}
vmstate_loading = false;
+ vm_start();
+ trace_colo_vm_state_change("stop", "run");
qemu_mutex_unlock_iothread();
if (failover_get_state() == FAILOVER_STATUS_RELAUNCH) {
diff --git a/migration/migration.c b/migration/migration.c
index 4b316ec343..2f3e9d40d1 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -76,10 +76,8 @@
/* Migration XBZRLE default cache size */
#define DEFAULT_MIGRATE_XBZRLE_CACHE_SIZE (64 * 1024 * 1024)
-/* The delay time (in ms) between two COLO checkpoints
- * Note: Please change this default value to 10000 when we support hybrid mode.
- */
-#define DEFAULT_MIGRATE_X_CHECKPOINT_DELAY 200
+/* The delay time (in ms) between two COLO checkpoints */
+#define DEFAULT_MIGRATE_X_CHECKPOINT_DELAY (200 * 100)
#define DEFAULT_MIGRATE_MULTIFD_CHANNELS 2
#define DEFAULT_MIGRATE_MULTIFD_PAGE_COUNT 16
--
2.17.GIT
- [Qemu-devel] [PATCH V12 00/19] COLO: integrate colo frame with block replication and COLO proxy, Zhang Chen, 2018/09/03
- [Qemu-devel] [PATCH V12 01/19] filter-rewriter: Add TCP state machine and fix memory leak in connection_track_table, Zhang Chen, 2018/09/03
- [Qemu-devel] [PATCH V12 02/19] colo-compare: implement the process of checkpoint, Zhang Chen, 2018/09/03
- [Qemu-devel] [PATCH V12 03/19] colo-compare: use notifier to notify packets comparing result, Zhang Chen, 2018/09/03
- [Qemu-devel] [PATCH V12 04/19] COLO: integrate colo compare with colo frame,
Zhang Chen <=
- [Qemu-devel] [PATCH V12 05/19] COLO: Add block replication into colo process, Zhang Chen, 2018/09/03
- [Qemu-devel] [PATCH V12 06/19] COLO: Remove colo_state migration struct, Zhang Chen, 2018/09/03
- [Qemu-devel] [PATCH V12 07/19] COLO: Load dirty pages into SVM's RAM cache firstly, Zhang Chen, 2018/09/03
- [Qemu-devel] [PATCH V12 08/19] ram/COLO: Record the dirty pages that SVM received, Zhang Chen, 2018/09/03
- [Qemu-devel] [PATCH V12 09/19] COLO: Flush memory data from ram cache, Zhang Chen, 2018/09/03
- [Qemu-devel] [PATCH V12 10/19] qmp event: Add COLO_EXIT event to notify users while exited COLO, Zhang Chen, 2018/09/03
- [Qemu-devel] [PATCH V12 11/19] qapi/migration.json: Rename COLO unknown mode to none mode., Zhang Chen, 2018/09/03
- [Qemu-devel] [PATCH V12 12/19] qapi: Add new command to query colo status, Zhang Chen, 2018/09/03
- [Qemu-devel] [PATCH V12 13/19] savevm: split the process of different stages for loadvm/savevm, Zhang Chen, 2018/09/03