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

Revert "sql: improve stack trace for get-user-timeout timeouts" #96504

Merged
merged 1 commit into from
Feb 6, 2023

Conversation

rafiss
Copy link
Collaborator

@rafiss rafiss commented Feb 3, 2023

This reverts commit 662e19c.

gRPC does not expect the context to be wrapped, so it can get confused.

informs #95794
Release note: None

This reverts commit 662e19c.

gRPC does note expect the context to be wrapped, so it can get confused.

Release note: None
@rafiss rafiss requested a review from ecwall February 3, 2023 16:03
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@rafiss
Copy link
Collaborator Author

rafiss commented Feb 3, 2023

tftr!

bors r=ecwall

@rafiss
Copy link
Collaborator Author

rafiss commented Feb 3, 2023

bors r-

#96483 might replace this

@craig
Copy link
Contributor

craig bot commented Feb 3, 2023

Canceled.

@otan
Copy link
Contributor

otan commented Feb 5, 2023

as a release branch is getting prepped soon (tomorrow or day after IIRC), we either need to decide to merge this or the other change before then.

@rafiss
Copy link
Collaborator Author

rafiss commented Feb 5, 2023

this is on the master branch. is a release being cut from here? the 22.1 revert already was merged.

@otan
Copy link
Contributor

otan commented Feb 5, 2023

#96505 22.2 doesn't look merged :D

oops, i think master is fine but we should pull the trigger on 22.2

@rafiss
Copy link
Collaborator Author

rafiss commented Feb 5, 2023

yeah, I'm fine to merge that. the next 22.2 tag is scheduled for next week I think.

@rafiss
Copy link
Collaborator Author

rafiss commented Feb 6, 2023

bors r=ecwall

@craig
Copy link
Contributor

craig bot commented Feb 6, 2023

Build failed (retrying...):

@craig
Copy link
Contributor

craig bot commented Feb 6, 2023

Build succeeded:

@craig craig bot merged commit 0723521 into cockroachdb:master Feb 6, 2023
@rafiss rafiss deleted the revert-ctx-stack-trace branch February 6, 2023 19:17
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