Skip to contentSkip to conversation

migration/colo: fix typo in the COLO Framework module

PATCH In review Like Xu 3 participants 8 messages Jun 14, 2020 – Jun 15, 2020 Networking

lore
Share & tools
lore

Like Xu

author
#0 lore raw

PATCH 1/2 migration/colo: fix typo in the COLO Framework module

Cc Hailiang Zhang <[email protected]>
---
 docs/COLO-FT.txt | 8 ++++----
 migration/colo.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
docs/COLO-FT.txt +4 -4
index c8e1740935..fdc0207cff 100644
@@ -10,7 +10,7 @@ See the COPYING file in the top-level directory.
 This document gives an overview of COLO's design and how to use it.
 
 == Background ==
-Virtual machine (VM) replication is a well known technique for providing
+Virtual machine (VM) replication is a well-known technique for providing
 application-agnostic software-implemented hardware fault tolerance,
 also known as "non-stop service".
 
@@ -103,7 +103,7 @@ Primary side.
 
 COLO Proxy:
 Delivers packets to Primary and Secondary, and then compare the responses from
-both side. Then decide whether to start a checkpoint according to some rules.
+both sides. Then decide whether to start a checkpoint according to some rules.
 Please refer to docs/colo-proxy.txt for more information.
 
 Note:
@@ -146,12 +146,12 @@ in test procedure.
 
 == Test procedure ==
 Note: Here we are running both instances on the same host for testing,
-change the IP Addresses if you want to run it on two hosts. Initally
+change the IP Addresses if you want to run it on two hosts. Initially
 127.0.0.1 is the Primary Host and 127.0.0.2 is the Secondary Host.
 
 == Startup qemu ==
 1. Primary:
-Note: Initally, $imagefolder/primary.qcow2 needs to be copied to all hosts.
+Note: Initially, $imagefolder/primary.qcow2 needs to be copied to all hosts.
 You don't need to change any IP's here, because 0.0.0.0 listens on any
 interface. The chardev's with 127.0.0.1 IP's loopback to the local qemu
 instance.
migration/colo.c +1 -1
index ea7d1e9d4e..80788d46b5 100644
@@ -632,7 +632,7 @@ out:
     /*
      * 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
+     * released before unregister notifier, or there will be use-after-free
      * error.
      */
     colo_compare_unregister_notifier(&packets_compare_notifier);
Signature · 1 line
2.21.3
author
#1 lore raw

PATCH 2/2 migration/colo/net: fix typo in the COLO Proxy module

Cc Zhang Chen <[email protected]>
Cc Li Zhijian <[email protected]>
---
 docs/colo-proxy.txt | 4 ++--
 net/colo-compare.c  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
docs/colo-proxy.txt +2 -2
index fa1cef0278..0bbd6f720a 100644
@@ -21,7 +21,7 @@ and filter-rewriter compose the COLO-proxy.
 == Architecture ==
 
 COLO-Proxy is based on qemu netfilter and it's a plugin for qemu netfilter
-(except colo-compare). It keep Secondary VM connect normally to
+(except colo-compare). It keeps Secondary VM connect normally to
 client and compare packets sent by PVM with sent by SVM.
 If the packet difference, notify COLO-frame to do checkpoint and send
 all primary packet has queued. Otherwise just send the queued primary
@@ -94,7 +94,7 @@ Redirect Server Filter --> COLO-Compare
 COLO-compare receive primary guest packet then
 waiting secondary redirect packet to compare it.
 If packet same,send queued primary packet and clear
-queued secondary packet, Otherwise send primary packet
+queued secondary packet, otherwise send primary packet
 and do checkpoint.
 
 COLO-Compare --> Another Redirector Filter
