Skip to content

roachtest/cdc: fix cdc/bank and cdc/schemareg#42746

Merged
craig[bot] merged 2 commits intocockroachdb:masterfrom
nvb:nvanbenschoten/fixCDC
Nov 25, 2019
Merged

roachtest/cdc: fix cdc/bank and cdc/schemareg#42746
craig[bot] merged 2 commits intocockroachdb:masterfrom
nvb:nvanbenschoten/fixCDC

Conversation

@nvb
Copy link
Copy Markdown
Contributor

@nvb nvb commented Nov 25, 2019

Fixes #41177.
Fixes #42690.

These were both broken by #41793 because prior versions of crdb didn't support the WITH diff option.

Partial fix for cockroachdb#42690.

I don't think this ever worked. The schema change backfill for the dropped
column `b` results in a record for each row that was previously inserted.
@nvb nvb requested a review from danhhz November 25, 2019 19:08
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Contributor

@danhhz danhhz left a comment

Choose a reason for hiding this comment

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

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @danhhz and @nvanbenschoten)


pkg/cmd/roachtest/cdc.go, line 280 at r2 (raw file):

	// NB: the WITH diff option was not supported until v20.1.
	withDiff := t.IsBuildVersion("v19.2.1")

Is this right? We're not going to backport, so wouldn't this start failing again when we release 19.2.2?

@nvb nvb force-pushed the nvanbenschoten/fixCDC branch from 416d073 to 7044348 Compare November 25, 2019 20:26
Copy link
Copy Markdown
Contributor Author

@nvb nvb 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 r2.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @danhhz and @nvanbenschoten)


pkg/cmd/roachtest/cdc.go, line 280 at r2 (raw file):

Previously, danhhz (Daniel Harrison) wrote…

Is this right? We're not going to backport, so wouldn't this start failing again when we release 19.2.2?

Nope, it's not right. I was thinking that this was the cluster version (which hasn't been bumped on master), but it's actually the build version (which has). Fixed.

@nvb
Copy link
Copy Markdown
Contributor Author

nvb commented Nov 25, 2019

TFTR!

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Nov 25, 2019

Build failed (retrying...)

craig bot pushed a commit that referenced this pull request Nov 25, 2019
42650: sql: stop observing the CommitTimestamp in TRUNCATE r=ajwerner a=ajwerner

In #40581 we stopped observing the commit timestamp to write it into table
descriptors. In this change I overlooked (rather forgot) about this additional
place in the code where we observed the commit timestamp. As far as I can tell
we don't read this field anywhere ever. Furthermore we know that the the table
descriptor in question to which we are referring must be alive and equal to
the provided value at the timestamp at which it was read due to serializability.
In short, this minor change continues to populate the field with a sensible
value and will permit TRUNCATE to be pushed.

Fixes #41566.

Release note (bug fix): Long running transactions which attempt to TRUNCATE
can now be pushed and will commit in cases where they previously could fail
or retry forever.

42746: roachtest/cdc: fix cdc/bank and cdc/schemareg r=nvanbenschoten a=nvanbenschoten

Fixes #41177.
Fixes #42690.

These were both broken by #41793 because prior versions of crdb didn't support the `WITH diff` option.

Co-authored-by: Andrew Werner <ajwerner@cockroachlabs.com>
Co-authored-by: Nathan VanBenschoten <nvanbenschoten@gmail.com>
@craig
Copy link
Copy Markdown
Contributor

craig bot commented Nov 25, 2019

Build succeeded

@craig craig bot merged commit 7044348 into cockroachdb:master Nov 25, 2019
@nvb nvb deleted the nvanbenschoten/fixCDC branch December 27, 2019 22:59
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.

roachtest: cdc/schemareg failed roachtest: cdc/bank failed

3 participants