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

backport (query: fix deadlock in endpointset (#4795)) #4926

Merged
merged 1 commit into from
Dec 7, 2021

Conversation

aymericDD
Copy link
Contributor

Avoid RLock()ing twice as described here:
#4766 (comment)
(due to
https://stackoverflow.com/questions/30547916/goroutine-blocks-when-calling-rwmutex-rlock-twice-after-an-rwmutex-unlock/30549188).
Fix it by removing HasClients() and simply changing it with er.clients != nil.

Signed-off-by: Giedrius Statkevičius [email protected]

  • I added CHANGELOG entry for this change.
  • Change is not relevant to the end user.

Changes

Verification

@GiedriusS
Copy link
Member

Thx, let's add the DCO 👍 cc @squat

@squat
Copy link
Member

squat commented Dec 6, 2021

Sounds good to me. I can cut the next patch release for 0.23 and add this to the change log

@aymericDD
Copy link
Contributor Author

aymericDD commented Dec 6, 2021

@GiedriusS I cannot pass the DCO step because it is your commit.

@GiedriusS
Copy link
Member

@GiedriusS I cannot pass the DCO step because it is your commit.

Ofc you can, just add your DCO on top with the suggested commands ;P

Avoid RLock()ing twice as described here:
thanos-io#4766 (comment)
(due to
https://stackoverflow.com/questions/30547916/goroutine-blocks-when-calling-rwmutex-rlock-twice-after-an-rwmutex-unlock/30549188).
Fix it by removing HasClients() and simply changing it with `er.clients != nil`.

Signed-off-by: Giedrius Statkevičius <[email protected]>
Signed-off-by: Aymeric <[email protected]>
@aymericDD
Copy link
Contributor Author

My bad 😇 My DCO is added to the commit

@squat
Copy link
Member

squat commented Dec 7, 2021

Thanks @aymericDD (:
The docs check is failing because of this recent PR: #4896
It seems that when we build docs, we are using the directory structure of the current commit but then trying to access the docs from main, which is not guaranteed to work, and indeed fails in this case because the main branch has moved this doc. If we want to get this PR to build, we need to cherry-pick this commit, which seems silly. I would say we merge this and then consider making a PR to the release-0.23 branch to fix CI.

WDYT @GiedriusS?

Copy link
Member

@bwplotka bwplotka left a comment

Choose a reason for hiding this comment

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

Makes sense, thanks!

@bwplotka bwplotka merged commit 7b79fc7 into thanos-io:release-0.23 Dec 7, 2021
@aymericDD
Copy link
Contributor Author

@squat do you know when the fix release will be published? It is very painful for us to maintain Thanos in production. Our queries are stuck or restart after a long time and we have high latency....

@squat
Copy link
Member

squat commented Dec 8, 2021

Today 👍

@aymericDD
Copy link
Contributor Author

Thanks @squat 👍

@squat
Copy link
Member

squat commented Dec 9, 2021

Here's the new PR to cut 0.23.2: #4936

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants