Skip to content

blobs,changefeedccl: append ".tmp" to temp files + deflake TestChangefeedNemeses#42987

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
knz:20191205-tmp
Dec 5, 2019
Merged

blobs,changefeedccl: append ".tmp" to temp files + deflake TestChangefeedNemeses#42987
craig[bot] merged 1 commit intocockroachdb:masterfrom
knz:20191205-tmp

Conversation

@knz
Copy link
Copy Markdown
Contributor

@knz knz commented Dec 5, 2019

Fixes #42978.

Prior to this test the blob storage would merely append random numbers
at the end of the file name to generate temp file names. This was
confusing TestChangefeedNemeses which checks the validity of the
various files in the target directory.

This patch fixes it by:

  • using a .tmp suffix for temp files
  • excluding .tmp files from the walk performed by TestChangefeedNemeses

Release note: None

@knz knz requested a review from danhhz December 5, 2019 15:46
@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.

:lgtm: thanks for the fix!

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


pkg/ccl/changefeedccl/cdctest/testfeed.go, line 626 at r1 (raw file):

		return nil
	}
	if strings.HasSuffix(path, ".tmp") {

looks like we already have this check on line 617. ha!

@knz
Copy link
Copy Markdown
Contributor Author

knz commented Dec 5, 2019

looks like we already have this check on line 617. ha!

🤦‍♂️

…feedNemeses

Prior to this test the blob storage would merely append random numbers
at the end of the file name to generate temp file names.  This was
confusing TestChangefeedNemeses which checks the validity of the
various files in the target directory.

This patch fixes it by using a `.tmp` suffix for temp files. These are
already properly ignored by the walk performed by
TestChangefeedNemeses.

Release note: None
@knz
Copy link
Copy Markdown
Contributor Author

knz commented Dec 5, 2019

TFYR!

bors r+

craig bot pushed a commit that referenced this pull request Dec 5, 2019
42970: opt: split tpch stats quality tests r=RaduBerinde a=RaduBerinde

opt: split tpch stats quality tests

Splitting the tpch stats quality tests into more manageable multiple
files, one per query. This allows re-running only particular queries.

Release note: None

----

opt: convert panics to errors for stats directive

Currently if a plan changes and a save table name is no longer
correct, we get a panic. The panic is annoying to work with (it stops
running other subtests). This change converts the panic in this case
to an error.

Release note: None


42987: blobs,changefeedccl: append ".tmp" to temp files + deflake TestChangefeedNemeses r=knz a=knz

Fixes #42978.

Prior to this test the blob storage would merely append random numbers
at the end of the file name to generate temp file names.  This was
confusing TestChangefeedNemeses which checks the validity of the
various files in the target directory.

This patch fixes it by:

- using a `.tmp` suffix for temp files
- excluding `.tmp` files from the walk performed by TestChangefeedNemeses

Release note: None

Co-authored-by: Radu Berinde <radu@cockroachlabs.com>
Co-authored-by: Raphael 'kena' Poss <knz@thaumogen.net>
@craig
Copy link
Copy Markdown
Contributor

craig bot commented Dec 5, 2019

Build succeeded

@craig craig bot merged commit edc2386 into cockroachdb:master Dec 5, 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.

ccl/changefeedccl: TestChangefeedNemeses failed

3 participants