diff mbox

docs: fix COLO architecture diagram

Message ID 1477971492-10766-1-git-send-email-zhangchen.fnst@cn.fujitsu.com
State New
Headers show

Commit Message

Zhang Chen Nov. 1, 2016, 3:38 a.m. UTC
Fix COLO-Proxy part of COLO architecture diagram

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
---
 docs/COLO-FT.txt | 72 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 37 insertions(+), 35 deletions(-)

Comments

Zhanghailiang Nov. 1, 2016, 6:25 a.m. UTC | #1
Hmm, there are other contents in this file need to be updated,
for example, we support blockdev-add command for nbd now,
so we can convert the related hmp command to qmp command way.
But since we didn't integrate COLO frame with block replication
and proxy, It is OK to fix them later.

For COLO, the basic capability is still incomplete,
but now we got into 'Soft feature freeze' stage,
I'm wondering if it is possible at this point to combine
COLO frame with proxy and block replication which only needs
three or four patches that only touch colo related files ...
Or uses still can't test COLO feature in qemu 2.8.

Any ideas ? Thanks.

On 2016/11/1 11:38, Zhang Chen wrote:
> Fix COLO-Proxy part of COLO architecture diagram
>
> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

Reviewed-by: zhanghailiang <zhang.zhanghailiang@huawei.com>

All such patches can go through trivial branch.

Cc: qemu-trivial@nongnu.org

> ---
>   docs/COLO-FT.txt | 72 +++++++++++++++++++++++++++++---------------------------
>   1 file changed, 37 insertions(+), 35 deletions(-)
>
> diff --git a/docs/COLO-FT.txt b/docs/COLO-FT.txt
> index 6282938..e289be2 100644
> --- a/docs/COLO-FT.txt
> +++ b/docs/COLO-FT.txt
> @@ -41,41 +41,43 @@ identical responses to all client requests. Once the differences in the outputs
>   are detected between the PVM and SVM, COLO withholds transmission of the
>   outbound packets until it has successfully synchronized the PVM state to the SVM.
>
> -   Primary Node                                                            Secondary Node
> - +------------+  +-----------------------+       +------------------------+  +------------+
> - |            |  |       HeartBeat       |<----->|       HeartBeat        |  |            |
> - | Primary VM |  +-----------|-----------+       +-----------|------------+  |Secondary VM|
> - |            |              |                               |               |            |
> - |            |  +-----------|-----------+       +-----------|------------+  |            |
> - |            |  |QEMU   +---v----+      |       |QEMU  +----v---+        |  |            |
> - |            |  |       |Failover|      |       |      |Failover|        |  |            |
> - |            |  |       +--------+      |       |      +--------+        |  |            |
> - |            |  |   +---------------+   |       |   +---------------+    |  |            |
> - |            |  |   | VM Checkpoint |-------------->| VM Checkpoint |    |  |            |
> - |            |  |   +---------------+   |       |   +---------------+    |  |            |
> - |            |  |                       |       |                        |  |            |
> - |Requests<---------------------------^------------------------------------------>Requests|
> - |Responses----------------------\ /--|--------------\  /------------------------Responses|
> - |            |  |               | |  |  |       |   |  |                 |  |            |
> - |            |  | +-----------+ | |  |  |       |   |  |  +------------+ |  |            |
> - |            |  | | COLO disk | | |  |  |       |   |  |  | COLO disk  | |  |            |
> - |            |  | |   Manager |-|-|--|--------------|--|->| Manager    | |  |            |
> - |            |  | +|----------+ | |  |  |       |   |  |  +-----------|+ |  |            |
> - |            |  |  |            | |  |  |       |   |  |              |  |  |            |
> - +------------+  +--|------------|-|--|--+       +---|--|--------------|--+  +------------+
> -                    |            | |  |              |  |              |
> - +-------------+    | +----------v-v--|--+       +---|--v-----------+  |    +-------------+
> - |  VM Monitor |    | |  COLO Proxy      |       |    COLO Proxy    |  |    | VM Monitor  |
> - |             |    | |(compare packet)  |       | (adjust sequence)|  |    |             |
> - +-------------+    | +----------|----^--+       +------------------+  |    +-------------+
> -                    |            |    |                                |
> - +------------------|------------|----|--+       +---------------------|------------------+
> - |   Kernel         |            |    |  |       |   Kernel            |                  |
> - +------------------|------------|----|--+       +---------------------|------------------+
> -                    |            |    |                                |
> -     +--------------v+  +--------v----|--+       +------------------+ +v-------------+
> -     |   Storage     |  |External Network|       | External Network | |   Storage    |
> -     +---------------+  +----------------+       +------------------+ +--------------+
> +  Primary Node                                                            Secondary Node
> ++------------+  +-----------------------+       +------------------------+  +------------+
> +|            |  |       HeartBeat       +<----->+       HeartBeat        |  |            |
> +| Primary VM |  +-----------+-----------+       +-----------+------------+  |Secondary VM|
> +|            |              |                               |               |            |
> +|            |  +-----------|-----------+       +-----------|------------+  |            |
> +|            |  |QEMU   +---v----+      |       |QEMU  +----v---+        |  |            |
> +|            |  |       |Failover|      |       |      |Failover|        |  |            |
> +|            |  |       +--------+      |       |      +--------+        |  |            |
> +|            |  |   +---------------+   |       |   +---------------+    |  |            |
> +|            |  |   | VM Checkpoint +-------------->+ VM Checkpoint |    |  |            |
> +|            |  |   +---------------+   |       |   +---------------+    |  |            |
> +|Requests<--------------------------\ /-----------------\ /--------------------->Requests|
> +|            |  |                   ^ ^ |       |       | |              |  |            |
> +|Responses+---------------------\ /-|-|------------\ /-------------------------+Responses|
> +|            |  |               | | | | |       |  | |  | |              |  |            |
> +|            |  | +-----------+ | | | | |       |  | |  | | +----------+ |  |            |
> +|            |  | | COLO disk | | | | | |       |  | |  | | | COLO disk| |  |            |
> +|            |  | |   Manager +---------------------------->| Manager  | |  |            |
> +|            |  | ++----------+ v v | | |       |  | v  v | +---------++ |  |            |
> +|            |  |  |+-----------+-+-+-++|       | ++-+--+-+---------+ |  |  |            |
> +|            |  |  ||   COLO Proxy     ||       | |   COLO Proxy    | |  |  |            |
> +|            |  |  || (compare packet  ||       | |(adjust sequence | |  |  |            |
> +|            |  |  ||and mirror packet)||       | |    and ACK)     | |  |  |            |
> +|            |  |  |+------------+---+-+|       | +-----------------+ |  |  |            |
> ++------------+  +-----------------------+       +------------------------+  +------------+
> ++------------+     |             |   |                                |     +------------+
> +| VM Monitor |     |             |   |                                |     | VM Monitor |
> ++------------+     |             |   |                                |     +------------+
> ++---------------------------------------+       +----------------------------------------+
> +|   Kernel         |             |   |  |       |   Kernel            |                  |
> ++---------------------------------------+       +----------------------------------------+
> +                   |             |   |                                |
> +    +--------------v+  +---------v---+--+       +------------------+ +v-------------+
> +    |   Storage     |  |External Network|       | External Network | |   Storage    |
> +    +---------------+  +----------------+       +------------------+ +--------------+
> +
>
>   == Components introduction ==
>
>
Zhang Chen Nov. 1, 2016, 7:06 a.m. UTC | #2
On 11/01/2016 02:25 PM, Hailiang Zhang wrote:
> Hmm, there are other contents in this file need to be updated,
> for example, we support blockdev-add command for nbd now,
> so we can convert the related hmp command to qmp command way.
> But since we didn't integrate COLO frame with block replication
> and proxy, It is OK to fix them later.
>
> For COLO, the basic capability is still incomplete,
> but now we got into 'Soft feature freeze' stage,
> I'm wondering if it is possible at this point to combine
> COLO frame with proxy and block replication which only needs
> three or four patches that only touch colo related files ...
> Or uses still can't test COLO feature in qemu 2.8.
>
> Any ideas ? Thanks.

I will send some patch about COLO-Proxy combine with COLO-frame in the 
future.

>
> On 2016/11/1 11:38, Zhang Chen wrote:
>> Fix COLO-Proxy part of COLO architecture diagram
>>
>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
>
> Reviewed-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
>
> All such patches can go through trivial branch.
>
> Cc: qemu-trivial@nongnu.org

I think this patch about COLO architecture,
So, I didn't cc qemu-trivial.


Thanks
Zhang Chen

