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

c-deps: bump RocksDB to pick up ingest-external-file deadlock #34830

Merged
merged 1 commit into from
Feb 12, 2019

Conversation

petermattis
Copy link
Collaborator

Fixes #34212

Release note (bug fix): Fix a deadlock that could occur during IMPORT
and RESTORE, causing all writes on a node to be stopped.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fixes cockroachdb#34212

Release note (bug fix): Fix a deadlock that could occur during IMPORT
and RESTORE, causing all writes on a node to be stopped.
@petermattis petermattis requested a review from a team February 12, 2019 16:21
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@petermattis petermattis requested a review from tbg February 12, 2019 16:21
Copy link
Member

@tbg tbg left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 1 files at r1.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained

@petermattis
Copy link
Collaborator Author

bors r=tbg

craig bot pushed a commit that referenced this pull request Feb 12, 2019
34818: sql/pgwire: use OIDs when encoding some datum types r=mjibson a=mjibson

Teach pgwire how to encode int and float with the various widths. Do
this by saving the oids during SetColumns.

Teach cmd/generate-binary to also record oids and use those in tests.

Fix varbits to expect the same OID as postgres produces.

Sadly, our int2 and int4 types don't yet propagate all the way down
and so we still encode them as an int8. This commit is a precursor to
supporting that.

Release note: None

34830: c-deps: bump RocksDB to pick up ingest-external-file deadlock r=tbg a=petermattis

Fixes #34212

Release note (bug fix): Fix a deadlock that could occur during IMPORT
and RESTORE, causing all writes on a node to be stopped.

Co-authored-by: Matt Jibson <matt.jibson@gmail.com>
Co-authored-by: Peter Mattis <petermattis@gmail.com>
@craig
Copy link
Contributor

craig bot commented Feb 12, 2019

Build succeeded

@craig craig bot merged commit dad264e into cockroachdb:master Feb 12, 2019
@petermattis petermattis deleted the pmattis/bump-rocksdb branch February 12, 2019 19:21
@tbg tbg mentioned this pull request Feb 19, 2019
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.

sql: bulk index backfill getting stuck
3 participants