rpcsrv: carefully store Oracle service instance #3085
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
Broken by #3084. Signed-off-by: Anna Shaleva <[email protected]>
|
The test for the case of disabled Oracle service is added in the #3063. |
AnnaShaleva
force-pushed
the
fix-oracle-instance
branch
from
9c9d2fe
to
980769a
Compare
|
This makes |
AnnaShaleva
force-pushed
the
fix-oracle-instance
branch
from
980769a
to
e4aa13e
Compare
roman-khimov
reviewed
Aug 9, 2023
AnnaShaleva
force-pushed
the
fix-oracle-instance
branch
from
e4aa13e
to
8ae8630
Compare
roman-khimov
approved these changes
Aug 9, 2023
And simplify atomic service value stored by RPC server. Oracle service can either be an untyped nil or be the proper non-nil *oracle.Oracle. Otherwise `submitoracleresponse` RPC handler doesn't work properly. Signed-off-by: Anna Shaleva <[email protected]>
AnnaShaleva
force-pushed
the
fix-oracle-instance
branch
from
8ae8630
to
c391537
Compare
tatiana-nspcc
approved these changes
Aug 10, 2023
Comment on lines
-2464
to
+2466
| oracle := s.oracle.Load().(*OracleHandler) | ||
| if oracle == nil || *oracle == nil { | ||
| oraclePtr := s.oracle.Load() | ||
| if oraclePtr == nil { |
There was a problem hiding this comment.
Cool! Thank you for fixing
roman-khimov
approved these changes
Aug 10, 2023
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.
Problem
Invalid
submitoracleresponseRPC handler behaviour in case of disabled Oracle service: noneorpc.NewRPCError("Oracle is not enabled", "")error is returned. Thanks to @tatiana-nspcc for the report.Solution
Check for typed nil value while setting Oracle service. I know, that we don't want to import the whole
oraclepackage from therpcsrv, but the alternatives I see looks worser to me:rpcsrv.New(...)is used. It's not very convinient; there are three places in the code and a couple more in tests.rpcsrvto ensure that Oracle service is really nil. We'd better avoid reflection untill there are no other choices.