Commit d89e666e authored by zhanghailiang's avatar zhanghailiang Committed by Amit Shah
Browse files

COLO: Add 'x-colo-lost-heartbeat' command to trigger failover 



We leave users to choose whatever heartbeat solution they want,
if the heartbeat is lost, or other errors they detect, they can use
experimental command 'x_colo_lost_heartbeat' to tell COLO to do failover,
COLO will do operations accordingly.

For example, if the command is sent to the Primary side,
the Primary side will exit COLO mode, does cleanup work,
and then, PVM will take over the service work. If sent to the Secondary side,
the Secondary side will run failover work, then takes over PVM's service work.

Cc: Luiz Capitulino <lcapitulino@redhat.com>
Cc: Eric Blake <eblake@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarzhanghailiang <zhang.zhanghailiang@huawei.com>
Signed-off-by: default avatarLi Zhijian <lizhijian@cn.fujitsu.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarAmit Shah <amit.shah@redhat.com>
Signed-off-by: default avatarAmit Shah <amit@amitshah.net>
parent 18cc23d7

docs/qmp-commands.txt

+10 −0
Original line number Diff line number Diff line
@@ -554,6 +554,16 @@ Example: 
-> { "execute": "migrate_set_downtime", "arguments": { "value": 0.1 } }

<- { "return": {} }



x-colo-lost-heartbeat

--------------------



Tell COLO that heartbeat is lost, a failover or takeover is needed.



Example:



-> { "execute": "x-colo-lost-heartbeat" }

<- { "return": {} }



client_migrate_info

-------------------

hmp-commands.hx

+15 −0
Original line number Diff line number Diff line
@@ -1037,6 +1037,21 @@ STEXI 
@findex migrate_start_postcopy

Switch in-progress migration to postcopy mode. Ignored after the end of

migration (or once already in postcopy).

ETEXI



    {

        .name       = "x_colo_lost_heartbeat",

        .args_type  = "",

        .params     = "",

        .help       = "Tell COLO that heartbeat is lost,\n\t\t\t"

                      "a failover or takeover is needed.",

        .cmd = hmp_x_colo_lost_heartbeat,

    },



STEXI

@item x_colo_lost_heartbeat

@findex x_colo_lost_heartbeat

Tell COLO that heartbeat is lost, a failover or takeover is needed.

ETEXI



    {

hmp.c

+8 −0
Original line number Diff line number Diff line
@@ -1451,6 +1451,14 @@ void hmp_migrate_start_postcopy(Monitor *mon, const QDict *qdict) 
    hmp_handle_error(mon, &err);

}



void hmp_x_colo_lost_heartbeat(Monitor *mon, const QDict *qdict)

{

    Error *err = NULL;



    qmp_x_colo_lost_heartbeat(&err);

    hmp_handle_error(mon, &err);

}



void hmp_set_password(Monitor *mon, const QDict *qdict)

{

    const char *protocol  = qdict_get_str(qdict, "protocol");

hmp.h

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict); 
void hmp_migrate_set_cache_size(Monitor *mon, const QDict *qdict);

void hmp_client_migrate_info(Monitor *mon, const QDict *qdict);

void hmp_migrate_start_postcopy(Monitor *mon, const QDict *qdict);

void hmp_x_colo_lost_heartbeat(Monitor *mon, const QDict *qdict);

void hmp_set_password(Monitor *mon, const QDict *qdict);

void hmp_expire_password(Monitor *mon, const QDict *qdict);

void hmp_eject(Monitor *mon, const QDict *qdict);

include/migration/colo.h

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "migration/migration.h"

#include "qemu/coroutine_int.h"

#include "qemu/thread.h"

#include "qemu/main-loop.h"



bool colo_supported(void);

void colo_info_init(void);
@@ -29,4 +30,6 @@ bool migration_incoming_enable_colo(void); 
void migration_incoming_exit_colo(void);

void *colo_process_incoming_thread(void *opaque);

bool migration_incoming_in_colo_state(void);



COLOMode get_colo_mode(void);

#endif