Fix The Server Impl so OVN-K CI can pass #238
Merged
Conversation
This file contains 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
This fixes a couple of bugs with the Populate2/Update2 handling Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
There are issues when list_dbs fails due to context deadline exceeded and for some reason the `defer` doesn't properly clean up the rpcClient. This isn't the best fix, but it does solve the problem for now. Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
dave-tucker
force-pushed
the
fix-server
branch
from
f3904c7
to
f4b7669
Compare
This ensures that the cache is locked when calling Populate/Populate2 and expands the model used to represent the OVS table such that we don't have issues caused by Monitors attempting to update unmapped fields. In future, we should probably change the Monitor code to only ask for ORM mapped fields. Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
dave-tucker
force-pushed
the
fix-server
branch
from
f4b7669
to
930e336
Compare
Pull Request Test Coverage Report for Build 1320580526
💛 - Coveralls |
Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
dave-tucker
force-pushed
the
fix-server
branch
from
96fd16a
to
ceaf12d
Compare
trozet
reviewed
Oct 8, 2021
| } | ||
| } | ||
| default: | ||
| panic("ARGH!") |
There was a problem hiding this comment.
should this be something more descriptive? Like "libovsdb: Invalid type detected during merge?
| } | ||
|
|
||
| func insertToSlice(a, b reflect.Value) reflect.Value { | ||
| func insertToSlice(a, b reflect.Value) (reflect.Value, bool) { |
There was a problem hiding this comment.
would be nice on some of these functions to have doc text on them. a is the slice, b is the value to attempt to insert into the slice if it doesn't already exist in a. Returns true if b was added to a.
| @@ -58,74 +57,121 @@ func mutate(current interface{}, mutator ovsdb.Mutator, value interface{}) (inte | |||
| return current, value | |||
| } | |||
|
|
|||
| func mutateInsert(current, value interface{}) interface{} { | |||
| func mutateInsert(current, value interface{}) (interface{}, interface{}) { | |||
There was a problem hiding this comment.
same some doctext on this function
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Signed-off-by: Dave Tucker dave@dtucker.co.uk