Improve Consumer interface to support ZMQ based Producer/Consumer table. #2562

liuh-80 · 2022-12-08T06:06:03Z

What I did
Improve Consumer interface to support ZMQ based Producer/Consumer table.

Why I did it
To improve route create performance, swsscommon lib will add ZMQ based Producer/Consumer table.
Because currently Consumer interface only support Redis based Producer/Consumer table, so improve this interface to support ZMQ based Producer/Consumer table.

ZMQ based Producer/Consumer table can find in this PR: sonic-net/sonic-swss-common#715

How I verified it
Pass all UT.

Details if related

swssconfig/swssconfig.cpp

liuh-80 · 2022-12-15T07:26:23Z

/azp run

azure-pipelines · 2022-12-15T07:26:34Z

Azure Pipelines successfully started running 1 pipeline(s).

bingwang-ms · 2022-12-16T01:50:39Z

/azp run

azure-pipelines · 2022-12-16T01:50:49Z

Azure Pipelines successfully started running 1 pipeline(s).

liuh-80 · 2023-01-04T02:29:23Z

/azp run

azure-pipelines · 2023-01-04T02:29:33Z

Azure Pipelines successfully started running 1 pipeline(s).

liuh-80 · 2023-01-05T05:24:37Z

/azp run

azure-pipelines · 2023-01-05T05:24:46Z

Azure Pipelines successfully started running 1 pipeline(s).

liuh-80 · 2023-01-05T05:27:15Z

There are few UTs randomly failed, every time failed UTs are different.

prsunny · 2023-01-06T21:28:10Z

cfgmgr/intfmgr.cpp

