changefeedccl: ignore context canceled error in tests #152850
Merged
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
|
This change is |
andyyang890
approved these changes
Sep 2, 2025
|
bors r=andyyang890 |
|
bors cancel |
|
#149794 which has the change from this PR still fails. Going to change |
|
bors r=andyyang890 |
craig bot
pushed a commit
that referenced
this pull request
Sep 2, 2025
152850: changefeedccl: ignore grpc context canceled error in tests r=andyyang890 a=KeithCh grpc context canceled errors is causing flakes in tests, and should be ignored. Fixes: #151726 Release note: None Co-authored-by: Keith Chow <[email protected]>
|
bors cancel |
|
Canceled. |
KeithCh
changed the title
context canceled errors is causing flakes in tests, and should be ignored. Fixes: cockroachdb#151726 cockroachdb#152510 Release note: None
|
bors r=andyyang890 |
|
bors cancel |
|
Canceled. |
KeithCh
force-pushed
the
ignore-grpc-context-canceled
branch
from
9c6b3e3 to
59221d2
Compare
|
bors r=andyyang890 |
asg0451
added a commit
to asg0451/cockroach
that referenced
this pull request
Sep 2, 2025
commit 2214ab5 Author: Andy Yang <[email protected]> Date: Tue Sep 2 16:34:36 2025 -0400 break dependency from changefeedpb to parser commit 820a24b Author: Andy Yang <[email protected]> Date: Tue Sep 2 09:47:04 2025 -0400 fix sinkless issue commit 6bc3449 Author: Andy Yang <[email protected]> Date: Fri Aug 29 16:48:18 2025 -0400 fixup! attempt to fix partitioner commit b988450 Author: Andy Yang <[email protected]> Date: Fri Aug 29 16:36:21 2025 -0400 attempt to fix partitioner commit 0189f6b Author: Andy Yang <[email protected]> Date: Fri Aug 29 15:54:49 2025 -0400 wrap table partitioner errors commit defca28 Author: Andy Yang <[email protected]> Date: Fri Aug 22 17:34:00 2025 -0400 restore per-table data commit c63ae2f Author: Andy Yang <[email protected]> Date: Mon Aug 18 15:18:01 2025 -0400 add resolved tables to specs commit f4a53b3 Author: Andy Yang <[email protected]> Date: Mon Aug 18 14:47:32 2025 -0400 add protobuf commit 124989a Author: Andy Yang <[email protected]> Date: Wed Aug 27 20:30:59 2025 -0400 changefeedccl/resolvedspan: update table ID partitioner This patch updates the table ID partitioner so that it's able to handle spans where the end key is the next table's start key (e.g. full table spans like `/Table/1{0-1}`). Release note: None commit c1e847b Merge: 3693763 021bb15 8de4c80 Author: craig[bot] <[email protected]> Date: Tue Sep 2 18:34:48 2025 +0000 Merge cockroachdb#149616 cockroachdb#152190 149616: changefeedccl: protect lagging tables with its own timestamp r=andyyang890 a=aerfrei Before this change, changefeeds watching multiple tables would protect all watched tables and system tables with a single protected timestamp (pts) record. All tables would be protected back to the highwater for the changefeed. In the event where one table lags behind the others, this would result in preventing more garbage collection than needed for many tables. This would become more of an issue when we introduce DB-level feeds because they will be implemented with multi-table feeds. We now protect lagging tables separately. We use per table highwaters to identify tables who are lagging behing the most advanced table by more than the new changefeed.protect_timestamp_bucketing_interval cluster setting. All tables at least that far behind will be protected by their own pts record. Epic: CRDB-1421 Fixes: cockroachdb#147785 Release note (performance): Multi-table changefeeds will protect each lagging user table from garbage collection with its own record. This will improve performance of multi-table changefeeds including upcoming db-level changefeeds by allowing more garbage collection. 152190: contention: periodically log resolved contention events r=alyshanjahani-crl a=alyshanjahani-crl This commit adds logging to the flushAndResolve method in the contention event store. This method is called periodically at an interval defined by the (non-public) cluster setting sql.contention.event_store.resolution_interval. By logging aggregated contention event information, users now have the ability to find which waiting statements/txns are experiencing high contention through logs (previously this was only available via insights or SQL activity). Additionally, this aggregated event information contains the blocking txn and contended key - information that was previously only available via querying crdb_internal.transaction_contention_events. The logs are aggregated by a composite identifier of (waiting stmt, waiting txn, blocking txn, key), and the total contention time observed for that combination. They are structured logs. For example: ``` {"Timestamp":1756224167482848000,"EventType":"aggregated_contention_info", "WaitingStmtFingerprintId":"\\x000000000000007b", "WaitingTxnFingerprintId":"\\x00000000000001c8", "BlockingTxnFingerprintId":"\\x0000000000000315", "ContendedKey":"test-key-1","Duration":300000000} ``` Since this information is available via logs, it provides a solution for users who desire more persistence of contention event information. Part of: https://cockroachlabs.atlassian.net/browse/CRDB-53592 Release note (ops change): Adds logging of contention events. Co-authored-by: Aerin Freilich <[email protected]> Co-authored-by: Alyshan Jahani <[email protected]> commit 3693763 Merge: 3aad29a 16bbe95 59221d2 7f054a0 Author: craig[bot] <[email protected]> Date: Tue Sep 2 17:58:20 2025 +0000 Merge cockroachdb#152848 cockroachdb#152850 cockroachdb#152856 152848: release: fix docker image verification with telemetry disabled r=celiala a=rail This commit fixes the verification of the FIPS docker image when telemetry is disabled. Epic: none Release note: none 152850: changefeedccl: ignore context canceled error in tests r=andyyang890 a=KeithCh Context canceled errors is causing flakes in tests, and should be ignored. Fixes: cockroachdb#151726 cockroachdb#152510 Release note: None 152856: roachtest: create required test schemas for SQLAlchemy test suite r=rafiss a=rafiss fixes cockroachdb#152780 fixes cockroachdb#152779 fixes cockroachdb#152778 fixes cockroachdb#152775 fixes cockroachdb#152773 Release note: None Co-authored-by: Rail Aliiev <[email protected]> Co-authored-by: Keith Chow <[email protected]> Co-authored-by: Rafi Shamim <[email protected]> commit 59221d2 Author: Keith Chow <[email protected]> Date: Tue Sep 2 08:50:05 2025 -0400 changefeedccl: ignore context canceled error in tests context canceled errors is causing flakes in tests, and should be ignored. Fixes: cockroachdb#151726 cockroachdb#152510 Release note: None commit 3aad29a Merge: d8d00d8 ef18807 Author: craig[bot] <[email protected]> Date: Tue Sep 2 17:13:23 2025 +0000 Merge cockroachdb#152854 152854: backup: remove endtime filter from GetBackupTreeIndexMetadata r=msbutler a=kev-cao This patch removes the `endTime` parameter from `GetBackupTreeIndexMetadata`. The filtering will already be done by `ValidateEndTimeAndTruncate` and so is unnecessary. The addition of this filtering results in a change in the error messages when an invalid end time is provided, so for the sake of simplicity, it's better to remove the parameter. Epic: None Release note: None Co-authored-by: Kevin Cao <[email protected]> commit 7f054a0 Author: Rafi Shamim <[email protected]> Date: Tue Sep 2 12:04:17 2025 -0400 roachtest: create required test schemas for SQLAlchemy test suite Release note: None commit 021bb15 Author: Aerin Freilich <[email protected]> Date: Fri Jul 18 16:00:01 2025 -0400 changefeedccl: protect lagging tables with its own timestamp Before this change, changefeeds watching multiple tables would protect all watched tables and system tables with a single protected timestamp (pts) record. All tables would be protected back to the highwater for the changefeed. In the event where one table lags behind the others, this would result in preventing more garbage collection than needed for many tables. This would become more of an issue when we introduce DB-level feeds because they will be implemented with multi-table feeds. We now protect lagging tables separately. We use per table highwaters to identify tables who are lagging behing the most advanced table by more than the new changefeed.protect_timestamp_bucketing_interval cluster setting. All tables at least that far behind will be protected by their own pts record. Epic: CRDB-1421 Fixes: cockroachdb#147785 Release note (performance): Multi-table changefeeds will protect each lagging user table from garbage collection with its own record. This will improve performance of multi-table changefeeds including upcoming db-level changefeeds by allowing more garbage collection. commit ef18807 Author: Kevin Cao <[email protected]> Date: Tue Sep 2 11:47:45 2025 -0400 backup: remove endtime filter from GetBackupTreeIndexMetadata This patch removes the `endTime` parameter from `GetBackupTreeIndexMetadata`. The filtering will already be done by `ValidateEndTimeAndTruncate` and so is unnecessary. The addition of this filtering results in a change in the error messages when an invalid end time is provided, so for the sake of simplicity, it's better to remove the parameter. Epic: None Release note: None commit 16bbe95 Author: Rail Aliiev <[email protected]> Date: Tue Sep 2 07:31:16 2025 -0400 release: fix docker image verification with telemetry disabled This commit fixes the verification of the FIPS docker image when telemetry is disabled. Epic: none Release note: none commit 8de4c80 Author: Alyshan Jahani <[email protected]> Date: Tue Aug 19 16:27:06 2025 -0400 contention: periodically log resolved contention events This commit adds logging to the flushAndResolve method in the contention event store. This method is called periodically at an interval defined by the (non-public) cluster setting sql.contention.event_store.resolution_interval. By logging aggregated contention event information, users now have the ability to find which waiting statements/txns are experiencing high contention through logs (previously this was only available via insights or SQL activity). Additionally, this aggregated event information contains the blocking txn and contended key - information that was previously only available via querying crdb_internal.transaction_contention_events. The logs are aggregated by a composite identifier of (waiting stmt, waiting txn, blocking txn, key), and the total contention time observed for that combination. They are structured logs. For example: ``` {"Timestamp":1756224167482848000,"EventType":"aggregated_contention_info", "WaitingStmtFingerprintId":"\\x000000000000007b", "WaitingTxnFingerprintId":"\\x00000000000001c8", "BlockingTxnFingerprintId":"\\x0000000000000315", "ContendedKey":"test-key-1","Duration":300000000} ``` Since this information is available via logs, it provides a solution for users who desire more persistence of contention event information. Part of: https://cockroachlabs.atlassian.net/browse/CRDB-53592 Release note (ops change): Adds logging of contention events.
asg0451
added a commit
to asg0451/cockroach
that referenced
this pull request
Sep 3, 2025
commit 2214ab5 Author: Andy Yang <[email protected]> Date: Tue Sep 2 16:34:36 2025 -0400 break dependency from changefeedpb to parser commit 820a24b Author: Andy Yang <[email protected]> Date: Tue Sep 2 09:47:04 2025 -0400 fix sinkless issue commit 6bc3449 Author: Andy Yang <[email protected]> Date: Fri Aug 29 16:48:18 2025 -0400 fixup! attempt to fix partitioner commit b988450 Author: Andy Yang <[email protected]> Date: Fri Aug 29 16:36:21 2025 -0400 attempt to fix partitioner commit 0189f6b Author: Andy Yang <[email protected]> Date: Fri Aug 29 15:54:49 2025 -0400 wrap table partitioner errors commit defca28 Author: Andy Yang <[email protected]> Date: Fri Aug 22 17:34:00 2025 -0400 restore per-table data commit c63ae2f Author: Andy Yang <[email protected]> Date: Mon Aug 18 15:18:01 2025 -0400 add resolved tables to specs commit f4a53b3 Author: Andy Yang <[email protected]> Date: Mon Aug 18 14:47:32 2025 -0400 add protobuf commit 124989a Author: Andy Yang <[email protected]> Date: Wed Aug 27 20:30:59 2025 -0400 changefeedccl/resolvedspan: update table ID partitioner This patch updates the table ID partitioner so that it's able to handle spans where the end key is the next table's start key (e.g. full table spans like `/Table/1{0-1}`). Release note: None commit c1e847b Merge: 3693763 021bb15 8de4c80 Author: craig[bot] <[email protected]> Date: Tue Sep 2 18:34:48 2025 +0000 Merge cockroachdb#149616 cockroachdb#152190 149616: changefeedccl: protect lagging tables with its own timestamp r=andyyang890 a=aerfrei Before this change, changefeeds watching multiple tables would protect all watched tables and system tables with a single protected timestamp (pts) record. All tables would be protected back to the highwater for the changefeed. In the event where one table lags behind the others, this would result in preventing more garbage collection than needed for many tables. This would become more of an issue when we introduce DB-level feeds because they will be implemented with multi-table feeds. We now protect lagging tables separately. We use per table highwaters to identify tables who are lagging behing the most advanced table by more than the new changefeed.protect_timestamp_bucketing_interval cluster setting. All tables at least that far behind will be protected by their own pts record. Epic: CRDB-1421 Fixes: cockroachdb#147785 Release note (performance): Multi-table changefeeds will protect each lagging user table from garbage collection with its own record. This will improve performance of multi-table changefeeds including upcoming db-level changefeeds by allowing more garbage collection. 152190: contention: periodically log resolved contention events r=alyshanjahani-crl a=alyshanjahani-crl This commit adds logging to the flushAndResolve method in the contention event store. This method is called periodically at an interval defined by the (non-public) cluster setting sql.contention.event_store.resolution_interval. By logging aggregated contention event information, users now have the ability to find which waiting statements/txns are experiencing high contention through logs (previously this was only available via insights or SQL activity). Additionally, this aggregated event information contains the blocking txn and contended key - information that was previously only available via querying crdb_internal.transaction_contention_events. The logs are aggregated by a composite identifier of (waiting stmt, waiting txn, blocking txn, key), and the total contention time observed for that combination. They are structured logs. For example: ``` {"Timestamp":1756224167482848000,"EventType":"aggregated_contention_info", "WaitingStmtFingerprintId":"\\x000000000000007b", "WaitingTxnFingerprintId":"\\x00000000000001c8", "BlockingTxnFingerprintId":"\\x0000000000000315", "ContendedKey":"test-key-1","Duration":300000000} ``` Since this information is available via logs, it provides a solution for users who desire more persistence of contention event information. Part of: https://cockroachlabs.atlassian.net/browse/CRDB-53592 Release note (ops change): Adds logging of contention events. Co-authored-by: Aerin Freilich <[email protected]> Co-authored-by: Alyshan Jahani <[email protected]> commit 3693763 Merge: 3aad29a 16bbe95 59221d2 7f054a0 Author: craig[bot] <[email protected]> Date: Tue Sep 2 17:58:20 2025 +0000 Merge cockroachdb#152848 cockroachdb#152850 cockroachdb#152856 152848: release: fix docker image verification with telemetry disabled r=celiala a=rail This commit fixes the verification of the FIPS docker image when telemetry is disabled. Epic: none Release note: none 152850: changefeedccl: ignore context canceled error in tests r=andyyang890 a=KeithCh Context canceled errors is causing flakes in tests, and should be ignored. Fixes: cockroachdb#151726 cockroachdb#152510 Release note: None 152856: roachtest: create required test schemas for SQLAlchemy test suite r=rafiss a=rafiss fixes cockroachdb#152780 fixes cockroachdb#152779 fixes cockroachdb#152778 fixes cockroachdb#152775 fixes cockroachdb#152773 Release note: None Co-authored-by: Rail Aliiev <[email protected]> Co-authored-by: Keith Chow <[email protected]> Co-authored-by: Rafi Shamim <[email protected]> commit 59221d2 Author: Keith Chow <[email protected]> Date: Tue Sep 2 08:50:05 2025 -0400 changefeedccl: ignore context canceled error in tests context canceled errors is causing flakes in tests, and should be ignored. Fixes: cockroachdb#151726 cockroachdb#152510 Release note: None commit 3aad29a Merge: d8d00d8 ef18807 Author: craig[bot] <[email protected]> Date: Tue Sep 2 17:13:23 2025 +0000 Merge cockroachdb#152854 152854: backup: remove endtime filter from GetBackupTreeIndexMetadata r=msbutler a=kev-cao This patch removes the `endTime` parameter from `GetBackupTreeIndexMetadata`. The filtering will already be done by `ValidateEndTimeAndTruncate` and so is unnecessary. The addition of this filtering results in a change in the error messages when an invalid end time is provided, so for the sake of simplicity, it's better to remove the parameter. Epic: None Release note: None Co-authored-by: Kevin Cao <[email protected]> commit 7f054a0 Author: Rafi Shamim <[email protected]> Date: Tue Sep 2 12:04:17 2025 -0400 roachtest: create required test schemas for SQLAlchemy test suite Release note: None commit 021bb15 Author: Aerin Freilich <[email protected]> Date: Fri Jul 18 16:00:01 2025 -0400 changefeedccl: protect lagging tables with its own timestamp Before this change, changefeeds watching multiple tables would protect all watched tables and system tables with a single protected timestamp (pts) record. All tables would be protected back to the highwater for the changefeed. In the event where one table lags behind the others, this would result in preventing more garbage collection than needed for many tables. This would become more of an issue when we introduce DB-level feeds because they will be implemented with multi-table feeds. We now protect lagging tables separately. We use per table highwaters to identify tables who are lagging behing the most advanced table by more than the new changefeed.protect_timestamp_bucketing_interval cluster setting. All tables at least that far behind will be protected by their own pts record. Epic: CRDB-1421 Fixes: cockroachdb#147785 Release note (performance): Multi-table changefeeds will protect each lagging user table from garbage collection with its own record. This will improve performance of multi-table changefeeds including upcoming db-level changefeeds by allowing more garbage collection. commit ef18807 Author: Kevin Cao <[email protected]> Date: Tue Sep 2 11:47:45 2025 -0400 backup: remove endtime filter from GetBackupTreeIndexMetadata This patch removes the `endTime` parameter from `GetBackupTreeIndexMetadata`. The filtering will already be done by `ValidateEndTimeAndTruncate` and so is unnecessary. The addition of this filtering results in a change in the error messages when an invalid end time is provided, so for the sake of simplicity, it's better to remove the parameter. Epic: None Release note: None commit 16bbe95 Author: Rail Aliiev <[email protected]> Date: Tue Sep 2 07:31:16 2025 -0400 release: fix docker image verification with telemetry disabled This commit fixes the verification of the FIPS docker image when telemetry is disabled. Epic: none Release note: none commit 8de4c80 Author: Alyshan Jahani <[email protected]> Date: Tue Aug 19 16:27:06 2025 -0400 contention: periodically log resolved contention events This commit adds logging to the flushAndResolve method in the contention event store. This method is called periodically at an interval defined by the (non-public) cluster setting sql.contention.event_store.resolution_interval. By logging aggregated contention event information, users now have the ability to find which waiting statements/txns are experiencing high contention through logs (previously this was only available via insights or SQL activity). Additionally, this aggregated event information contains the blocking txn and contended key - information that was previously only available via querying crdb_internal.transaction_contention_events. The logs are aggregated by a composite identifier of (waiting stmt, waiting txn, blocking txn, key), and the total contention time observed for that combination. They are structured logs. For example: ``` {"Timestamp":1756224167482848000,"EventType":"aggregated_contention_info", "WaitingStmtFingerprintId":"\\x000000000000007b", "WaitingTxnFingerprintId":"\\x00000000000001c8", "BlockingTxnFingerprintId":"\\x0000000000000315", "ContendedKey":"test-key-1","Duration":300000000} ``` Since this information is available via logs, it provides a solution for users who desire more persistence of contention event information. Part of: https://cockroachlabs.atlassian.net/browse/CRDB-53592 Release note (ops change): Adds logging of contention events.
celeste-cockroachdb
bot
added
v25.4.0-prerelease
and removed
target-release-25.4.0
labels
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Context canceled errors is causing flakes in tests, and should be ignored.
Fixes: #151726 #152510
Release note: None