Skip to content

logictest: fix retry on query that returns a fleeting error#95714

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
cucaroach:retry-fix
Jan 24, 2023
Merged

logictest: fix retry on query that returns a fleeting error#95714
craig[bot] merged 1 commit intocockroachdb:masterfrom
cucaroach:retry-fix

Conversation

@cucaroach
Copy link
Copy Markdown
Contributor

@cucaroach cucaroach commented Jan 24, 2023

Fixes: #95664
Release note: None
Epic: CRDB-20535

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@cucaroach cucaroach force-pushed the retry-fix branch 2 times, most recently from 6dfe876 to 9267aaf Compare January 24, 2023 03:54
@cucaroach cucaroach changed the title wip: trying retry fix logictest: fix retry on query that returns a fleeting error Jan 24, 2023
@cucaroach cucaroach force-pushed the retry-fix branch 2 times, most recently from 61e6eb0 to 5306c78 Compare January 24, 2023 04:00
@cucaroach cucaroach marked this pull request as ready for review January 24, 2023 12:26
@cucaroach cucaroach requested review from a team and mgartner January 24, 2023 12:26
Copy link
Copy Markdown
Member

@yuzefovich yuzefovich left a comment

Choose a reason for hiding this comment

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

Nice! :lgtm:

Reviewed 10 of 10 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @cucaroach and @mgartner)


-- commits line 4 at r1:
nit: also fixes #95700


pkg/sql/logictest/logic.go line 3231 at r1 (raw file):

		}
	}
	return false, fmt.Errorf("%s: %s\nexpected success, but found\n%s", pos, sql, formatErr(err))

nit: add a quick comment for why we're returning this error but still do Errorf above for error from stmt.Close.

@cucaroach
Copy link
Copy Markdown
Contributor Author

TFTR!
bors r+

Copy link
Copy Markdown
Collaborator

@rytaft rytaft left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 10 of 10 files at r1, 1 of 1 files at r2, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (and 1 stale) (waiting on @cucaroach and @mgartner)


pkg/sql/logictest/testdata/logic_test/retry line 6 at r1 (raw file):


# Unit test for bug #95664, retry on a query producing an error should
# try again and succeed if err doesn't happen again.

nice test!

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jan 24, 2023

Build succeeded:

@craig craig bot merged commit 64b182c into cockroachdb:master Jan 24, 2023
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.

pkg/sql/logictest/tests/fakedist/fakedist_test: TestLogic_inverted_filter_geospatial failed

4 participants