Skip to content

fix: Backport limit spin loop in TLSActor #29922 #31975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 20, 2023

Conversation

johanandren
Copy link
Contributor

@johanandren johanandren commented Jun 16, 2023

Refs #29922

Backport of fix from 2.8 release line.

Backport of fix from 2.8 release line.
@@ -480,7 +492,6 @@ import akka.util.ByteString
pump()
}

// FIXME: what happens if this actor dies unexpectedly?
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Accidental cherry pick removal but doesn't really matter.

@johanandren johanandren changed the title fix: Try to limit spin loop in TLSActor #29922 fix: Backport limit spin loop in TLSActor #29922 Jun 16, 2023
Copy link
Contributor

@octonato octonato left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@octonato
Copy link
Contributor

Oh, it seems that branch is still configured with Travis which won't run and GH Actions didn't kick in either.

@johanandren
Copy link
Contributor Author

Tested locally, both akka test suite and akka-http tests show no TLS spec related surprises there.

@johanandren johanandren requested a review from patriknw June 20, 2023 14:05
s"Stuck in unwrap loop, bailing out, last handshake status [$lastHandshakeStatus], " +
s"remaining=${transportInBuffer.remaining}, out=${userOutBuffer.position()}, " +
"(https://github.com/akka/akka/issues/29922)")
}
transportInChoppingBlock.putBack(transportInBuffer)
case FINISHED =>
flushToUser()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comparing main and 2.6 I see that there is another change that might be related but I don't know. https://github.com/akka/akka/pull/31433/files

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, wasn't sure that was related, so opted to not backport that when I was looking at it. Not sure that is the right decision though, that flush-change is also pretty minimal.

@patriknw
Copy link
Contributor

Oh, it seems that branch is still configured with Travis which won't run and GH Actions didn't kick in either.

I'm pretty sure we used GitHub Actions for 2.6. It had an old branch protection wildcard, which I have changed so hopefully this will run CI now.

@johanandren johanandren reopened this Jun 20, 2023
@johanandren
Copy link
Contributor Author

close-open to trigger CI

@johanandren
Copy link
Contributor Author

Meh, old versions of github actions and the security settings for those blocking CI from running now.

@johanandren
Copy link
Contributor Author

I'll allow those temporarily.

@johanandren johanandren reopened this Jun 20, 2023
@octonato octonato merged commit 5361846 into akka:release-2.6 Jun 20, 2023
@octonato octonato added this to the 2.6.21 milestone Jun 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy