net/colo-compare.c: Expose COLO-compare parameters to users
v2 cover net/colo-compare.c: Expose COLO-compare parameters to users
From: Zhang Chen <[email protected]>
Make a way to config COLO "compare_timeout" and "expired_scan_cycle" parameters according to user's scenarios and environments.
V2:
- Rebased on upstream.
- Fixed typos.
Zhang Chen (2):
net/colo-compare.c: Expose "compare_timeout" to users net/colo-compare.c: Expose "expired_scan_cycle" to users
net/colo-compare.c | 95 +++++++++++++++++++++++++++++++++++++++++++--- qemu-options.hx | 10 +++-- 2 files changed, 97 insertions(+), 8 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/2 net/colo-compare.c: Expose "compare_timeout" to users
From: Zhang Chen <[email protected]>
The "compare_timeout" determines the maximum time to hold the primary net packet. This patch expose the "compare_timeout", make user have ability to adjest the value according to application scenarios.
QMP command demo:
{ "execute": "qom-get",
"arguments": { "path": "/objects/comp0",
"property": "compare_timeout" } }
{ "execute": "qom-set",
"arguments": { "path": "/objects/comp0",
"property": "compare_timeout",
"value": 5000} }--- net/colo-compare.c | 47 ++++++++++++++++++++++++++++++++++++++++++++-- qemu-options.hx | 8 +++++--- 2 files changed, 50 insertions(+), 5 deletions(-)
net/colo-compare.c +45 -2
@@ -50,6 +50,7 @@ static NotifierList colo_compare_notifiers =/* TODO: Should be configurable */ #define REGULAR_PACKET_CHECK_MS 3000 +#define DEFAULT_TIME_OUT_MS 3000static QemuMutex event_mtx;static QemuCond event_complete_cond;
@@ -92,6 +93,7 @@ typedef struct CompareState {SocketReadState sec_rs;SocketReadState notify_rs;bool vnet_hdr; +uint32_t compare_timeout;/* * Record the connection that through the NIC
@@ -607,10 +609,9 @@ static int colo_old_packet_check_one_conn(Connection *conn, CompareState *s) {GList *result =NULL ; -int64_t check_time =REGULAR_PACKET_CHECK_MS ; result =g_queue_find_custom (&conn->primary_list, - &check_time, + &s->compare_timeout, (GCompareFunc )colo_old_packet_check_one);if (result) {
@@ -984,6 +985,39 @@ static void compare_set_notify_dev(Object *obj, const char *value, Error **errp) s->notify_dev =g_strdup (value); } +static void compare_get_timeout (Object *obj,Visitor *v, +const char *name,void *opaque, +Error **errp) +{ +CompareState *s =COLO_COMPARE (obj); +uint32_t value = s->compare_timeout; + +visit_type_uint32 (v, name, &value, errp); +} + +static void compare_set_timeout (Object *obj,Visitor *v, +const char *name,void *opaque, +Error **errp) +{ +CompareState *s =COLO_COMPARE (obj); +Error *local_err =NULL ; +uint32_t value; + +visit_type_uint32 (v, name, &value, &local_err); +if (local_err) { + goto out; + } +if (!value) { +error_setg (&local_err,"Property '%s.%s' requires a positive value" , +object_get_typename (obj), name); + goto out; + } + s->compare_timeout = value; + +out: +error_propagate (errp, local_err); +} +static void compare_pri_rs_finalize (SocketReadState *pri_rs) {CompareState *s =container_of (pri_rs, CompareState, pri_rs);
@@ -1090,6 +1124,11 @@ static void colo_compare_complete(UserCreatable *uc, Error **errp)return ; } +if (!s->compare_timeout) { +/* Set default value to 3000 MS */ + s->compare_timeout =DEFAULT_TIME_OUT_MS ; + } +if (find_and_check_chardev (&chr, s->pri_indev, errp) || !qemu_chr_fe_init (&s->chr_pri_in, chr, errp)) {return ;
@@ -1185,6 +1224,10 @@ static void colo_compare_init(Object *obj) compare_get_notify_dev, compare_set_notify_dev, NULL); +object_property_add (obj,"compare_timeout" ,"uint32" , + compare_get_timeout, + compare_set_timeout,NULL ,NULL ,NULL ); + s->vnet_hdr = false;object_property_add_bool (obj,"vnet_hdr_support" , compare_get_vnet_hdr, compare_set_vnet_hdr,NULL );
qemu-options.hx +5 -3
@@ -4615,7 +4615,7 @@ SRST stored. The file format is libpcap, so it can be analyzed with tools such as tcpdump or Wireshark. - ``-object colo-compare,id=id,primary_in=chardevid,secondary_in=chardevid,outdev=chardevid,iothread=id[,vnet_hdr_support][,notify_dev=id]`` + ``-object colo-compare,id=id,primary_in=chardevid,secondary_in=chardevid,outdev=chardevid,iothread=id[,vnet_hdr_support][,notify_dev=id][,compare_timeout=@var{ms}]`` Colo-compare gets packet from primary\_inchardevid and secondary\_inchardevid, than compare primary packet with secondary packet. If the packets are same, we will output
@@ -4624,8 +4624,10 @@ SRST outdevchardevid. In order to improve efficiency, we need to put the task of comparison in another thread. If it has the vnet\_hdr\_support flag, colo compare will send/recv packet with - vnet\_hdr\_len. If you want to use Xen COLO, will need the - notify\_dev to notify Xen colo-frame to do checkpoint. + vnet\_hdr\_len. Then compare\_timeout=@var{ms} determines the + maximum delay colo-compare wait for the packet. + If you want to use Xen COLO, will need the notify\_dev to + notify Xen colo-frame to do checkpoint. we must use it with the help of filter-mirror and filter-redirector.
Signature · 1 line
2.17.1
PATCH v2 2/2 net/colo-compare.c: Expose "expired_scan_cycle" to users
In reply to Zhang ChenFrom: Zhang Chen <[email protected]>
The "expired_scan_cycle" determines period of scanning expired primary node net packets.
--- net/colo-compare.c | 48 +++++++++++++++++++++++++++++++++++++++++++--- qemu-options.hx | 4 +++- 2 files changed, 48 insertions(+), 4 deletions(-)
net/colo-compare.c +45 -3
@@ -48,7 +48,6 @@ static NotifierList colo_compare_notifiers =#define COLO_COMPARE_FREE_PRIMARY 0x01#define COLO_COMPARE_FREE_SECONDARY 0x02 -/* TODO: Should be configurable */ #define REGULAR_PACKET_CHECK_MS 3000#define DEFAULT_TIME_OUT_MS 3000
@@ -94,6 +93,7 @@ typedef struct CompareState {SocketReadState notify_rs;bool vnet_hdr;uint32_t compare_timeout; +uint32_t expired_scan_cycle;/* * Record the connection that through the NIC
@@ -823,7 +823,7 @@ static void check_old_packet_regular(void *opaque)/* if have old packet we will notify checkpoint */ colo_old_packet_check (s);timer_mod (s->packet_check_timer,qemu_clock_get_ms (QEMU_CLOCK_VIRTUAL ) + -REGULAR_PACKET_CHECK_MS ); + s->expired_scan_cycle); }/* Public API, Used for COLO frame to notify compare event */
@@ -853,7 +853,7 @@ static void colo_compare_timer_init(CompareState *s)SCALE_MS , check_old_packet_regular, s);timer_mod (s->packet_check_timer,qemu_clock_get_ms (QEMU_CLOCK_VIRTUAL ) + -REGULAR_PACKET_CHECK_MS ); + s->expired_scan_cycle); }static void colo_compare_timer_del (CompareState *s)
@@ -1018,6 +1018,39 @@ out:error_propagate (errp, local_err); } +static void compare_get_expired_scan_cycle (Object *obj,Visitor *v, +const char *name,void *opaque, +Error **errp) +{ +CompareState *s =COLO_COMPARE (obj); +uint32_t value = s->expired_scan_cycle; + +visit_type_uint32 (v, name, &value, errp); +} + +static void compare_set_expired_scan_cycle (Object *obj,Visitor *v, +const char *name,void *opaque, +Error **errp) +{ +CompareState *s =COLO_COMPARE (obj); +Error *local_err =NULL ; +uint32_t value; + +visit_type_uint32 (v, name, &value, &local_err); +if (local_err) { + goto out; + } +if (!value) { +error_setg (&local_err,"Property '%s.%s' requires a positive value" , +object_get_typename (obj), name); + goto out; + } + s->expired_scan_cycle = value; + +out: +error_propagate (errp, local_err); +} +static void compare_pri_rs_finalize (SocketReadState *pri_rs) {CompareState *s =container_of (pri_rs, CompareState, pri_rs);
@@ -1129,6 +1162,11 @@ static void colo_compare_complete(UserCreatable *uc, Error **errp) s->compare_timeout =DEFAULT_TIME_OUT_MS ; } +if (!s->expired_scan_cycle) { +/* Set default value to 3000 MS */ + s->expired_scan_cycle =REGULAR_PACKET_CHECK_MS ; + } +if (find_and_check_chardev (&chr, s->pri_indev, errp) || !qemu_chr_fe_init (&s->chr_pri_in, chr, errp)) {return ;
@@ -1228,6 +1266,10 @@ static void colo_compare_init(Object *obj) compare_get_timeout, compare_set_timeout, NULL, NULL, NULL); +object_property_add (obj,"expired_scan_cycle" ,"uint32" , + compare_get_expired_scan_cycle, + compare_set_expired_scan_cycle,NULL ,NULL ,NULL ); + s->vnet_hdr = false;object_property_add_bool (obj,"vnet_hdr_support" , compare_get_vnet_hdr, compare_set_vnet_hdr,NULL );
qemu-options.hx +3 -1
@@ -4615,7 +4615,7 @@ SRST stored. The file format is libpcap, so it can be analyzed with tools such as tcpdump or Wireshark. - ``-object colo-compare,id=id,primary_in=chardevid,secondary_in=chardevid,outdev=chardevid,iothread=id[,vnet_hdr_support][,notify_dev=id][,compare_timeout=@var{ms}]`` + ``-object colo-compare,id=id,primary_in=chardevid,secondary_in=chardevid,outdev=chardevid,iothread=id[,vnet_hdr_support][,notify_dev=id][,compare_timeout=@var{ms}][,expired_scan_cycle=@var{ms}`` Colo-compare gets packet from primary\_inchardevid and secondary\_inchardevid, than compare primary packet with secondary packet. If the packets are same, we will output
@@ -4626,6 +4626,8 @@ SRST vnet\_hdr\_support flag, colo compare will send/recv packet with vnet\_hdr\_len. Then compare\_timeout=@var{ms} determines the maximum delay colo-compare wait for the packet. + The expired\_scan\_cycle=@var{ms} to set the period of scanning + expired primary node network packets. If you want to use Xen COLO, will need the notify\_dev to notify Xen colo-frame to do checkpoint.
Signature · 1 line
2.17.1
Jason Wang
AppliedQuoted 9 lines · Zhang Chen
From: Zhang Chen <[email protected]>
Make a way to config COLO "
compare_timeout" and "expired_scan_cycle" parameters according to user's scenarios and environments.V2:
- Rebased on upstream.
- Fixed typos.
Quoted 8 lines
Zhang Chen (2):
net/colo-compare.c: Expose "compare_timeout" to usersnet/colo-compare.c: Expose "expired_scan_cycle" to usersnet/colo-compare.c | 95 +++++++++++++++++++++++++++++++++++++++++++--- qemu-options.hx | 10 +++-- 2 files changed, 97 insertions(+), 8 deletions(-)
Applied.
Thanks