roachtest: update backup fixtures collection URIs to millisecond precision #146318
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kev-cao
requested review from
srosenberg and
DarrylWong
and removed request for
a team
|
This change is |
…ision The current backup fixture driver creates backups to collection URIs that are formatted based on the current time, accurate to the minute. This causes test flakes when two roachtest fixture runs run at the same minute and create backup schedules that backup to the same collection URI. To avoid this, we update the fixtures to be accurate to the millisecond. Fixes: cockroachdb#146031, cockroachdb#146030 Release note: None
kev-cao
force-pushed
the
roachtest/fixture-millisecond
branch
from
ea8cade to
b8f66bd
Compare
herkolategan
approved these changes
May 8, 2025
|
@herkolategan what sort of smoke tests did you have in mind? |
|
I think we should land this PR as is. I'm unsure if an acceptance will help with this driver, but i'll chat with Kevin offline. |
msbutler
approved these changes
May 8, 2025
|
oh my b, @herkolategan i misinterpreted your suggestion. Yeah, @kev-cao, would you mind manually running the fixture roachtest to ensure things don't blow up? |
|
@msbutler oh yup already did and the correct directory was created |
|
TFTR! bors r=msbutler |
craig bot
pushed a commit
that referenced
this pull request
May 8, 2025
145435: sql: add sqlcommenter support r=kyle-a-wong a=kyle-a-wong commit 1/2: sql: refactor parser.go to take parser options Refactored parser functions to use a new ParserOptions type configure various options when parsing sql. There are now two types of Parse functions, Parse*() and Parse*WithOptions(). Parse* will use default parse options and the WithOptions alternative allows specfic options to be provided. Epic: None Release note: None ---- commit 2/2: sql: retain SQL commenter tags SQL commenter library is used by ORM libraries and customer applications to add application context to the queries using inline SQL comments. This PR includes the following changes: - A new cluster setting, `sql.sqlcommenter.enabled`, which retains comments during parsing phase. - If the comments follow [SQL commenter specification](https://google.github.io/sqlcommenter/spec/#introduction), they are converted to SQL tags. - Changes to insights stats to also include SQL commenter tags. - Changes to the crdb_internal.*_execution_insights virtual tables to have a new `query_tags` column. - Addition of log tags on the conn_ex context. Each sql commenter tag will be added as a log tag, prefixed with 'querytag-'. Epic: None Release note (sql change): Added support for query tagging, which allows users to add query tags to their sql statements via comments. These query tags will be logged as log tags and will be included in all log entries logged during the executing of a sql statement. These tags will also be included in traces. Finally, these tags will be included in the `cluster_execution_insights` and `node_exeuction_insights` virtual tables in a new `query_tags` JSONB column. This feature can be enabled with the `sql.sqlcommenter.enabled` cluster setting and is disabled by default. Comments must adhere to the sqlcommenter spec, as defined here: https://google.github.io/sqlcommenter/spec/ 146285: roachtest: init providers in main(), not init() r=tbg a=tbg Initializing them in an init function means we're calling this method in tests, where it is likely not useful and may even be implicated in opaque test timeouts such as [1]. [1]: https://cockroachlabs.slack.com/archives/CJ0H8Q97C/p1746629472748029?thread_ts=1746626113.617579&cid=CJ0H8Q97C The roachtest job still works[^1]: <img width="1352" alt="image" src="https://github.com/user-attachments/assets/9233459b-5fd6-4e91-a8a5-deba1177eaab" /> [^1]: https://teamcity.cockroachdb.com/buildConfiguration/Cockroach_Nightlies_RoachtestNightlyGceBazel/19646638?buildTab=overview&hideProblemsFromDependencies=false&hideTestsFromDependencies=false&expandBuildChangesSection=true Epic: none 146318: roachtest: update backup fixtures collection URIs to millisecond precision r=msbutler a=kev-cao The current backup fixture driver creates backups to collection URIs that are formatted based on the current time, accurate to the minute. This causes test flakes when two roachtest fixture runs run at the same minute and create backup schedules that backup to the same collection URI. To avoid this, we update the fixtures to be accurate to the millisecond. Fixes: #146031, #146030 Release note: None Co-authored-by: Chandra Thumuluru <[email protected]> Co-authored-by: Tobias Grieger <[email protected]> Co-authored-by: Kevin Cao <[email protected]>
|
This PR was included in a batch that successfully built, but then failed to merge into master (it was a non-fast-forward update). It will be automatically retried. |
![blathers[crl]](https://avatars.githubusercontent.com/in/59700?s=40&u=95b789b1d594ac6b74f377aa7555d8d98d63240d&v=4){kind=avatar}
|
Based on the specified backports for this PR, I applied new labels to the following linked issue(s). Please adjust the labels as needed to match the branches actually affected by the issue(s), including adding any known older branches. Issue #146030: branch-release-25.2. 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
This was referenced May 8, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The current backup fixture driver creates backups to collection URIs that are formatted based on the current time, accurate to the minute. This causes test flakes when two roachtest fixture runs run at the same minute and create backup schedules that backup to the same collection URI. To avoid this, we update the fixtures to be accurate to the millisecond.
Fixes: #146031, #146030
Release note: None