@@ -45,12 +45,12 @@ IntfMgr::IntfMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, c
 {
    auto subscriberStateTable = new swss::SubscriberStateTable(stateDb,
            STATE_PORT_TABLE_NAME, TableConsumable::DEFAULT_POP_BATCH_SIZE, 100);
-    auto stateConsumer = new Consumer(subscriberStateTable, this, STATE_PORT_TABLE_NAME);
+    auto stateConsumer = new TableConsumer(subscriberStateTable, this, STATE_PORT_TABLE_NAME);


Please clarify the following:

Is this interface generic, that both zmq and redis are supported?

If not, how do we ensure backward compatibility? For e.g, warmboot cases

Can we reuse the existing infra and chose zmq for only certain cases (like dash)

Is this interface generic, that both zmq and redis are supported?
Yes, this change is generic, TableConsumer is for redis, for ZMQ ther will be a ZmqConsumer add by another PR, here is POC pr show all change: https://github.com/sonic-net/sonic-swss/pull/2560/files

If not, how do we ensure backward compatibility? For e.g, warmboot cases
This PR only change interface, still using redis based consumer after this PR. will not break any backward compatibility.

Can we reuse the existing infra and chose zmq for only certain cases (like dash)
Yes, we still using existing infra in most case. the current plan is only use ZMQ for dash.
This can be done by change code in Orch::addConsumer(), when add consumer for dash related tables, add a ZqmConsumer, for all other case still add TableConsumer.

ok, if TableConsumer and Consumer are both for redis, then why change the name?

The 'Consumer' now become a base class, and 'TableConsumer' is only for Redis based swss::SubscriberStateTable and swss::ConsumerStateTable, in another PR, I will add 'ZmqConsumer' class for swss::ZmqConsumerStateTable.

liuh-80 · 2023-01-09T01:57:58Z

/azp run

azure-pipelines · 2023-01-09T01:58:08Z

Azure Pipelines successfully started running 1 pipeline(s).

liuh-80 · 2023-01-13T06:24:02Z

UT failed because test case found 2 virtual route, still investigation why this happen, maybe a random issue:

2023-01-12T13:05:51.9237991Z _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
2023-01-12T13:05:51.9238550Z test_sub_port_intf.py:86: in connect_dbs
2023-01-12T13:05:51.9239103Z self.default_vrf_oid = self.get_default_vrf_oid()
2023-01-12T13:05:51.9239663Z _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
2023-01-12T13:05:51.9240001Z
2023-01-12T13:05:51.9240478Z self = <test_sub_port_intf.TestSubPortIntf object at 0x7fc88f4879a0>
2023-01-12T13:05:51.9240834Z
2023-01-12T13:05:51.9241267Z def get_default_vrf_oid(self):
2023-01-12T13:05:51.9241777Z oids = self.get_oids(ASIC_VIRTUAL_ROUTER_TABLE)
2023-01-12T13:05:51.9242388Z > assert len(oids) == 1, "Wrong # of default vrfs: %d, expected #: 1." % (len(oids))
2023-01-12T13:05:51.9243217Z E AssertionError: Wrong # of default vrfs: 2, expected #: 1.
2023-01-12T13:05:51.9243707Z E assert 2 == 1
2023-01-12T13:05:51.9244678Z E -2
2023-01-12T13:05:51.9245068Z E +1

liuh-80 · 2023-03-02T02:05:08Z

/azp run

azure-pipelines · 2023-03-02T02:05:18Z

Azure Pipelines successfully started running 1 pipeline(s).

liuh-80 · 2023-04-18T05:23:44Z

/azp run

azure-pipelines · 2023-04-18T05:23:54Z

Azure Pipelines successfully started running 1 pipeline(s).

liuh-80 · 2023-04-19T06:53:08Z

/azp run

azure-pipelines · 2023-04-19T06:53:19Z

Azure Pipelines successfully started running 1 pipeline(s).

liuh-80 · 2023-04-25T07:40:17Z

Created Dash side PR for review: https://github.com/nvidia-sonic/sonic-swss/pull/1

liuh-80 · 2023-04-25T09:50:48Z

/azp run

azure-pipelines · 2023-04-25T09:50:58Z

Azure Pipelines successfully started running 1 pipeline(s).

liuh-80 · 2023-04-29T01:23:29Z

/azp run

azure-pipelines · 2023-04-29T01:23:38Z

Azure Pipelines successfully started running 1 pipeline(s).

…le. (sonic-net#2562) **What I did** Improve Consumer interface to support ZMQ based Producer/Consumer table. **Why I did it** To improve route create performance, swsscommon lib will add ZMQ based Producer/Consumer table. Because currently Consumer interface only support Redis based Producer/Consumer table, so improve this interface to support ZMQ based Producer/Consumer table. ZMQ based Producer/Consumer table can find in this PR: sonic-net/sonic-swss-common#715 **How I verified it** Pass all UT. **Details if related**

…le. (#2562) (#2778) This is a cherry-pick PR for #2562 **What I did** Improve Consumer interface to support ZMQ based Producer/Consumer table. **Why I did it** To improve route create performance, swsscommon lib will add ZMQ based Producer/Consumer table. Because currently Consumer interface only support Redis based Producer/Consumer table, so improve this interface to support ZMQ based Producer/Consumer table. ZMQ based Producer/Consumer table can find in this PR: sonic-net/sonic-swss-common#715 **How I verified it** Pass all UT. **Details if related**  **What I did** **Why I did it** **How I verified it** **Details if related**

liuh-80 added 13 commits November 11, 2022 08:30

Change to use shm

fb567f5

Add ConsumerBase

e37c4f8

Improve code

55f22c3

Change routeorch to use SHM

2d176ac

Delete binary

b33c521

Change code to use ZMQ

66c6367

Fix code

7c5ca07

Fix code

f2f94d2

Add log

565d7ba

save code

4ab30e1

Save code

9b66d78

Merge remote-tracking branch 'origin' into dev/liuh/change_to_zmq

ca4420d

Revert ZMQ related code

d9e8712

liuh-80 commented Dec 8, 2022

View reviewed changes

swssconfig/swssconfig.cpp Outdated Show resolved Hide resolved

liuh-80 requested a review from qiluo-msft January 5, 2023 05:26

liuh-80 marked this pull request as ready for review January 5, 2023 05:26

liuh-80 requested review from neethajohn and prsunny as code owners January 5, 2023 05:26

prsunny reviewed Jan 6, 2023

View reviewed changes

liuh-80 mentioned this pull request Mar 29, 2023

Add sonic-swss-common ZMQ Producer/Consumer state table design doc sonic-net/SONiC#1215

Merged

Improve code

a77db41

liuh-80 force-pushed the dev/liuh/improve_comsumer_interface branch from 352696f to a77db41 Compare April 17, 2023 07:25

Improve code

a9c7a82

liuh-80 added 2 commits April 20, 2023 00:58

Improve code

0a3ab61

Fix UT failed

47e5a1b

liuh-80 force-pushed the dev/liuh/improve_comsumer_interface branch from 12b6892 to 47e5a1b Compare April 26, 2023 02:21

liuh-80 added 2 commits April 27, 2023 12:44

Fix PR comments

1fbc58a

Revert code

764efb8

Improve code

c7e4cee

liuh-80 force-pushed the dev/liuh/improve_comsumer_interface branch from dca13df to c7e4cee Compare April 29, 2023 02:02

liuh-80 added 2 commits May 11, 2023 19:48

Improve comments

7d6f8fe

Improve code according to PR comments

57fc41b

qiluo-msft approved these changes May 12, 2023

View reviewed changes

liuh-80 merged commit a215441 into sonic-net:master May 12, 2023

liuh-80 mentioned this pull request May 17, 2023

[cherry-pick] Improve Consumer interface to support ZMQ based Producer/Consumer table. (#2562) #2778

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improve Consumer interface to support ZMQ based Producer/Consumer table. #2562

Improve Consumer interface to support ZMQ based Producer/Consumer table. #2562

liuh-80 commented Dec 8, 2022

liuh-80 commented Dec 15, 2022

azure-pipelines bot commented Dec 15, 2022

bingwang-ms commented Dec 16, 2022

azure-pipelines bot commented Dec 16, 2022

liuh-80 commented Jan 4, 2023

azure-pipelines bot commented Jan 4, 2023

liuh-80 commented Jan 5, 2023

azure-pipelines bot commented Jan 5, 2023

liuh-80 commented Jan 5, 2023

prsunny Jan 6, 2023

liuh-80 Jan 9, 2023

prsunny Jan 13, 2023

liuh-80 Jan 13, 2023

liuh-80 commented Jan 9, 2023

azure-pipelines bot commented Jan 9, 2023

liuh-80 commented Jan 13, 2023 •

edited

Loading

liuh-80 commented Mar 2, 2023

azure-pipelines bot commented Mar 2, 2023

liuh-80 commented Apr 18, 2023

azure-pipelines bot commented Apr 18, 2023

liuh-80 commented Apr 19, 2023

azure-pipelines bot commented Apr 19, 2023

liuh-80 commented Apr 25, 2023

liuh-80 commented Apr 25, 2023

azure-pipelines bot commented Apr 25, 2023

liuh-80 commented Apr 29, 2023

azure-pipelines bot commented Apr 29, 2023

Improve Consumer interface to support ZMQ based Producer/Consumer table. #2562

Improve Consumer interface to support ZMQ based Producer/Consumer table. #2562

Conversation

liuh-80 commented Dec 8, 2022

liuh-80 commented Dec 15, 2022

azure-pipelines bot commented Dec 15, 2022

bingwang-ms commented Dec 16, 2022

azure-pipelines bot commented Dec 16, 2022

liuh-80 commented Jan 4, 2023

azure-pipelines bot commented Jan 4, 2023

liuh-80 commented Jan 5, 2023

azure-pipelines bot commented Jan 5, 2023

liuh-80 commented Jan 5, 2023

prsunny Jan 6, 2023

Choose a reason for hiding this comment

liuh-80 Jan 9, 2023

Choose a reason for hiding this comment

prsunny Jan 13, 2023

Choose a reason for hiding this comment

liuh-80 Jan 13, 2023

Choose a reason for hiding this comment

liuh-80 commented Jan 9, 2023

azure-pipelines bot commented Jan 9, 2023

liuh-80 commented Jan 13, 2023 • edited Loading

liuh-80 commented Mar 2, 2023

azure-pipelines bot commented Mar 2, 2023

liuh-80 commented Apr 18, 2023

azure-pipelines bot commented Apr 18, 2023

liuh-80 commented Apr 19, 2023

azure-pipelines bot commented Apr 19, 2023

liuh-80 commented Apr 25, 2023

liuh-80 commented Apr 25, 2023

azure-pipelines bot commented Apr 25, 2023

liuh-80 commented Apr 29, 2023

azure-pipelines bot commented Apr 29, 2023

liuh-80 commented Jan 13, 2023 •

edited

Loading