*: fix flow control deadlock (port to master) (#1837)

[ti-chi-bot]

This is an automated cherry-pick of #1837

What problem does this PR solve?

#1779

What is changed and how it works?

#1779

Check List

Tests

• Unit test
• Integration test

Related changes

• Need to cherry-pick to the release branch

Release note

• Flow Control bug fix (no released version affected)

[amyangfei]

Merge this PR after #1840 is merged

[ti-chi-bot]

[REVIEW NOTIFICATION]

This pull request has been approved by:

• amyangfei
• leoppro

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

[amyangfei]

/merge

[ti-chi-bot]

This pull request has been accepted and is ready to merge.

Commit hash: d808250

[amyangfei]

/run-unit-tests

[codecov-commenter]

Codecov Report

❗ No coverage uploaded for pull request base (release-5.0@669c904). Click here to learn what that means.
The diff coverage is n/a.

@@               Coverage Diff                @@
##             release-5.0      #1859   +/-   ##
================================================
  Coverage               ?   53.8634%           
================================================
  Files                  ?        155           
  Lines                  ?      16475           
  Branches               ?          0           
================================================
  Hits                   ?       8874           
  Misses                 ?       6652           
  Partials               ?        949