mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-14 15:02:54 +00:00
COLO: Add block replication into colo process
Make sure master start block replication after slave's block replication started. Besides, we need to activate VM's blocks before goes into COLO state. Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com> Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com> Signed-off-by: Zhang Chen <zhangckid@gmail.com> Signed-off-by: Zhang Chen <chen.zhang@intel.com> Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
parent
131b2153fc
commit
8e48ac9586
|
@ -27,6 +27,7 @@
|
||||||
#include "replication.h"
|
#include "replication.h"
|
||||||
#include "net/colo-compare.h"
|
#include "net/colo-compare.h"
|
||||||
#include "net/colo.h"
|
#include "net/colo.h"
|
||||||
|
#include "block/block.h"
|
||||||
|
|
||||||
static bool vmstate_loading;
|
static bool vmstate_loading;
|
||||||
static Notifier packets_compare_notifier;
|
static Notifier packets_compare_notifier;
|
||||||
|
@ -56,6 +57,7 @@ static void secondary_vm_do_failover(void)
|
||||||
{
|
{
|
||||||
int old_state;
|
int old_state;
|
||||||
MigrationIncomingState *mis = migration_incoming_get_current();
|
MigrationIncomingState *mis = migration_incoming_get_current();
|
||||||
|
Error *local_err = NULL;
|
||||||
|
|
||||||
/* Can not do failover during the process of VM's loading VMstate, Or
|
/* Can not do failover during the process of VM's loading VMstate, Or
|
||||||
* it will break the secondary VM.
|
* it will break the secondary VM.
|
||||||
|
@ -73,6 +75,11 @@ static void secondary_vm_do_failover(void)
|
||||||
migrate_set_state(&mis->state, MIGRATION_STATUS_COLO,
|
migrate_set_state(&mis->state, MIGRATION_STATUS_COLO,
|
||||||
MIGRATION_STATUS_COMPLETED);
|
MIGRATION_STATUS_COMPLETED);
|
||||||
|
|
||||||
|
replication_stop_all(true, &local_err);
|
||||||
|
if (local_err) {
|
||||||
|
error_report_err(local_err);
|
||||||
|
}
|
||||||
|
|
||||||
if (!autostart) {
|
if (!autostart) {
|
||||||
error_report("\"-S\" qemu option will be ignored in secondary side");
|
error_report("\"-S\" qemu option will be ignored in secondary side");
|
||||||
/* recover runstate to normal migration finish state */
|
/* recover runstate to normal migration finish state */
|
||||||
|
@ -110,6 +117,7 @@ static void primary_vm_do_failover(void)
|
||||||
{
|
{
|
||||||
MigrationState *s = migrate_get_current();
|
MigrationState *s = migrate_get_current();
|
||||||
int old_state;
|
int old_state;
|
||||||
|
Error *local_err = NULL;
|
||||||
|
|
||||||
migrate_set_state(&s->state, MIGRATION_STATUS_COLO,
|
migrate_set_state(&s->state, MIGRATION_STATUS_COLO,
|
||||||
MIGRATION_STATUS_COMPLETED);
|
MIGRATION_STATUS_COMPLETED);
|
||||||
|
@ -133,6 +141,13 @@ static void primary_vm_do_failover(void)
|
||||||
FailoverStatus_str(old_state));
|
FailoverStatus_str(old_state));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
replication_stop_all(true, &local_err);
|
||||||
|
if (local_err) {
|
||||||
|
error_report_err(local_err);
|
||||||
|
local_err = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
/* Notify COLO thread that failover work is finished */
|
/* Notify COLO thread that failover work is finished */
|
||||||
qemu_sem_post(&s->colo_exit_sem);
|
qemu_sem_post(&s->colo_exit_sem);
|
||||||
}
|
}
|
||||||
|
@ -356,6 +371,11 @@ static int colo_do_checkpoint_transaction(MigrationState *s,
|
||||||
qemu_savevm_state_header(fb);
|
qemu_savevm_state_header(fb);
|
||||||
qemu_savevm_state_setup(fb);
|
qemu_savevm_state_setup(fb);
|
||||||
qemu_mutex_lock_iothread();
|
qemu_mutex_lock_iothread();
|
||||||
|
replication_do_checkpoint_all(&local_err);
|
||||||
|
if (local_err) {
|
||||||
|
qemu_mutex_unlock_iothread();
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
qemu_savevm_state_complete_precopy(fb, false, false);
|
qemu_savevm_state_complete_precopy(fb, false, false);
|
||||||
qemu_mutex_unlock_iothread();
|
qemu_mutex_unlock_iothread();
|
||||||
|
|
||||||
|
@ -446,6 +466,12 @@ static void colo_process_checkpoint(MigrationState *s)
|
||||||
object_unref(OBJECT(bioc));
|
object_unref(OBJECT(bioc));
|
||||||
|
|
||||||
qemu_mutex_lock_iothread();
|
qemu_mutex_lock_iothread();
|
||||||
|
replication_start_all(REPLICATION_MODE_PRIMARY, &local_err);
|
||||||
|
if (local_err) {
|
||||||
|
qemu_mutex_unlock_iothread();
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
vm_start();
|
vm_start();
|
||||||
qemu_mutex_unlock_iothread();
|
qemu_mutex_unlock_iothread();
|
||||||
trace_colo_vm_state_change("stop", "run");
|
trace_colo_vm_state_change("stop", "run");
|
||||||
|
@ -586,6 +612,11 @@ void *colo_process_incoming_thread(void *opaque)
|
||||||
object_unref(OBJECT(bioc));
|
object_unref(OBJECT(bioc));
|
||||||
|
|
||||||
qemu_mutex_lock_iothread();
|
qemu_mutex_lock_iothread();
|
||||||
|
replication_start_all(REPLICATION_MODE_SECONDARY, &local_err);
|
||||||
|
if (local_err) {
|
||||||
|
qemu_mutex_unlock_iothread();
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
vm_start();
|
vm_start();
|
||||||
trace_colo_vm_state_change("stop", "run");
|
trace_colo_vm_state_change("stop", "run");
|
||||||
qemu_mutex_unlock_iothread();
|
qemu_mutex_unlock_iothread();
|
||||||
|
@ -666,6 +697,18 @@ void *colo_process_incoming_thread(void *opaque)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
replication_get_error_all(&local_err);
|
||||||
|
if (local_err) {
|
||||||
|
qemu_mutex_unlock_iothread();
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
/* discard colo disk buffer */
|
||||||
|
replication_do_checkpoint_all(&local_err);
|
||||||
|
if (local_err) {
|
||||||
|
qemu_mutex_unlock_iothread();
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
vmstate_loading = false;
|
vmstate_loading = false;
|
||||||
vm_start();
|
vm_start();
|
||||||
trace_colo_vm_state_change("stop", "run");
|
trace_colo_vm_state_change("stop", "run");
|
||||||
|
|
|
@ -386,6 +386,7 @@ static void process_incoming_migration_co(void *opaque)
|
||||||
MigrationIncomingState *mis = migration_incoming_get_current();
|
MigrationIncomingState *mis = migration_incoming_get_current();
|
||||||
PostcopyState ps;
|
PostcopyState ps;
|
||||||
int ret;
|
int ret;
|
||||||
|
Error *local_err = NULL;
|
||||||
|
|
||||||
assert(mis->from_src_file);
|
assert(mis->from_src_file);
|
||||||
mis->migration_incoming_co = qemu_coroutine_self();
|
mis->migration_incoming_co = qemu_coroutine_self();
|
||||||
|
@ -418,6 +419,15 @@ static void process_incoming_migration_co(void *opaque)
|
||||||
|
|
||||||
/* we get COLO info, and know if we are in COLO mode */
|
/* we get COLO info, and know if we are in COLO mode */
|
||||||
if (!ret && migration_incoming_enable_colo()) {
|
if (!ret && migration_incoming_enable_colo()) {
|
||||||
|
/* Make sure all file formats flush their mutable metadata */
|
||||||
|
bdrv_invalidate_cache_all(&local_err);
|
||||||
|
if (local_err) {
|
||||||
|
migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE,
|
||||||
|
MIGRATION_STATUS_FAILED);
|
||||||
|
error_report_err(local_err);
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
|
||||||
qemu_thread_create(&mis->colo_incoming_thread, "COLO incoming",
|
qemu_thread_create(&mis->colo_incoming_thread, "COLO incoming",
|
||||||
colo_process_incoming_thread, mis, QEMU_THREAD_JOINABLE);
|
colo_process_incoming_thread, mis, QEMU_THREAD_JOINABLE);
|
||||||
mis->have_colo_incoming_thread = true;
|
mis->have_colo_incoming_thread = true;
|
||||||
|
|
Loading…
Reference in a new issue