[Message Queue] Design Update #550

issacyxw · 2021-03-02T13:40:51Z

No description provided.

xieus · 2021-03-03T06:29:19Z

@issacyxw You may need to update your master branch with the latest futurewei-cloud:master. This PR includes quite a few changes which have been merged to futurewei-cloud:master previously.

xieus · 2021-03-04T05:57:58Z

@issacyxw You may need to update your master branch with the latest futurewei-cloud:master. This PR includes quite a few changes which have been merged to futurewei-cloud:master previously.

@issacyxw At the bottom of this page, you can see that there is quite a few of conflicting files with existing master branch. Can you fix the issue?

codecov-io · 2021-03-14T13:22:00Z

Codecov Report

Merging #550 (1268e1b) into master (084b3f7) will decrease coverage by 0.00%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##             master     #550      +/-   ##
============================================
- Coverage     33.97%   33.97%   -0.01%     
  Complexity     1236     1236              
============================================
  Files           508      508              
  Lines         12549    12549              
  Branches       1574     1574              
============================================
- Hits           4264     4263       -1     
- Misses         7707     7708       +1     
  Partials        578      578

Impacted Files	Coverage Δ	Complexity Δ
...alcor/elasticipmanager/dao/ElasticIpAllocator.java	`63.53% <0.00%> (-0.28%)`	`48.00% <0.00%> (ø%)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 084b3f7...1268e1b. Read the comment docs.

xieus · 2021-03-16T06:30:14Z

docs/modules/ROOT/pages/mq_services/message_queue_system.html

 <div class="sect3">
 <h4 id="_design_option_mq_vpc_topic_grpc">Design Option: MQ (VPC Topic) + GRPC</h4>
 <div class="sect4">
-<h5 id="_workflow">Workflow</h5>
+<h5 id="_workflow_2">Workflow</h5>
 <div class="imageblock">
 <div class="content">
 <img src="../../images/vpcGroup.png" alt="vpcGroup">


Could you check the image name under /image folder? Should be vpcGroup.png, not vpcGrouppng. Thanks.

@issacyxw Where is the image vpcGroup.png?

vpcGroup.png exists in the /image folder

xieus

There are some merge conflict we have to resolve before check in to master.

xieus · 2021-03-16T17:27:03Z

docs/modules/ROOT/workflows/MQ_portcreate.puml

@@ -7,13 +7,23 @@ autonumber

 user -> PM: Create a port
 PM <-> SM_MACM_IPM_RM: PortInfo update
+<<<<<<< HEAD


Line 10 is a merge conflict. Please review "<<<<<<<< HEAD"

I have fixed MQ_portcreate.puml

xieus · 2021-03-16T17:27:49Z

docs/modules/ROOT/workflows/MQ_portcreate.puml

 PM <-> VPCM: VpcInfo query by vpc_vni
 PM <-> NM: Nodeinfo query by Node_id
 PM -> DPM: Send down network configuration request
 DPM ->DPM: Select chanel for this network configuration (MQ selected)\n Query vpc_subs in Nodeinfo \n subscribe the ack topic
 'DPM <-> VPCM: VPC info query
 'DPM <->NM: Query whether target node subscript vpc topic or not
 DPM --> targetNodeACA: CSA_Alg： Node subscribe API with GRPC\n Using (MQ_url & unicast_topic & multicast_topic & vip_topic) in VpcInfo \n Send the ack topic info (MQ_url & vip_topic) in VpcInfo
+>>>>>>> c7baf54731aabf851f79b69b96d539ab1eb3c24b


Check the conflict block between Line 10-18 and Line 18-26. Please merge it properly.

xieus · 2021-03-16T17:28:10Z

docs/modules/ROOT/workflows/MQ_portcreate.puml

+<<<<<<< HEAD
+PM <-> NM: Nodeinfo query by Node_id
+PM -> DPM: Send down network configuration request
+DPM <-> VPCM: VpcInfo query by vpc_vni
+DPM ->DPM: CSA-Alg: Select chanel for this network configuration (GRPC selected)
+'DPM <-> VPCM: VPC info query
+'DPM <->NM: Query whether target node subscript vpc topic or not
+DPM --> targetNodeACA: call node unsubscribe API with GRPC\n Using (MQ_url & unicast_topic & multicast_topic & vip_topic) in VpcInfo
+=======


Same here. Merge conflict.

xieus · 2021-03-16T17:29:05Z

docs/modules/ROOT/pages/mq_services/message_queue_system.html

 <div class="sect3">
 <h4 id="_design_option_mq_vpc_topic_grpc">Design Option: MQ (VPC Topic) + GRPC</h4>
 <div class="sect4">
-<h5 id="_workflow">Workflow</h5>
+<h5 id="_workflow_2">Workflow</h5>
 <div class="imageblock">
 <div class="content">
 <img src="../../images/vpcGroup.png" alt="vpcGroup">


@issacyxw Where is the image vpcGroup.png?

xieus · 2021-03-16T17:30:21Z

@issacyxw Please edit the title and add more details to the PR description.

… folder

xieus

Thanks for the continued improvement.

issacyxw and others added 12 commits January 24, 2021 20:07

MQdesign adoc

bc56553

Merge branch 'master' of https://github.com/futurewei-cloud/alcor

190b0a5

Update image directory

0438fda

Merge branch 'master' of https://github.com/futurewei-cloud/alcor

ea5e80e

update

3a738a5

update

6a803c1

Merge branch 'master' of https://github.com/futurewei-cloud/alcor

39dffc2

224 update

0a601f2

225 update

a593705

225 update

21cddcd

225 update

9f90c6d

302 update

89e6122

xieus assigned issacyxw Mar 4, 2021

xieus added the documentation Improvements or additions to documentation label Mar 4, 2021

xieus modified the milestones: Version 0.8.2020.08.30, Version 1.0.2021.02.28 Mar 4, 2021

issacyxw added 2 commits March 14, 2021 20:48

314

dc69615

314

4bfb415

xieus reviewed Mar 16, 2021

View reviewed changes

issacyxw added 2 commits March 16, 2021 15:35

Merge branch 'master' of https://github.com/futurewei-cloud/alcor

265b003

316update

ecc1e55

xieus suggested changes Mar 16, 2021

View reviewed changes

I have fixed the MQ_portcreate.puml and vpcGroup.png exists in /image…

1268e1b

… folder

xieus changed the title ~~Update~~ [Message Queue] Design Update Mar 17, 2021

xieus self-requested a review March 17, 2021 04:00

xieus approved these changes Mar 17, 2021

View reviewed changes

xieus merged commit 3103cd9 into futurewei-cloud:master Mar 17, 2021

This was referenced May 12, 2021

[Data Plane Mgr] Support vpc-mode pulsar message queue VanderChen/alcor#1

Closed

[Data Plane Mgr] Support vpc-mode pulsar message queue #613

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Message Queue] Design Update #550

[Message Queue] Design Update #550

issacyxw commented Mar 2, 2021

xieus commented Mar 3, 2021

xieus commented Mar 4, 2021

codecov-io commented Mar 14, 2021 •

edited

Loading

xieus Mar 16, 2021

xieus Mar 16, 2021

issacyxw Mar 17, 2021

xieus left a comment

xieus Mar 16, 2021

issacyxw Mar 17, 2021

xieus Mar 16, 2021

xieus Mar 16, 2021

xieus Mar 16, 2021

xieus commented Mar 16, 2021

xieus left a comment

[Message Queue] Design Update #550

[Message Queue] Design Update #550

Conversation

issacyxw commented Mar 2, 2021

xieus commented Mar 3, 2021

xieus commented Mar 4, 2021

codecov-io commented Mar 14, 2021 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

xieus left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

xieus commented Mar 16, 2021

xieus left a comment

Choose a reason for hiding this comment

codecov-io commented Mar 14, 2021 •

edited

Loading