>
>> ---
>>   docs/COLO-FT.txt | 72 
>> +++++++++++++++++++++++++++++---------------------------
>>   1 file changed, 37 insertions(+), 35 deletions(-)
>>
>> diff --git a/docs/COLO-FT.txt b/docs/COLO-FT.txt
>> index 6282938..e289be2 100644
>> --- a/docs/COLO-FT.txt
>> +++ b/docs/COLO-FT.txt
>> @@ -41,41 +41,43 @@ identical responses to all client requests. Once 
>> the differences in the outputs
>>   are detected between the PVM and SVM, COLO withholds transmission 
>> of the
>>   outbound packets until it has successfully synchronized the PVM 
>> state to the SVM.
>>
>> -   Primary Node Secondary Node
>> - +------------+  +-----------------------+ 
>> +------------------------+  +------------+
>> - |            |  |       HeartBeat       |<----->| HeartBeat        
>> |  |            |
>> - | Primary VM |  +-----------|-----------+ 
>> +-----------|------------+  |Secondary VM|
>> - |            |              | |               |            |
>> - |            |  +-----------|-----------+ 
>> +-----------|------------+  |            |
>> - |            |  |QEMU   +---v----+      |       |QEMU 
>> +----v---+        |  |            |
>> - |            |  |       |Failover|      |       | |Failover|        
>> |  |            |
>> - |            |  |       +--------+      |       | +--------+        
>> |  |            |
>> - |            |  |   +---------------+   |       | 
>> +---------------+    |  |            |
>> - |            |  |   | VM Checkpoint |-------------->| VM Checkpoint 
>> |    |  |            |
>> - |            |  |   +---------------+   |       | 
>> +---------------+    |  |            |
>> - |            |  |                       | |                        
>> |  |            |
>> - 
>> |Requests<---------------------------^------------------------------------------>Requests|
>> - |Responses----------------------\ /--|--------------\ 
>> /------------------------Responses|
>> - |            |  |               | |  |  |       |   | 
>> |                 |  |            |
>> - |            |  | +-----------+ | |  |  |       |   |  | 
>> +------------+ |  |            |
>> - |            |  | | COLO disk | | |  |  |       |   |  |  | COLO 
>> disk  | |  |            |
>> - |            |  | |   Manager |-|-|--|--------------|--|->| 
>> Manager    | |  |            |
>> - |            |  | +|----------+ | |  |  |       |   |  | 
>> +-----------|+ |  |            |
>> - |            |  |  |            | |  |  |       |   | 
>> |              |  |  |            |
>> - +------------+  +--|------------|-|--|--+ 
>> +---|--|--------------|--+  +------------+
>> -                    |            | |  |              | |              |
>> - +-------------+    | +----------v-v--|--+ +---|--v-----------+  
>> |    +-------------+
>> - |  VM Monitor |    | |  COLO Proxy      |       |    COLO Proxy    
>> |  |    | VM Monitor  |
>> - |             |    | |(compare packet)  |       | (adjust 
>> sequence)|  |    |             |
>> - +-------------+    | +----------|----^--+ +------------------+  
>> |    +-------------+
>> -                    |            | |                                |
>> - +------------------|------------|----|--+ 
>> +---------------------|------------------+
>> - |   Kernel         |            |    |  |       | Kernel            
>> |                  |
>> - +------------------|------------|----|--+ 
>> +---------------------|------------------+
>> -                    |            | |                                |
>> -     +--------------v+  +--------v----|--+ +------------------+ 
>> +v-------------+
>> -     |   Storage     |  |External Network|       | External Network 
>> | |   Storage    |
>> -     +---------------+  +----------------+ +------------------+ 
>> +--------------+
>> +  Primary Node Secondary Node
>> ++------------+  +-----------------------+ 
>> +------------------------+  +------------+
>> +|            |  |       HeartBeat       +<----->+ HeartBeat        
>> |  |            |
>> +| Primary VM |  +-----------+-----------+ 
>> +-----------+------------+  |Secondary VM|
>> +|            |              | |               |            |
>> +|            |  +-----------|-----------+ 
>> +-----------|------------+  |            |
>> +|            |  |QEMU   +---v----+      |       |QEMU 
>> +----v---+        |  |            |
>> +|            |  |       |Failover|      |       | |Failover|        
>> |  |            |
>> +|            |  |       +--------+      |       | +--------+        
>> |  |            |
>> +|            |  |   +---------------+   |       | 
>> +---------------+    |  |            |
>> +|            |  |   | VM Checkpoint +-------------->+ VM Checkpoint 
>> |    |  |            |
>> +|            |  |   +---------------+   |       | 
>> +---------------+    |  |            |
>> +|Requests<--------------------------\ /-----------------\ 
>> /--------------------->Requests|
>> +|            |  |                   ^ ^ |       |       | 
>> |              |  |            |
>> +|Responses+---------------------\ /-|-|------------\ 
>> /-------------------------+Responses|
>> +|            |  |               | | | | |       |  | |  | 
>> |              |  |            |
>> +|            |  | +-----------+ | | | | |       |  | |  | | 
>> +----------+ |  |            |
>> +|            |  | | COLO disk | | | | | |       |  | |  | | | COLO 
>> disk| |  |            |
>> +|            |  | |   Manager +---------------------------->| 
>> Manager  | |  |            |
>> +|            |  | ++----------+ v v | | |       |  | v  v | 
>> +---------++ |  |            |
>> +|            |  |  |+-----------+-+-+-++|       | 
>> ++-+--+-+---------+ |  |  |            |
>> +|            |  |  ||   COLO Proxy     ||       | |   COLO Proxy    
>> | |  |  |            |
>> +|            |  |  || (compare packet  ||       | |(adjust sequence 
>> | |  |  |            |
>> +|            |  |  ||and mirror packet)||       | |    and ACK)     
>> | |  |  |            |
>> +|            |  |  |+------------+---+-+|       | 
>> +-----------------+ |  |  |            |
>> ++------------+  +-----------------------+ 
>> +------------------------+  +------------+
>> ++------------+     |             | |                                
>> |     +------------+
>> +| VM Monitor |     |             | |                                
>> |     | VM Monitor |
>> ++------------+     |             | |                                
>> |     +------------+
>> ++---------------------------------------+ 
>> +----------------------------------------+
>> +|   Kernel         |             |   |  |       | Kernel            
>> |                  |
>> ++---------------------------------------+ 
>> +----------------------------------------+
>> +                   |             | |                                |
>> +    +--------------v+  +---------v---+--+ +------------------+ 
>> +v-------------+
>> +    |   Storage     |  |External Network|       | External Network | 
>> |   Storage    |
>> +    +---------------+  +----------------+ +------------------+ 
>> +--------------+
>> +
>>
>>   == Components introduction ==
>>
>>
>
>
>
> .
>
Zhang Chen Nov. 9, 2016, 4:01 a.m. UTC | #3
Does anyone have any comments?

