Skip to content

logictest: add local-mixed-22.2-23.1 to default configs#99866

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
rafiss:mixed-version-default-config
Apr 5, 2023
Merged

logictest: add local-mixed-22.2-23.1 to default configs#99866
craig[bot] merged 1 commit intocockroachdb:masterfrom
rafiss:mixed-version-default-config

Conversation

@rafiss
Copy link
Copy Markdown
Collaborator

@rafiss rafiss commented Mar 28, 2023 •
edited
Loading

This will help catch mixed version bugs. Ever since 4424f86 was merged, this config will use the v22.2 system schema while operating with a v23.1 binary.

Epic: None
Release note: None

@cockroach-teamcity
Copy link
Copy Markdown
Member

cockroach-teamcity commented Mar 28, 2023

This change is Reviewable

@rafiss rafiss force-pushed the mixed-version-default-config branch 7 times, most recently from 99524a8 to 10b420c Compare April 4, 2023 14:53
@rafiss
Copy link
Copy Markdown
Collaborator Author

rafiss commented Apr 4, 2023

The latest CI failure has:

Failed
=== RUN   TestCCLLogic_partitioning_enum
    test_log_scope.go:161: test logs captured to: /artifacts/tmp/_tmp/0817673d1f07fbf06f1393f987f3a3c7/logTestCCLLogic_partitioning_enum31111442
    test_log_scope.go:79: use -show-logs to present logs inline
    testcluster.go:391: migration-manager-find-jobs: system-jobs-scan: relation "system.job_info" does not exist

This is despite this PR including 858d874 in it, which I thought would prevent this. @knz or @adityamaru: Was I mistaken about that commit?

@knz knz mentioned this pull request Apr 4, 2023
Closed
@knz
Copy link
Copy Markdown
Contributor

knz commented Apr 4, 2023

filed #100609

@rafiss rafiss force-pushed the mixed-version-default-config branch 3 times, most recently from 055b72b to 4fbd5c7 Compare April 5, 2023 16:22
@rafiss
logictest: add local-mixed-22.2-23.1 to default configs
34471dd 
This will help catch mixed version bugs. Ever since 4424f86
was merged, this config will use the v22.2 system schema
while operating with a v23.1 binary.

Release note: None
@rafiss rafiss force-pushed the mixed-version-default-config branch from 4fbd5c7 to 34471dd Compare April 5, 2023 18:41
@rafiss rafiss marked this pull request as ready for review April 5, 2023 19:11
@rafiss rafiss requested a review from a team as a code owner April 5, 2023 19:11
@rafiss rafiss requested review from a team and msirek April 5, 2023 19:11
yuzefovich
yuzefovich reviewed Apr 5, 2023
View reviewed changes
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.

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

pkg/sql/sqlitelogictest/tests/local-mixed-22.2-23.1/BUILD.bazel line 5 at r3 (raw file):

go_test(
    name = "local-mixed-22_2-23_1_test",

Just double checking that you ran sqlite tests with this config too, right?

rafiss
rafiss commented Apr 5, 2023
View reviewed changes
Copy link
Copy Markdown
Collaborator Author

@rafiss rafiss 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 @msirek and @yuzefovich)

pkg/sql/sqlitelogictest/tests/local-mixed-22.2-23.1/BUILD.bazel line 5 at r3 (raw file):

Previously, yuzefovich (Yahor Yuzefovich) wrote…

Just double checking that you ran sqlite tests with this config too, right?

yes, those tests passed

@rafiss rafiss requested a review from chengxiong-ruan April 5, 2023 20:58
chengxiong-ruan
chengxiong-ruan approved these changes Apr 5, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@chengxiong-ruan chengxiong-ruan left a comment

Choose a reason for hiding this comment

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

LGTM!

@rafiss
Copy link
Copy Markdown
Collaborator Author

rafiss commented Apr 5, 2023

tftr!

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig Bot commented Apr 5, 2023

Build succeeded:

@craig craig Bot merged commit 42abc0c into cockroachdb:master Apr 5, 2023
@rafiss
Copy link
Copy Markdown
Collaborator Author

rafiss commented Apr 5, 2023

blathers backport 23.1

@blathers-crl
Copy link
Copy Markdown

blathers-crl Bot commented Apr 5, 2023

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.

error creating merge commit from 34471dd to blathers/backport-release-23.1-99866: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.1 failed. See errors above.

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@rafiss rafiss deleted the mixed-version-default-config branch April 6, 2023 17:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yuzefovich yuzefovich yuzefovich left review comments

@msirek msirek Awaiting requested review from msirek msirek was automatically assigned from cockroachdb/sql-queries

+1 more reviewer

@chengxiong-ruan chengxiong-ruan chengxiong-ruan approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@rafiss @cockroach-teamcity @knz @yuzefovich @chengxiong-ruan