Skip to content

Commit 7c5888a

Browse files
bugersredxny
andauthored
Merging to release-5.0.15: update code of usage of gorpc waitgroup (#6661) (#6662)
update code of usage of gorpc waitgroup (#6661) <details open> <summary><a href="https://tyktech.atlassian.net/browse/TT-13130" title="TT-13130" target="_blank">TT-13130</a></summary> <br /> <table> <tr> <th>Summary</th> <td>Tyk Cloud: Panic appears when a user tried to deploy GW before Control Plane is in deployed state </td> </tr> <tr> <th>Type</th> <td> <img alt="Bug" src="https://tyktech.atlassian.net/rest/api/2/universal_avatar/view/type/issuetype/avatar/10303?size=medium" /> Bug </td> </tr> <tr> <th>Status</th> <td>In Dev</td> </tr> <tr> <th>Points</th> <td>N/A</td> </tr> <tr> <th>Labels</th> <td><a href="https://tyktech.atlassian.net/issues?jql=project%20%3D%20TT%20AND%20labels%20%3D%20Re_open%20ORDER%20BY%20created%20DESC" title="Re_open">Re_open</a>, <a href="https://tyktech.atlassian.net/issues?jql=project%20%3D%20TT%20AND%20labels%20%3D%20QA_Fail%20ORDER%20BY%20created%20DESC" title="QA_Fail">QA_Fail</a></td> </tr> </table> </details> <!-- do not remove this marker as it will break jira-lint's functionality. added_by_jira_lint --> --- <!-- Provide a general summary of your changes in the Title above --> ## Description <!-- Describe your changes in detail --> ## Related Issue <!-- This project only accepts pull requests related to open issues. --> <!-- If suggesting a new feature or change, please discuss it in an issue first. --> <!-- If fixing a bug, there should be an issue describing it with steps to reproduce. --> <!-- OSS: Please link to the issue here. Tyk: please create/link the JIRA ticket. --> ## 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 --------- Co-authored-by: sredny buitrago <[email protected]> Co-authored-by: Sredny M. <[email protected]>
1 parent 2aae23b commit 7c5888a

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

rpc/rpc_client.go

-6
Original file line numberDiff line numberDiff line change
@@ -258,10 +258,6 @@ func Connect(connConfig Config, suppressRegister bool, dispatcherFuncs map[strin
258258
clientSingleton.Conns = 5
259259
}
260260

261-
for i := 0; i < clientSingleton.Conns; i++ {
262-
connectionDialingWG.Add(1)
263-
}
264-
265261
clientSingleton.Dial = func(addr string) (conn net.Conn, err error) {
266262
dialer := &net.Dialer{
267263
Timeout: 10 * time.Second,
@@ -298,8 +294,6 @@ func Connect(connConfig Config, suppressRegister bool, dispatcherFuncs map[strin
298294
conn.Write([]byte("proto2"))
299295
conn.Write([]byte{byte(len(connID))})
300296
conn.Write([]byte(connID))
301-
// only mark as done is connection is established
302-
connectionDialingWG.Done()
303297

304298
return conn, nil
305299
}

0 commit comments

Comments
 (0)