[portsorch] process PortsOrch tables in specific order#1108
Merged
qiluo-msft merged 4 commits intosonic-net:masterfrom Jan 15, 2020
Merged
[portsorch] process PortsOrch tables in specific order#1108qiluo-msft merged 4 commits intosonic-net:masterfrom
qiluo-msft merged 4 commits intosonic-net:masterfrom
Conversation
qiluo-msft
reviewed
Oct 28, 2019
| } | ||
| } | ||
|
|
||
| void PortsOrch::doTask() |
Contributor
There was a problem hiding this comment.
doTask [](start = 16, length = 6)
Why you override Orch::doTask()? It will leave tasks in other tables undone. #Closed
Contributor
Author
There was a problem hiding this comment.
Which tables? everything that m_consumerMap has will be processed #Closed
Contributor
There was a problem hiding this comment.
I see you are trying to specify drain order. How about reuse Orch::doTask for your second half?
In reply to: 339998153 [](ancestors = 339998153)
Contributor
Author
There was a problem hiding this comment.
If I reuse Orch::doTask failed items from APP_PORT_TABLE will be processed again, thats why a condition if (consumer == portConsumer) to skip port table was added in second half.
Another scenario - when portsorch processes "PortInitDone" it explicitly returns because other orchs can start their operations. Orch::doTask reuse will make PortsOrch proceed after PortinitDone and configure port attributes like admin status, mtu, speed and so on, before BufferOrch apply buffers so there will be a chance that ports will be operationaly up when buffers are applied.
21e4061 to
7475254
Compare
7475254 to
334040d
Compare
qiluo-msft
reviewed
Dec 3, 2019
| { | ||
| auto tableName = it.first; | ||
| auto consumer = it.second.get(); | ||
| if (find(tableOrder.begin(), tableOrder.end(), tableName) != tableOrder.end()) |
Contributor
There was a problem hiding this comment.
find(tableOrder.begin(), tableOrder.end(), tableName) != tableOrder.end() [](start = 12, length = 73)
The code shows if tableName is found in tableOrder, it will be drained.
I guess you wanted to drain ones not found in tableOrder. #Closed
Contributor
There was a problem hiding this comment.
Contributor
Author
There was a problem hiding this comment.
You are correct, this is a bug. I'm fixing it.
Test passes because tableOrder contains all tables which PortsOrch uses, so no more tables had to be drained.
Contributor
Author
|
retest this please |
qiluo-msft
previously approved these changes
Dec 4, 2019
Contributor
Author
|
retest this please |
kcudnik
reviewed
Dec 10, 2019
| */ | ||
|
|
||
| for (auto it = 0; it < 4; it++) | ||
| for (auto it = 0; it < 3; it++) |
Contributor
There was a problem hiding this comment.
make this iteration count as define ? or constexpr ? with proper name
Contributor
Author
|
According to log from test run on jenkins: The vlan was actually removed but 2 seconds later, by that time the test already finishes with failure. |
Contributor
|
if its building against sairedis-master, then it can be related to this change: sonic-net/sonic-sairedis#543, its causing vs test to fail, but seems to fail in different test than yours, im investigaiting to fix this |
Collaborator
|
@kcudnik any update? can we move forward with this PR? |
Contributor
|
Hey, you closed this PR ?? |
Contributor
|
Please resolve the conflict. #Closed |
0da27e7 to
5dd2275
Compare
Signed-off-by: Stepan Blyschak <stepanb@mellanox.com> Conflicts: tests/mock_tests/portsorch_ut.cpp
Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
Don't care if PORT_TABLE was not processed fully, we care about LAG, LAG_TABLE, VLAN and VLAN_TABLE. Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
5dd2275 to
2a71444
Compare
Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
Contributor
Author
|
retest this please |
qiluo-msft
approved these changes
Jan 14, 2020
Collaborator
|
retest vs please |
Collaborator
|
retest this please |
abdosi
pushed a commit
that referenced
this pull request
Jan 21, 2020
* [portsorch] process PortsOrch tables in specific order * [portsorch] fix other tables not drained and make tableOrder constexpr * [portsorch_ut] fix test according to fix in portsorch Don't care if PORT_TABLE was not processed fully, we care about LAG, LAG_TABLE, VLAN and VLAN_TABLE. * [tests] fix ut after unsuccessful conflict resolution
prsunny
pushed a commit
that referenced
this pull request
Jan 28, 2020
* [portsorch] process PortsOrch tables in specific order * [portsorch] fix other tables not drained and make tableOrder constexpr * [portsorch_ut] fix test according to fix in portsorch Don't care if PORT_TABLE was not processed fully, we care about LAG, LAG_TABLE, VLAN and VLAN_TABLE. * [tests] fix ut after unsuccessful conflict resolution
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What I did
Why I did it
How I verified it
Details if related
To support hitless warm reboot on Mellanox we need to add lag member before any other objects are created that depend on LAG, like RIF