Ping....


Thanks

Zhang Chen


On 11/01/2016 03:06 PM, Zhang Chen wrote:
>
>
> On 11/01/2016 02:25 PM, Hailiang Zhang wrote:
>> Hmm, there are other contents in this file need to be updated,
>> for example, we support blockdev-add command for nbd now,
>> so we can convert the related hmp command to qmp command way.
>> But since we didn't integrate COLO frame with block replication
>> and proxy, It is OK to fix them later.
>>
>> For COLO, the basic capability is still incomplete,
>> but now we got into 'Soft feature freeze' stage,
>> I'm wondering if it is possible at this point to combine
>> COLO frame with proxy and block replication which only needs
>> three or four patches that only touch colo related files ...
>> Or uses still can't test COLO feature in qemu 2.8.
>>
>> Any ideas ? Thanks.
>
> I will send some patch about COLO-Proxy combine with COLO-frame in the 
> future.
>
>>
>> On 2016/11/1 11:38, Zhang Chen wrote:
>>> Fix COLO-Proxy part of COLO architecture diagram
>>>
>>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
>>
>> Reviewed-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
>>
>> All such patches can go through trivial branch.
>>
>> Cc: qemu-trivial@nongnu.org
>
> I think this patch about COLO architecture,
> So, I didn't cc qemu-trivial.
>
>
> Thanks
> Zhang Chen
>
>>
>>> ---
>>>   docs/COLO-FT.txt | 72 
>>> +++++++++++++++++++++++++++++---------------------------
>>>   1 file changed, 37 insertions(+), 35 deletions(-)
>>>
>>> diff --git a/docs/COLO-FT.txt b/docs/COLO-FT.txt
>>> index 6282938..e289be2 100644
>>> --- a/docs/COLO-FT.txt
>>> +++ b/docs/COLO-FT.txt
>>> @@ -41,41 +41,43 @@ identical responses to all client requests. Once 
>>> the differences in the outputs
>>>   are detected between the PVM and SVM, COLO withholds transmission 
>>> of the
>>>   outbound packets until it has successfully synchronized the PVM 
>>> state to the SVM.
>>>
>>> -   Primary Node Secondary Node
>>> - +------------+  +-----------------------+ 
>>> +------------------------+  +------------+
>>> - |            |  |       HeartBeat       |<----->| HeartBeat        
>>> |  |            |
>>> - | Primary VM |  +-----------|-----------+ 
>>> +-----------|------------+  |Secondary VM|
>>> - |            |              | |               |            |
>>> - |            |  +-----------|-----------+ 
>>> +-----------|------------+  |            |
>>> - |            |  |QEMU   +---v----+      |       |QEMU 
>>> +----v---+        |  |            |
>>> - |            |  |       |Failover|      |       | 
>>> |Failover|        |  |            |
>>> - |            |  |       +--------+      |       | 
>>> +--------+        |  |            |
>>> - |            |  |   +---------------+   |       | 
>>> +---------------+    |  |            |
>>> - |            |  |   | VM Checkpoint |-------------->| VM 
>>> Checkpoint |    |  |            |
>>> - |            |  |   +---------------+   |       | 
>>> +---------------+    |  |            |
>>> - |            |  |                       | |                        
>>> |  |            |
>>> - 
>>> |Requests<---------------------------^------------------------------------------>Requests|
>>> - |Responses----------------------\ /--|--------------\ 
>>> /------------------------Responses|
>>> - |            |  |               | |  |  |       |   | 
>>> |                 |  |            |
>>> - |            |  | +-----------+ | |  |  |       |   |  | 
>>> +------------+ |  |            |
>>> - |            |  | | COLO disk | | |  |  |       |   |  |  | COLO 
>>> disk  | |  |            |
>>> - |            |  | |   Manager |-|-|--|--------------|--|->| 
>>> Manager    | |  | |
>>> - |            |  | +|----------+ | |  |  |       |   |  | 
>>> +-----------|+ |  |            |
>>> - |            |  |  |            | |  |  |       |   | 
>>> |              |  |  |            |
>>> - +------------+  +--|------------|-|--|--+ 
>>> +---|--|--------------|--+  +------------+
>>> -                    |            | |  |              | 
>>> |              |
>>> - +-------------+    | +----------v-v--|--+ +---|--v-----------+  
>>> |    +-------------+
>>> - |  VM Monitor |    | |  COLO Proxy      |       |    COLO Proxy    
>>> |  |    | VM Monitor  |
>>> - |             |    | |(compare packet)  |       | (adjust 
>>> sequence)|  |    |             |
>>> - +-------------+    | +----------|----^--+ +------------------+  
>>> |    +-------------+
>>> -                    |            | |                                |
>>> - +------------------|------------|----|--+ 
>>> +---------------------|------------------+
>>> - |   Kernel         |            |    |  |       | 
>>> Kernel            |                  |
>>> - +------------------|------------|----|--+ 
>>> +---------------------|------------------+
>>> -                    |            | |                                |
>>> -     +--------------v+  +--------v----|--+ +------------------+ 
>>> +v-------------+
>>> -     |   Storage     |  |External Network|       | External Network 
>>> | |   Storage    |
>>> -     +---------------+  +----------------+ +------------------+ 
>>> +--------------+
>>> +  Primary Node Secondary Node
>>> ++------------+  +-----------------------+ 
>>> +------------------------+  +------------+
>>> +|            |  |       HeartBeat       +<----->+ HeartBeat        
>>> |  |            |
>>> +| Primary VM |  +-----------+-----------+ 
>>> +-----------+------------+  |Secondary VM|
>>> +|            |              | |               |            |
>>> +|            |  +-----------|-----------+ 
>>> +-----------|------------+  |            |
>>> +|            |  |QEMU   +---v----+      |       |QEMU 
>>> +----v---+        |  |            |
>>> +|            |  |       |Failover|      |       | |Failover|        
>>> |  |            |
>>> +|            |  |       +--------+      |       | +--------+        
>>> |  |            |
>>> +|            |  |   +---------------+   |       | 
>>> +---------------+    |  |            |
>>> +|            |  |   | VM Checkpoint +-------------->+ VM Checkpoint 
>>> |    |  |            |
>>> +|            |  |   +---------------+   |       | 
>>> +---------------+    |  |            |
>>> +|Requests<--------------------------\ /-----------------\ 
>>> /--------------------->Requests|
>>> +|            |  |                   ^ ^ |       |       | 
>>> |              |  |            |
>>> +|Responses+---------------------\ /-|-|------------\ 
>>> /-------------------------+Responses|
>>> +|            |  |               | | | | |       |  | |  | 
>>> |              |  |            |
>>> +|            |  | +-----------+ | | | | |       |  | |  | | 
>>> +----------+ |  |            |
>>> +|            |  | | COLO disk | | | | | |       |  | |  | | | COLO 
>>> disk| |  |            |
>>> +|            |  | |   Manager +---------------------------->| 
>>> Manager  | |  | |
>>> +|            |  | ++----------+ v v | | |       |  | v  v | 
>>> +---------++ |  |            |
>>> +|            |  |  |+-----------+-+-+-++|       | 
>>> ++-+--+-+---------+ |  |  |            |
>>> +|            |  |  ||   COLO Proxy     ||       | |   COLO Proxy    
>>> | |  |  |            |
>>> +|            |  |  || (compare packet  ||       | |(adjust sequence 
>>> | |  |  |            |
>>> +|            |  |  ||and mirror packet)||       | |    and ACK)     
>>> | |  |  |            |
>>> +|            |  |  |+------------+---+-+|       | 
>>> +-----------------+ |  |  |            |
>>> ++------------+  +-----------------------+ 
>>> +------------------------+  +------------+
>>> ++------------+     |             | |                                
>>> |     +------------+
>>> +| VM Monitor |     |             | |                                
>>> |     | VM Monitor |
>>> ++------------+     |             | |                                
>>> |     +------------+
>>> ++---------------------------------------+ 
>>> +----------------------------------------+
>>> +|   Kernel         |             |   |  |       | Kernel            
>>> |                  |
>>> ++---------------------------------------+ 
>>> +----------------------------------------+
>>> +                   |             | |                                |
>>> +    +--------------v+  +---------v---+--+ +------------------+ 
>>> +v-------------+
>>> +    |   Storage     |  |External Network|       | External Network 
>>> | |   Storage    |
>>> +    +---------------+  +----------------+ +------------------+ 
>>> +--------------+
>>> +
>>>
>>>   == Components introduction ==
>>>
>>>
>>
>>
>>
>> .
>>
>
Jason Wang Nov. 15, 2016, 7:31 a.m. UTC | #4
On 2016年11月01日 11:38, Zhang Chen wrote:
> Fix COLO-Proxy part of COLO architecture diagram
>
> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
> ---
>   docs/COLO-FT.txt | 72 +++++++++++++++++++++++++++++---------------------------
>   1 file changed, 37 insertions(+), 35 deletions(-)
>
> diff --git a/docs/COLO-FT.txt b/docs/COLO-FT.txt
> index 6282938..e289be2 100644
> --- a/docs/COLO-FT.txt
> +++ b/docs/COLO-FT.txt
> @@ -41,41 +41,43 @@ identical responses to all client requests. Once the differences in the outputs
>   are detected between the PVM and SVM, COLO withholds transmission of the
>   outbound packets until it has successfully synchronized the PVM state to the SVM.
>   
> -   Primary Node                                                            Secondary Node
> - +------------+  +-----------------------+       +------------------------+  +------------+
> - |            |  |       HeartBeat       |<----->|       HeartBeat        |  |            |
> - | Primary VM |  +-----------|-----------+       +-----------|------------+  |Secondary VM|
> - |            |              |                               |               |            |
> - |            |  +-----------|-----------+       +-----------|------------+  |            |
> - |            |  |QEMU   +---v----+      |       |QEMU  +----v---+        |  |            |
> - |            |  |       |Failover|      |       |      |Failover|        |  |            |
> - |            |  |       +--------+      |       |      +--------+        |  |            |
> - |            |  |   +---------------+   |       |   +---------------+    |  |            |
> - |            |  |   | VM Checkpoint |-------------->| VM Checkpoint |    |  |            |
> - |            |  |   +---------------+   |       |   +---------------+    |  |            |
> - |            |  |                       |       |                        |  |            |
> - |Requests<---------------------------^------------------------------------------>Requests|
> - |Responses----------------------\ /--|--------------\  /------------------------Responses|
> - |            |  |               | |  |  |       |   |  |                 |  |            |
> - |            |  | +-----------+ | |  |  |       |   |  |  +------------+ |  |            |
> - |            |  | | COLO disk | | |  |  |       |   |  |  | COLO disk  | |  |            |
> - |            |  | |   Manager |-|-|--|--------------|--|->| Manager    | |  |            |
> - |            |  | +|----------+ | |  |  |       |   |  |  +-----------|+ |  |            |
> - |            |  |  |            | |  |  |       |   |  |              |  |  |            |
> - +------------+  +--|------------|-|--|--+       +---|--|--------------|--+  +------------+
> -                    |            | |  |              |  |              |
> - +-------------+    | +----------v-v--|--+       +---|--v-----------+  |    +-------------+
> - |  VM Monitor |    | |  COLO Proxy      |       |    COLO Proxy    |  |    | VM Monitor  |
> - |             |    | |(compare packet)  |       | (adjust sequence)|  |    |             |
> - +-------------+    | +----------|----^--+       +------------------+  |    +-------------+
> -                    |            |    |                                |
> - +------------------|------------|----|--+       +---------------------|------------------+
> - |   Kernel         |            |    |  |       |   Kernel            |                  |
> - +------------------|------------|----|--+       +---------------------|------------------+
> -                    |            |    |                                |
> -     +--------------v+  +--------v----|--+       +------------------+ +v-------------+
> -     |   Storage     |  |External Network|       | External Network | |   Storage    |
> -     +---------------+  +----------------+       +------------------+ +--------------+
> +  Primary Node                                                            Secondary Node
> ++------------+  +-----------------------+       +------------------------+  +------------+
> +|            |  |       HeartBeat       +<----->+       HeartBeat        |  |            |
> +| Primary VM |  +-----------+-----------+       +-----------+------------+  |Secondary VM|
> +|            |              |                               |               |            |
> +|            |  +-----------|-----------+       +-----------|------------+  |            |
> +|            |  |QEMU   +---v----+      |       |QEMU  +----v---+        |  |            |
> +|            |  |       |Failover|      |       |      |Failover|        |  |            |
> +|            |  |       +--------+      |       |      +--------+        |  |            |
> +|            |  |   +---------------+   |       |   +---------------+    |  |            |
> +|            |  |   | VM Checkpoint +-------------->+ VM Checkpoint |    |  |            |
> +|            |  |   +---------------+   |       |   +---------------+    |  |            |
> +|Requests<--------------------------\ /-----------------\ /--------------------->Requests|
> +|            |  |                   ^ ^ |       |       | |              |  |            |
> +|Responses+---------------------\ /-|-|------------\ /-------------------------+Responses|
> +|            |  |               | | | | |       |  | |  | |              |  |            |
> +|            |  | +-----------+ | | | | |       |  | |  | | +----------+ |  |            |
> +|            |  | | COLO disk | | | | | |       |  | |  | | | COLO disk| |  |            |
> +|            |  | |   Manager +---------------------------->| Manager  | |  |            |
> +|            |  | ++----------+ v v | | |       |  | v  v | +---------++ |  |            |
> +|            |  |  |+-----------+-+-+-++|       | ++-+--+-+---------+ |  |  |            |
> +|            |  |  ||   COLO Proxy     ||       | |   COLO Proxy    | |  |  |            |
> +|            |  |  || (compare packet  ||       | |(adjust sequence | |  |  |            |
> +|            |  |  ||and mirror packet)||       | |    and ACK)     | |  |  |            |
> +|            |  |  |+------------+---+-+|       | +-----------------+ |  |  |            |
> ++------------+  +-----------------------+       +------------------------+  +------------+
> ++------------+     |             |   |                                |     +------------+
> +| VM Monitor |     |             |   |                                |     | VM Monitor |
> ++------------+     |             |   |                                |     +------------+
> ++---------------------------------------+       +----------------------------------------+
> +|   Kernel         |             |   |  |       |   Kernel            |                  |
> ++---------------------------------------+       +----------------------------------------+
> +                   |             |   |                                |
> +    +--------------v+  +---------v---+--+       +------------------+ +v-------------+
> +    |   Storage     |  |External Network|       | External Network | |   Storage    |
> +    +---------------+  +----------------+       +------------------+ +--------------+
> +
>   
>   == Components introduction ==
>   