net/colo-compare.c +2 -2
index c07e7c1c09..3efc61c777 100644
@@ -658,7 +658,7 @@ static void colo_compare_packet(CompareState *s, Connection *conn,
             g_queue_remove(&conn->secondary_list, result->data);
         } else {
             /*
-             * If one packet arrive late, the secondary_list or
+             * If one packet arrives late, the secondary_list or
              * primary_list will be empty, so we can't compare it
              * until next comparison. If the packets in the list are
              * timeout, it will trigger a checkpoint request.
@@ -1296,7 +1296,7 @@ static void colo_compare_finalize(Object *obj)
         }
     }
 
-    /* Release all unhandled packets after compare thead exited */
+    /* Release all unhandled packets after compare thread exited */
     g_queue_foreach(&s->conn_list, colo_flush_packets, s);
 
     g_queue_clear(&s->conn_list);
Signature · 1 line
2.21.3
#3 lore raw
In reply to Like Xu

Hi Like,

Please check this patch, It seems that you didn't use git format-patch command to generate this patch, It is in wrong format.

Thanks,
Hailiang

Quoted 72 lines

-----Original Message-----
From: Like Xu [mailto:[email protected]]
Sent: Sunday, June 14, 2020 4:45 PM
To: [email protected]
Cc: Like Xu <[email protected]>; Zhanghailiang <[email protected]>
Subject: [PATCH 1/2] migration/colo: fix typo in the COLO Framework module

Cc Hailiang Zhang <[email protected]>
---
 docs/COLO-FT.txt | 8 ++++----
 migration/colo.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
docs/COLO-FT.txt index renamed from docs/COLO-FT.txt +0 -0

c8e1740935..fdc0207cff 100644

docs/COLO-FT.txt +2 -1
@@ -10,7 +10,7 @@ See the COPYING file in the top-level directory.
 This document gives an overview of COLO's design and how to use it.
 
 == Background ==
-Virtual machine (VM) replication is a well known technique for providing
+Virtual machine (VM) replication is a well-known technique for
+providing
 application-agnostic software-implemented hardware fault tolerance,  also

known as "non-stop service".

docs/COLO-FT.txt +0 -0
@@ -103,7 +103,7 @@ Primary side.
 
 COLO Proxy:
 Delivers packets to Primary and Secondary, and then compare the responses

from -both side. Then decide whether to start a checkpoint according to some rules.
+both sides. Then decide whether to start a checkpoint according to some rules.
Please refer to docs/colo-proxy.txt for more information.

Note:

docs/COLO-FT.txt +2 -2
@@ -146,12 +146,12 @@ in test procedure.
 
 == Test procedure ==
 Note: Here we are running both instances on the same host for testing,
-change the IP Addresses if you want to run it on two hosts. Initally
+change the IP Addresses if you want to run it on two hosts. Initially
 127.0.0.1 is the Primary Host and 127.0.0.2 is the Secondary Host.
 
 == Startup qemu ==
 1. Primary:
-Note: Initally, $imagefolder/primary.qcow2 needs to be copied to all hosts.
+Note: Initially, $imagefolder/primary.qcow2 needs to be copied to all hosts.
 You don't need to change any IP's here, because 0.0.0.0 listens on any

interface. The chardev's with 127.0.0.1 IP's loopback to the local qemu instance.

migration/colo.c index renamed from migration/colo.c +0 -0

ea7d1e9d4e..80788d46b5 100644

migration/colo.c +2 -2
@@ -632,7 +632,7 @@ out:
     /*
      * 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
+     * released before unregister notifier, or there will be
+ use-after-free
      * error.
      */
     colo_compare_unregister_notifier(&packets_compare_notifier);
--

2.21.3

author
#4 lore raw
Quoted 4 lines · Zhanghailiang

Hi Like,

Please check this patch, It seems that you didn't use git format-patch command to generate this patch, It is in wrong format.

I rebase the patch on the top commit of
7d3660e79830a069f1848bb4fa1cdf8f666424fb,
and hope it helps you.

Quoted 3 lines

Thanks,
Hailiang

From 15c19be9be07598d4264a4a84b85d4efa79bff9d Mon Sep 17 00:00:00 2001
From: Like Xu <[email protected]>
Date: Mon, 15 Jun 2020 10:10:57 +0800
Subject: [PATCH 1/2] migration/colo: fix typo in the COLO Framework module

Cc Hailiang Zhang <[email protected]>
---
 docs/COLO-FT.txt | 8 ++++----
 migration/colo.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
docs/COLO-FT.txt +1 -1
index c8e1740935..fdc0207cff 100644
@@ -10,7 +10,7 @@ See the COPYING file in the top-level directory.
 This document gives an overview of COLO's design and how to use it.
 
 == Background ==
-Virtual machine (VM) replication is a well known technique for providing
+Virtual machine (VM) replication is a well-known technique for providing
 application-agnostic software-implemented hardware fault tolerance,
 also known as "non-stop service".
 
@@ -103,7 +103,7 @@ Primary side.
 
 COLO Proxy:
 Delivers packets to Primary and Secondary, and then compare the responses 

from
-both side. Then decide whether to start a checkpoint according to some rules. +both sides. Then decide whether to start a checkpoint according to some rules.
Please refer to docs/colo-proxy.txt for more information.

Note:
@@ -146,12 +146,12 @@ in test procedure.

== Test procedure ==
Note: Here we are running both instances on the same host for testing,
-change the IP Addresses if you want to run it on two hosts. Initally +change the IP Addresses if you want to run it on two hosts. Initially
127.0.0.1 is the Primary Host and 127.0.0.2 is the Secondary Host.

== Startup qemu ==
1. Primary:
-Note: Initally, $imagefolder/primary.qcow2 needs to be copied to all hosts. +Note: Initially, $imagefolder/primary.qcow2 needs to be copied to all hosts.
You don't need to change any IP's here, because 0.0.0.0 listens on any interface. The chardev's with 127.0.0.1 IP's loopback to the local qemu instance.

migration/colo.c +1 -1
index ea7d1e9d4e..80788d46b5 100644
@@ -632,7 +632,7 @@ out:
     /*
      * 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
+     * released before unregister notifier, or there will be use-after-free
      * error.
      */
     colo_compare_unregister_notifier(&packets_compare_notifier);
Signature · 1 line
2.21.3
#5 lore raw

I have checked this patch in mail archive, it has no problem,
It seems that my email setup has some problem. It didn't show the right newline In this patch.

Quoted 93 lines

-----Original Message-----
From: Like Xu [mailto:[email protected]]
Sent: Monday, June 15, 2020 10:24 AM
To: Zhanghailiang <[email protected]>; [email protected]
Subject: Re: [PATCH 1/2] migration/colo: fix typo in the COLO Framework module

Quoted 4 lines · Zhanghailiang

Hi Like,

Please check this patch, It seems that you didn't use git format-patch command to generate this patch, It is in wrong format.

I rebase the patch on the top commit of
7d3660e79830a069f1848bb4fa1cdf8f666424fb,
and hope it helps you.

Quoted 3 lines

Thanks,
Hailiang

From 15c19be9be07598d4264a4a84b85d4efa79bff9d Mon Sep 17
00:00:00 2001
From: Like Xu <[email protected]>
Date: Mon, 15 Jun 2020 10:10:57 +0800
Subject: [PATCH 1/2] migration/colo: fix typo in the COLO Framework module

Cc Hailiang Zhang <[email protected]>
---
  docs/COLO-FT.txt | 8 ++++----
  migration/colo.c | 2 +-
  2 files changed, 5 insertions(+), 5 deletions(-)
docs/COLO-FT.txt index renamed from docs/COLO-FT.txt +0 -0

c8e1740935..fdc0207cff 100644

docs/COLO-FT.txt +2 -1
@@ -10,7 +10,7 @@ See the COPYING file in the top-level directory.
  This document gives an overview of COLO's design and how to use it.
 
  == Background ==
-Virtual machine (VM) replication is a well known technique for providing
+Virtual machine (VM) replication is a well-known technique for
+providing
  application-agnostic software-implemented hardware fault tolerance,
  also known as "non-stop service".
@@ -103,7 +103,7 @@ Primary side.
 
  COLO Proxy:
  Delivers packets to Primary and Secondary, and then compare the

responses from -both side. Then decide whether to start a checkpoint according to some rules.
+both sides. Then decide whether to start a checkpoint according to some rules.
Please refer to docs/colo-proxy.txt for more information.

Note:

docs/COLO-FT.txt +2 -2
@@ -146,12 +146,12 @@ in test procedure.
 
  == Test procedure ==
  Note: Here we are running both instances on the same host for testing,
-change the IP Addresses if you want to run it on two hosts. Initally
+change the IP Addresses if you want to run it on two hosts. Initially
  127.0.0.1 is the Primary Host and 127.0.0.2 is the Secondary Host.
 
  == Startup qemu ==
  1. Primary:
-Note: Initally, $imagefolder/primary.qcow2 needs to be copied to all hosts.
+Note: Initially, $imagefolder/primary.qcow2 needs to be copied to all hosts.
  You don't need to change any IP's here, because 0.0.0.0 listens on any
  interface. The chardev's with 127.0.0.1 IP's loopback to the local qemu
  instance.
migration/colo.c index renamed from migration/colo.c +0 -0

ea7d1e9d4e..80788d46b5 100644

migration/colo.c +2 -2
@@ -632,7 +632,7 @@ out:
      /*
       * 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
+     * released before unregister notifier, or there will be
+ use-after-free
       * error.
       */
      colo_compare_unregister_notifier(&packets_compare_notifier);
--

2.21.3

#6 lore raw

It looks normal to me.

Thanks
Zhang Chen

Quoted 110 lines

-----Original Message-----
From: Qemu-devel <qemu-devel- [email protected]> On Behalf Of Zhanghailiang
Sent: Monday, June 15, 2020 11:06 AM
To: Like Xu <[email protected]>; [email protected]
Subject: RE: [PATCH 1/2] migration/colo: fix typo in the COLO Framework module

I have checked this patch in mail archive, it has no problem, It seems that my email setup has some problem. It didn't show the right newline In this patch.

Quoted 69 lines

-----Original Message-----
From: Like Xu [mailto:[email protected]]
Sent: Monday, June 15, 2020 10:24 AM
To: Zhanghailiang <[email protected]>; [email protected]
Subject: Re: [PATCH 1/2] migration/colo: fix typo in the COLO Framework module

Quoted 4 lines · Zhanghailiang

Hi Like,

Please check this patch, It seems that you didn't use git format-patch command to generate this patch, It is in wrong format.

I rebase the patch on the top commit of
7d3660e79830a069f1848bb4fa1cdf8f666424fb,
and hope it helps you.

Quoted 3 lines

Thanks,
Hailiang

From 15c19be9be07598d4264a4a84b85d4efa79bff9d Mon Sep 17
00:00:00 2001
From: Like Xu <[email protected]>
Date: Mon, 15 Jun 2020 10:10:57 +0800
Subject: [PATCH 1/2] migration/colo: fix typo in the COLO Framework module

Cc Hailiang Zhang <[email protected]>
---
  docs/COLO-FT.txt | 8 ++++----
  migration/colo.c | 2 +-
  2 files changed, 5 insertions(+), 5 deletions(-)
docs/COLO-FT.txt index renamed from docs/COLO-FT.txt +0 -0

c8e1740935..fdc0207cff 100644

docs/COLO-FT.txt +0 -1
@@ -10,7 +10,7 @@ See the COPYING file in the top-level directory.
  This document gives an overview of COLO's design and how to use it.
 
  == Background ==
-Virtual machine (VM) replication is a well known technique for

providing

docs/COLO-FT.txt +2 -0
+Virtual machine (VM) replication is a well-known technique for
+providing
  application-agnostic software-implemented hardware fault tolerance,
  also known as "non-stop service".
@@ -103,7 +103,7 @@ Primary side.
 
  COLO Proxy:
  Delivers packets to Primary and Secondary, and then compare the

responses from -both side. Then decide whether to start a checkpoint according to some rules.

docs/COLO-FT.txt +2 -0
+both sides. Then decide whether to start a checkpoint according to
+some

rules.
Please refer to docs/colo-proxy.txt for more information.

Note:

docs/COLO-FT.txt +0 -0
@@ -146,12 +146,12 @@ in test procedure.
 
  == Test procedure ==
  Note: Here we are running both instances on the same host for

testing, -change the IP Addresses if you want to run it on two hosts. Initally

docs/COLO-FT.txt

Quoted 7 lines
docs/COLO-FT.txt +2 -1
+change the IP Addresses if you want to run it on two hosts. Initially
  127.0.0.1 is the Primary Host and 127.0.0.2 is the Secondary Host.
 
  == Startup qemu ==
  1. Primary:
-Note: Initally, $imagefolder/primary.qcow2 needs to be copied to all hosts.
+Note: Initially, $imagefolder/primary.qcow2 needs to be copied to all

hosts.

Quoted 20 lines

You don't need to change any IP's here, because 0.0.0.0 listens on any interface. The chardev's with 127.0.0.1 IP's loopback to the local qemu instance.

migration/colo.c index renamed from migration/colo.c +0 -0

ea7d1e9d4e..80788d46b5 100644

migration/colo.c +2 -2
@@ -632,7 +632,7 @@ out:
      /*
       * 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
+     * released before unregister notifier, or there will be
+ use-after-free
       * error.
       */
      colo_compare_unregister_notifier(&packets_compare_notifier);
--

2.21.3

Reviewed-by on v1 2/2
#2 lore raw

RE: [PATCH 2/2] migration/colo/net: fix typo in the COLO Proxy module

In reply to Like Xu
Quoted 10 lines

-----Original Message-----
From: Like Xu <[email protected]>
Sent: Sunday, June 14, 2020 4:45 PM
To: [email protected]
Cc: Like Xu <[email protected]>; Zhang, Chen <[email protected]>; Li Zhijian <[email protected]>
Subject: [PATCH 2/2] migration/colo/net: fix typo in the COLO Proxy module

Quoted 3 lines
Cc Zhang Chen <[email protected]>
Cc Li Zhijian <[email protected]>

Looks good to me.
By the way, add CC [email protected]

Thanks
Zhang Chen

Quoted 51 lines
---
 docs/colo-proxy.txt | 4 ++--
 net/colo-compare.c  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
docs/colo-proxy.txt index renamed from docs/colo-proxy.txt +0 -0

fa1cef0278..0bbd6f720a 100644

docs/colo-proxy.txt +0 -0
@@ -21,7 +21,7 @@ and filter-rewriter compose the COLO-proxy.
 == Architecture ==
 
 COLO-Proxy is based on qemu netfilter and it's a plugin for qemu netfilter -

(except colo-compare). It keep Secondary VM connect normally to +(except colo-compare). It keeps Secondary VM connect normally to
client and compare packets sent by PVM with sent by SVM.
If the packet difference, notify COLO-frame to do checkpoint and send all
primary packet has queued. Otherwise just send the queued primary @@ - 94,7 +94,7 @@ Redirect Server Filter --> COLO-Compare COLO-compare receive primary guest packet then waiting secondary redirect packet to compare it.
If packet same,send queued primary packet and clear -queued secondary
packet, Otherwise send primary packet
+queued secondary packet, otherwise send primary packet
and do checkpoint.

COLO-Compare --> Another Redirector Filter diff --git a/net/colo-compare.c
b/net/colo-compare.c index c07e7c1c09..3efc61c777 100644

net/colo-compare.c +1 -1
@@ -658,7 +658,7 @@ static void colo_compare_packet(CompareState *s,
 Connection *conn,
             g_queue_remove(&conn->secondary_list, result->data);
         } else {
             /*
-             * If one packet arrive late, the secondary_list or
+             * If one packet arrives late, the secondary_list or
              * primary_list will be empty, so we can't compare it
              * until next comparison. If the packets in the list are

* timeout, it will trigger a checkpoint request.

net/colo-compare.c +1 -2
@@ -1296,7 +1296,7 @@ static void colo_compare_finalize(Object *obj)
         }
     }
 
-    /* Release all unhandled packets after compare thead exited */
+    /* Release all unhandled packets after compare thread exited */
     g_queue_foreach(&s->conn_list, colo_flush_packets, s);
 
     g_queue_clear(&s->conn_list);
--

2.21.3

Reviewed-by on v1 1/2
#7 lore raw
In reply to Like Xu
Quoted 72 lines

-----Original Message-----
From: Like Xu [mailto:[email protected]]
Sent: Sunday, June 14, 2020 4:45 PM
To: [email protected]
Cc: Like Xu <[email protected]>; Zhanghailiang <[email protected]>
Subject: [PATCH 1/2] migration/colo: fix typo in the COLO Framework module

Cc Hailiang Zhang <[email protected]>
---
 docs/COLO-FT.txt | 8 ++++----
 migration/colo.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
docs/COLO-FT.txt index renamed from docs/COLO-FT.txt +0 -0

c8e1740935..fdc0207cff 100644

docs/COLO-FT.txt +2 -1
@@ -10,7 +10,7 @@ See the COPYING file in the top-level directory.
 This document gives an overview of COLO's design and how to use it.
 
 == Background ==
-Virtual machine (VM) replication is a well known technique for providing
+Virtual machine (VM) replication is a well-known technique for
+providing
 application-agnostic software-implemented hardware fault tolerance,  also

known as "non-stop service".

docs/COLO-FT.txt +0 -0
@@ -103,7 +103,7 @@ Primary side.
 
 COLO Proxy:
 Delivers packets to Primary and Secondary, and then compare the responses

from -both side. Then decide whether to start a checkpoint according to some rules.
+both sides. Then decide whether to start a checkpoint according to some rules.
Please refer to docs/colo-proxy.txt for more information.

Note:

docs/COLO-FT.txt +2 -2
@@ -146,12 +146,12 @@ in test procedure.
 
 == Test procedure ==
 Note: Here we are running both instances on the same host for testing,
-change the IP Addresses if you want to run it on two hosts. Initally
+change the IP Addresses if you want to run it on two hosts. Initially
 127.0.0.1 is the Primary Host and 127.0.0.2 is the Secondary Host.
 
 == Startup qemu ==
 1. Primary:
-Note: Initally, $imagefolder/primary.qcow2 needs to be copied to all hosts.
+Note: Initially, $imagefolder/primary.qcow2 needs to be copied to all hosts.
 You don't need to change any IP's here, because 0.0.0.0 listens on any

interface. The chardev's with 127.0.0.1 IP's loopback to the local qemu instance.

migration/colo.c index renamed from migration/colo.c +0 -0

ea7d1e9d4e..80788d46b5 100644

migration/colo.c +2 -2
@@ -632,7 +632,7 @@ out:
     /*
      * 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
+     * released before unregister notifier, or there will be
+ use-after-free
      * error.
      */
     colo_compare_unregister_notifier(&packets_compare_notifier);
--

2.21.3