pkg/rules/proxy: fix hotlooping when receiving client errors #3732
Conversation
s-urbaniak
force-pushed
the
fix-3717
branch
2 times, most recently
from
f30a4e3
to
5b9c955
Compare
|
@squat Does it makes sense to get this fix released with |
|
yes, it very much could make sense. In this case, @s-urbaniak, I would ask that you make the pr against the release-0.18 branch instead. We would later merge this into main. |
Currently, if we receive an error from the underlying client stream, we continue with trying to receive additional data. This causes a hotloop as we will receive the same error again. This fixes it by returning in the error case and adds a unit test for the proxy logic. Fixes thanos-io#3717 Signed-off-by: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
|
@bwplotka thank you for the review! 💚 PTAL for final review :) |
|
Submitted #3734 for the 0.18 backport. |
|
Mmm rather than doing this in both branches, we should do what we always do which is merge in the release branch and then merge the release branch into the master branch no? If we all agree then I'll close this PR |
|
leaving up to the maintainers, i have both PRs open :-) |
@squat Yeah let's close this and merge the PR in release branch. I don't think we will get a conflict but let's avoid polluting the git history with duplicate changes. |
Currently, if we receive an error from the underlying client stream,
we continue with trying to receive additional data.
This causes a hotloop as we will receive the same error again.
This fixes it by returning in the error case and adds a unit test for the proxy logic.
Fixes #3717
Signed-off-by: Sergiusz Urbaniak sergiusz.urbaniak@gmail.com
Changes
Verification
Added unit tests, without the fix the unit test will hotloop.
cc @bwplotka @kakkoyun @squat