Applied to -net. Thanks
diff mbox

Patch

diff --git a/docs/COLO-FT.txt b/docs/COLO-FT.txt
index 6282938..e289be2 100644
--- a/docs/COLO-FT.txt
+++ b/docs/COLO-FT.txt
@@ -41,41 +41,43 @@  identical responses to all client requests. Once the differences in the outputs
 are detected between the PVM and SVM, COLO withholds transmission of the
 outbound packets until it has successfully synchronized the PVM state to the SVM.
 
-   Primary Node                                                            Secondary Node
- +------------+  +-----------------------+       +------------------------+  +------------+
- |            |  |       HeartBeat       |<----->|       HeartBeat        |  |            |
- | Primary VM |  +-----------|-----------+       +-----------|------------+  |Secondary VM|
- |            |              |                               |               |            |
- |            |  +-----------|-----------+       +-----------|------------+  |            |
- |            |  |QEMU   +---v----+      |       |QEMU  +----v---+        |  |            |
- |            |  |       |Failover|      |       |      |Failover|        |  |            |
- |            |  |       +--------+      |       |      +--------+        |  |            |
- |            |  |   +---------------+   |       |   +---------------+    |  |            |
- |            |  |   | VM Checkpoint |-------------->| VM Checkpoint |    |  |            |
- |            |  |   +---------------+   |       |   +---------------+    |  |            |
- |            |  |                       |       |                        |  |            |
- |Requests<---------------------------^------------------------------------------>Requests|
- |Responses----------------------\ /--|--------------\  /------------------------Responses|
- |            |  |               | |  |  |       |   |  |                 |  |            |
- |            |  | +-----------+ | |  |  |       |   |  |  +------------+ |  |            |
- |            |  | | COLO disk | | |  |  |       |   |  |  | COLO disk  | |  |            |
- |            |  | |   Manager |-|-|--|--------------|--|->| Manager    | |  |            |
- |            |  | +|----------+ | |  |  |       |   |  |  +-----------|+ |  |            |
- |            |  |  |            | |  |  |       |   |  |              |  |  |            |
- +------------+  +--|------------|-|--|--+       +---|--|--------------|--+  +------------+
-                    |            | |  |              |  |              |
- +-------------+    | +----------v-v--|--+       +---|--v-----------+  |    +-------------+
- |  VM Monitor |    | |  COLO Proxy      |       |    COLO Proxy    |  |    | VM Monitor  |
- |             |    | |(compare packet)  |       | (adjust sequence)|  |    |             |
- +-------------+    | +----------|----^--+       +------------------+  |    +-------------+
-                    |            |    |                                |
- +------------------|------------|----|--+       +---------------------|------------------+
- |   Kernel         |            |    |  |       |   Kernel            |                  |
- +------------------|------------|----|--+       +---------------------|------------------+
-                    |            |    |                                |
-     +--------------v+  +--------v----|--+       +------------------+ +v-------------+
-     |   Storage     |  |External Network|       | External Network | |   Storage    |
-     +---------------+  +----------------+       +------------------+ +--------------+
+  Primary Node                                                            Secondary Node
++------------+  +-----------------------+       +------------------------+  +------------+
+|            |  |       HeartBeat       +<----->+       HeartBeat        |  |            |
+| Primary VM |  +-----------+-----------+       +-----------+------------+  |Secondary VM|
+|            |              |                               |               |            |
+|            |  +-----------|-----------+       +-----------|------------+  |            |
+|            |  |QEMU   +---v----+      |       |QEMU  +----v---+        |  |            |
+|            |  |       |Failover|      |       |      |Failover|        |  |            |
+|            |  |       +--------+      |       |      +--------+        |  |            |
+|            |  |   +---------------+   |       |   +---------------+    |  |            |
+|            |  |   | VM Checkpoint +-------------->+ VM Checkpoint |    |  |            |
+|            |  |   +---------------+   |       |   +---------------+    |  |            |
+|Requests<--------------------------\ /-----------------\ /--------------------->Requests|
+|            |  |                   ^ ^ |       |       | |              |  |            |
+|Responses+---------------------\ /-|-|------------\ /-------------------------+Responses|
+|            |  |               | | | | |       |  | |  | |              |  |            |
+|            |  | +-----------+ | | | | |       |  | |  | | +----------+ |  |            |
+|            |  | | COLO disk | | | | | |       |  | |  | | | COLO disk| |  |            |
+|            |  | |   Manager +---------------------------->| Manager  | |  |            |
+|            |  | ++----------+ v v | | |       |  | v  v | +---------++ |  |            |
+|            |  |  |+-----------+-+-+-++|       | ++-+--+-+---------+ |  |  |            |
+|            |  |  ||   COLO Proxy     ||       | |   COLO Proxy    | |  |  |            |
+|            |  |  || (compare packet  ||       | |(adjust sequence | |  |  |            |
+|            |  |  ||and mirror packet)||       | |    and ACK)     | |  |  |            |
+|            |  |  |+------------+---+-+|       | +-----------------+ |  |  |            |
++------------+  +-----------------------+       +------------------------+  +------------+
++------------+     |             |   |                                |     +------------+
+| VM Monitor |     |             |   |                                |     | VM Monitor |
++------------+     |             |   |                                |     +------------+
++---------------------------------------+       +----------------------------------------+
+|   Kernel         |             |   |  |       |   Kernel            |                  |
++---------------------------------------+       +----------------------------------------+
+                   |             |   |                                |
+    +--------------v+  +---------v---+--+       +------------------+ +v-------------+
+    |   Storage     |  |External Network|       | External Network | |   Storage    |
+    +---------------+  +----------------+       +------------------+ +--------------+
+
 
 == Components introduction ==