Merging to release-5.3.6: TT-13130 only mark the wg as done when the connection is stablished (#6574) #6577
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
…6574) ### **User description** <!-- Provide a general summary of your changes in the Title above --> ## Description When the gw is ran as edge we want this to wait until the connection is established with MDCB before attempting to pull policies and apis, we should only mark the connection waitgroup as done when the connection is successful not on every attempt ## Related Issue TT-13130 ## Motivation and Context <!-- Why is this change required? What problem does it solve? --> ## How This Has Been Tested <!-- Please describe in detail how you tested your changes --> <!-- Include details of your testing environment, and the tests --> <!-- you ran to see how your change affects other areas of the code, etc. --> <!-- This information is helpful for reviewers and QA. --> ## Screenshots (if appropriate) ## Types of changes <!-- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] Refactoring or add test (improvements in base code or adds test coverage to functionality) ## Checklist <!-- Go over all the following points, and put an `x` in all the boxes that apply --> <!-- If there are no documentation updates required, mark the item as checked. --> <!-- Raise up any additional concerns not covered by the checklist. --> - [ ] I ensured that the documentation is up to date - [ ] I explained why this PR updates go.mod in detail with reasoning why it's required - [ ] I would like a code coverage CI quality gate exception and have explained why ___ ### **PR Type** Bug fix ___ ### **Description** - Fixed the logic in `rpc_client.go` to ensure the waitgroup is marked as done only when a connection is successfully established. - Removed the `Done()` call from the defer statement and added it after the connection is confirmed. ___ ### **Changes walkthrough** 📝 <table><thead><tr><th></th><th align="left">Relevant files</th></tr></thead><tbody><tr><td><strong>Bug fix</strong></td><td><table> <tr> <td> <details> <summary><strong>rpc_client.go</strong><dd><code>Fix waitgroup completion logic in connection establishment</code></dd></summary> <hr> rpc/rpc_client.go <li>Removed the <code>Done()</code> call from the defer statement in the <code>Dial</code> function.<br> <li> Added <code>Done()</code> call after the connection is successfully established.<br> <li> Ensures the waitgroup is marked as done only upon successful <br>connection.<br> </details> </td> <td><a href="https://github.com/TykTechnologies/tyk/pull/6574/files#diff-3b88914c99bb9418e44e6389ce73579843562e8900730b380d7fff2e95c51033">+2/-1</a> </td> </tr> </table></td></tr></tr></tbody></table> ___ > 💡 **PR-Agent usage**: Comment `/help "your question"` on any pull request to receive relevant information Co-authored-by: sredny buitrago <sredny@srednys-MacBook-Pro.local> (cherry picked from commit 5c1f149)
|
API Changes no api changes detected |
PR Reviewer Guide 🔍
|
PR Code Suggestions ✨
|
|
sredxny
approved these changes
Sep 23, 2024
lghiur
deleted the
merge/release-5.3.6/5c1f1498888e0275526da044423e3e5ae2370976
branch
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.
User description
TT-13130 only mark the wg as done when the connection is stablished (#6574)
User description
Description
When the gw is ran as edge we want this to wait until the connection is
established with MDCB before attempting to pull policies and apis, we
should only mark the connection waitgroup as done when the connection is
successful not on every attempt
Related Issue
TT-13130
Motivation and Context
How This Has Been Tested
Screenshots (if appropriate)
Types of changes
functionality to change)
coverage to functionality)
Checklist
why it's required
explained why
PR Type
Bug fix
Description
rpc_client.goto ensure the waitgroup is markedas done only when a connection is successfully established.
Done()call from the defer statement and added it afterthe connection is confirmed.
Changes walkthrough 📝
rpc_client.go
Fix waitgroup completion logic in connection establishmentrpc/rpc_client.go
Done()call from the defer statement in theDialfunction.Done()call after the connection is successfully established.connection.
Co-authored-by: sredny buitrago sredny@srednys-MacBook-Pro.local
PR Type
Bug fix
Description
rpc_client.gowhere the connection waitgroup was marked as done prematurely. Now, it is marked as done only after the connection is successfully established.Changes walkthrough 📝
rpc_client.go
Ensure waitgroup is marked done only after successful connectionrpc/rpc_client.go
dialing function.
successfully established.