Skip to content
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

Automated cherry pick of #11807 #12087

Conversation

spzala
Copy link
Member

@spzala spzala commented Jun 27, 2020

Cherry pick of #11807 on release-3.3.

#11807: wal: fix panic when decoder not set

@spzala spzala force-pushed the automated-cherry-pick-of-#11807-upstream-release-3.3 branch 2 times, most recently from 2df9570 to fcab17d Compare June 27, 2020 18:19
@spzala
Copy link
Member Author

spzala commented Jun 27, 2020

Also trying to fix the error introduced under #12078

@spzala spzala force-pushed the automated-cherry-pick-of-#11807-upstream-release-3.3 branch 2 times, most recently from bf434af to 76c988e Compare June 27, 2020 20:26
Handle the related panic and clarify doc.
@spzala spzala force-pushed the automated-cherry-pick-of-#11807-upstream-release-3.3 branch from 76c988e to abd80f3 Compare June 27, 2020 21:24
invalidCosts := [2]int{bcrypt.MinCost - 1, bcrypt.MaxCost + 1}
for _, invalidCost := range invalidCosts {
as := NewAuthStore(b, nil, tp, invalidCost)
if as.BcryptCost() != bcrypt.DefaultCost {
Copy link
Member Author

@spzala spzala Jun 27, 2020

Choose a reason for hiding this comment

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

3.3 doesn't have this func BcryptCost()

@spzala
Copy link
Member Author

spzala commented Jun 27, 2020

The build failure is not related and a known flake.

@gyuho gyuho merged commit 13f92b4 into etcd-io:release-3.3 Jul 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants