Re: [Qemu-devel] [PATCH] docs: fix COLO architecture diagram

[Jason Wang]

On 2016年11月01日 11:38, Zhang Chen wrote:
> Fix COLO-Proxy part of COLO architecture diagram
>
> Signed-off-by: Zhang Chen <address@hidden>
> ---
>   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