Skip to content

Conversation

XJIE6
Copy link
Collaborator

@XJIE6 XJIE6 commented Aug 27, 2025

Changelog entry

...

Changelog category

  • Not for changelog (changelog entry is not required)

Description for reviewers

Сейчас kqp может присылать Rollback как с TxId, так и без TxId. В новой версии kqp Rollback будет только без TxId.
Вот ишью на исправление в будущем #23784

Copy link

github-actions bot commented Aug 27, 2025

🟢 2025-08-29 10:28:37 UTC The validation of the Pull Request description is successful.

Copy link

github-actions bot commented Aug 27, 2025

2025-08-27 10:11:07 UTC Pre-commit check linux-x86_64-relwithdebinfo for ab2ecae has started.
2025-08-27 10:11:54 UTC Artifacts will be uploaded here
2025-08-27 10:16:12 UTC ya make is running...
🟡 2025-08-27 11:42:44 UTC Some tests failed, follow the links below. Going to retry failed tests...

Test history | Ya make output | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
30146 28683 0 37 1392 34

2025-08-27 11:45:22 UTC ya make is running... (failed tests rerun, try 2)
🟡 2025-08-27 12:05:47 UTC Some tests failed, follow the links below. Going to retry failed tests...

Test history | Ya make output | Test bloat | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
463 (only retried tests) 380 0 43 8 32

2025-08-27 12:05:57 UTC ya make is running... (failed tests rerun, try 3)
🔴 2025-08-27 12:29:43 UTC Some tests failed, follow the links below.

Test history | Ya make output | Test bloat | Test bloat | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
426 (only retried tests) 332 0 38 24 32

🟢 2025-08-27 12:29:53 UTC Build successful.
🟢 2025-08-27 12:30:17 UTC ydbd size 2.3 GiB changed* by +2.9 KiB, which is < 100.0 KiB vs main: OK

ydbd size dash main: 3d5b5cb merge: ab2ecae diff diff %
ydbd size 2 433 632 712 Bytes 2 433 635 720 Bytes +2.9 KiB +0.000%
ydbd stripped size 509 787 528 Bytes 509 787 912 Bytes +384 Bytes +0.000%

*please be aware that the difference is based on comparing your commit and the last completed build from the post-commit, check comparation

Copy link

github-actions bot commented Aug 27, 2025

2025-08-27 10:16:11 UTC Pre-commit check linux-x86_64-release-asan for ab2ecae has started.
2025-08-27 10:16:22 UTC Artifacts will be uploaded here
2025-08-27 10:19:46 UTC ya make is running...
🟡 2025-08-27 12:22:02 UTC Some tests failed, follow the links below. This fail is not in blocking policy yet

Test history | Ya make output | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
14810 14203 0 232 335 40

🟢 2025-08-27 12:23:20 UTC Build successful.
🟢 2025-08-27 12:23:52 UTC ydbd size 4.0 GiB changed* by +6.0 KiB, which is < 100.0 KiB vs main: OK

ydbd size dash main: 46bb9f3 merge: ab2ecae diff diff %
ydbd size 4 276 711 480 Bytes 4 276 717 672 Bytes +6.0 KiB +0.000%
ydbd stripped size 1 483 174 200 Bytes 1 483 175 608 Bytes +1.4 KiB +0.000%

*please be aware that the difference is based on comparing your commit and the last completed build from the post-commit, check comparation

@XJIE6 XJIE6 force-pushed the test_single_operation branch from 07bfa63 to e49ba63 Compare August 28, 2025 08:51
Copy link

github-actions bot commented Aug 28, 2025

2025-08-28 08:53:48 UTC Pre-commit check linux-x86_64-release-asan for 2dccc63 has started.
2025-08-28 08:53:53 UTC Artifacts will be uploaded here
2025-08-28 08:57:09 UTC ya make is running...
2025-08-28 09:11:55 UTC Check cancelled

Copy link

github-actions bot commented Aug 28, 2025

2025-08-28 08:55:07 UTC Pre-commit check linux-x86_64-relwithdebinfo for 2dccc63 has started.
2025-08-28 08:55:23 UTC Artifacts will be uploaded here
2025-08-28 08:58:39 UTC ya make is running...
2025-08-28 09:11:42 UTC Check cancelled

@XJIE6 XJIE6 force-pushed the test_single_operation branch from e49ba63 to c985903 Compare August 28, 2025 09:11
Copy link

github-actions bot commented Aug 28, 2025

2025-08-28 09:12:29 UTC Pre-commit check linux-x86_64-release-asan for c657f4f has started.
2025-08-28 09:12:55 UTC Artifacts will be uploaded here
2025-08-28 09:16:09 UTC ya make is running...
🟢 2025-08-28 11:10:27 UTC ydbd size 4.0 GiB changed* by +33.3 KiB, which is < 100.0 KiB vs main: OK

ydbd size dash main: 1a4ed4b merge: c657f4f diff diff %
ydbd size 4 278 520 168 Bytes 4 278 554 232 Bytes +33.3 KiB +0.001%
ydbd stripped size 1 483 763 096 Bytes 1 483 775 064 Bytes +11.7 KiB +0.001%

*please be aware that the difference is based on comparing your commit and the last completed build from the post-commit, check comparation
2025-08-28 11:10:29 UTC Check cancelled

Copy link

github-actions bot commented Aug 28, 2025

2025-08-28 09:13:37 UTC Pre-commit check linux-x86_64-relwithdebinfo for c657f4f has started.
2025-08-28 09:13:54 UTC Artifacts will be uploaded here
2025-08-28 09:17:13 UTC ya make is running...
🟡 2025-08-28 10:28:03 UTC Some tests failed, follow the links below. Going to retry failed tests...

Test history | Ya make output | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
30169 28764 0 8 1365 32

2025-08-28 10:30:36 UTC ya make is running... (failed tests rerun, try 2)
🟡 2025-08-28 10:46:06 UTC Some tests failed, follow the links below. Going to retry failed tests...

Test history | Ya make output | Test bloat | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
246 (only retried tests) 212 0 5 0 29

2025-08-28 10:46:15 UTC ya make is running... (failed tests rerun, try 3)
🔴 2025-08-28 11:00:08 UTC Some tests failed, follow the links below.

Test history | Ya make output | Test bloat | Test bloat | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
224 (only retried tests) 191 0 5 0 28

🟢 2025-08-28 11:00:15 UTC Build successful.
🟢 2025-08-28 11:00:41 UTC ydbd size 2.3 GiB changed* by +368 Bytes, which is < 100.0 KiB vs main: OK

ydbd size dash main: eb4f6fd merge: c657f4f diff diff %
ydbd size 2 434 560 408 Bytes 2 434 560 776 Bytes +368 Bytes +0.000%
ydbd stripped size 509 954 248 Bytes 509 954 376 Bytes +128 Bytes +0.000%

*please be aware that the difference is based on comparing your commit and the last completed build from the post-commit, check comparation

@XJIE6 XJIE6 changed the title add verify Rollback transaction fix Aug 28, 2025

if (!evWrite.Record.HasTxId() &&
evWrite.Record.HasLocks() &&
evWrite.Record.GetLocks().GetOp() == NKikimrDataEvents::TKqpLocks::Rollback &&
Copy link
Collaborator

Choose a reason for hiding this comment

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

Нужно возвращать ошибку, если пришёл abort без нужных атрибутов

Copy link

github-actions bot commented Aug 28, 2025

2025-08-28 11:13:17 UTC Pre-commit check linux-x86_64-release-asan for f3dbae0 has started.
2025-08-28 11:13:30 UTC Artifacts will be uploaded here
2025-08-28 11:17:01 UTC ya make is running...
🟡 2025-08-28 13:11:21 UTC Some tests failed, follow the links below. This fail is not in blocking policy yet

Test history | Ya make output | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
14833 14347 0 130 324 32

🟢 2025-08-28 13:12:39 UTC Build successful.
🟢 2025-08-28 13:13:10 UTC ydbd size 4.0 GiB changed* by +176 Bytes, which is < 100.0 KiB vs main: OK

ydbd size dash main: 582f3fe merge: f3dbae0 diff diff %
ydbd size 4 278 630 872 Bytes 4 278 631 048 Bytes +176 Bytes +0.000%
ydbd stripped size 1 483 802 200 Bytes 1 483 802 200 Bytes 0 Bytes 0.000%

*please be aware that the difference is based on comparing your commit and the last completed build from the post-commit, check comparation

Copy link

github-actions bot commented Aug 28, 2025

2025-08-28 11:14:10 UTC Pre-commit check linux-x86_64-relwithdebinfo for f3dbae0 has started.
2025-08-28 11:14:25 UTC Artifacts will be uploaded here
2025-08-28 11:17:48 UTC ya make is running...
🟡 2025-08-28 12:31:10 UTC Some tests failed, follow the links below. Going to retry failed tests...

Test history | Ya make output | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
30169 28757 0 3 1371 38

2025-08-28 12:33:54 UTC ya make is running... (failed tests rerun, try 2)
🟢 2025-08-28 12:46:37 UTC Tests successful.

Test history | Ya make output | Test bloat | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
537 (only retried tests) 507 0 0 1 29

🟢 2025-08-28 12:46:47 UTC Build successful.
🟢 2025-08-28 12:47:09 UTC ydbd size 2.3 GiB changed* by +336 Bytes, which is < 100.0 KiB vs main: OK

ydbd size dash main: 582f3fe merge: f3dbae0 diff diff %
ydbd size 2 434 603 040 Bytes 2 434 603 376 Bytes +336 Bytes +0.000%
ydbd stripped size 509 963 912 Bytes 509 964 040 Bytes +128 Bytes +0.000%

*please be aware that the difference is based on comparing your commit and the last completed build from the post-commit, check comparation

Copy link

github-actions bot commented Aug 28, 2025

2025-08-28 14:46:15 UTC Pre-commit check linux-x86_64-release-asan for 5a75b63 has started.
2025-08-28 14:46:30 UTC Artifacts will be uploaded here
2025-08-28 14:49:44 UTC ya make is running...
🟡 2025-08-28 16:56:53 UTC Some tests failed, follow the links below. This fail is not in blocking policy yet

Test history | Ya make output | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
14835 14332 0 143 322 38

🟢 2025-08-28 16:58:14 UTC Build successful.
🟢 2025-08-28 16:58:46 UTC ydbd size 4.0 GiB changed* by +4.6 KiB, which is < 100.0 KiB vs main: OK

ydbd size dash main: 0653fc0 merge: 5a75b63 diff diff %
ydbd size 4 279 853 944 Bytes 4 279 858 632 Bytes +4.6 KiB +0.000%
ydbd stripped size 1 484 404 664 Bytes 1 484 405 560 Bytes +896 Bytes +0.000%

*please be aware that the difference is based on comparing your commit and the last completed build from the post-commit, check comparation

Copy link

github-actions bot commented Aug 28, 2025

2025-08-28 14:47:26 UTC Pre-commit check linux-x86_64-relwithdebinfo for 5a75b63 has started.
2025-08-28 14:47:40 UTC Artifacts will be uploaded here
2025-08-28 14:51:00 UTC ya make is running...
🟡 2025-08-28 16:15:23 UTC Some tests failed, follow the links below. Going to retry failed tests...

Test history | Ya make output | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
30171 28659 0 7 1471 34

2025-08-28 16:18:03 UTC ya make is running... (failed tests rerun, try 2)
🟡 2025-08-28 16:32:18 UTC Some tests failed, follow the links below. Going to retry failed tests...

Test history | Ya make output | Test bloat | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
358 (only retried tests) 324 0 7 0 27

2025-08-28 16:32:29 UTC ya make is running... (failed tests rerun, try 3)
🔴 2025-08-28 16:47:14 UTC Some tests failed, follow the links below.

Test history | Ya make output | Test bloat | Test bloat | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
230 (only retried tests) 198 0 7 0 25

🟢 2025-08-28 16:47:22 UTC Build successful.
🟢 2025-08-28 16:47:53 UTC ydbd size 2.3 GiB changed* by +7.6 KiB, which is < 100.0 KiB vs main: OK

ydbd size dash main: 0653fc0 merge: 5a75b63 diff diff %
ydbd size 2 435 290 712 Bytes 2 435 298 536 Bytes +7.6 KiB +0.000%
ydbd stripped size 510 151 368 Bytes 510 152 776 Bytes +1.4 KiB +0.000%

*please be aware that the difference is based on comparing your commit and the last completed build from the post-commit, check comparation

zverevgeny
zverevgeny previously approved these changes Aug 29, 2025
Copy link

github-actions bot commented Aug 29, 2025

2025-08-29 10:12:40 UTC Pre-commit check linux-x86_64-release-asan for cd67748 has started.
2025-08-29 10:12:54 UTC Artifacts will be uploaded here
2025-08-29 10:13:42 UTC Check cancelled

@XJIE6 XJIE6 force-pushed the test_single_operation branch from 583da99 to 35c647c Compare August 29, 2025 10:13
Copy link

github-actions bot commented Aug 29, 2025

2025-08-29 10:15:13 UTC Pre-commit check linux-x86_64-release-asan for 3747834 has started.
2025-08-29 10:15:28 UTC Artifacts will be uploaded here
2025-08-29 10:18:51 UTC ya make is running...
🟡 2025-08-29 12:29:40 UTC Some tests failed, follow the links below. This fail is not in blocking policy yet

Test history | Ya make output | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
14835 14219 0 265 318 33

🟢 2025-08-29 12:31:09 UTC Build successful.
🟢 2025-08-29 12:31:43 UTC ydbd size 4.0 GiB changed* by +8.6 KiB, which is < 100.0 KiB vs main: OK

ydbd size dash main: e7a5e89 merge: 3747834 diff diff %
ydbd size 4 283 473 144 Bytes 4 283 481 944 Bytes +8.6 KiB +0.000%
ydbd stripped size 1 485 759 256 Bytes 1 485 764 184 Bytes +4.8 KiB +0.000%

*please be aware that the difference is based on comparing your commit and the last completed build from the post-commit, check comparation

Copy link

github-actions bot commented Aug 29, 2025

2025-08-29 10:15:14 UTC Pre-commit check linux-x86_64-relwithdebinfo for 3747834 has started.
2025-08-29 10:15:29 UTC Artifacts will be uploaded here
2025-08-29 10:18:51 UTC ya make is running...
🟡 2025-08-29 11:33:57 UTC Some tests failed, follow the links below. Going to retry failed tests...

Test history | Ya make output | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
30172 28762 0 1 1373 36

2025-08-29 11:36:40 UTC ya make is running... (failed tests rerun, try 2)
🟢 2025-08-29 11:50:34 UTC Tests successful.

Test history | Ya make output | Test bloat | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
356 (only retried tests) 326 0 0 3 27

🟢 2025-08-29 11:50:44 UTC Build successful.
🟢 2025-08-29 11:51:07 UTC ydbd size 2.3 GiB changed* by +4.5 KiB, which is < 100.0 KiB vs main: OK

ydbd size dash main: 7442b2b merge: 3747834 diff diff %
ydbd size 2 437 262 784 Bytes 2 437 267 344 Bytes +4.5 KiB +0.000%
ydbd stripped size 510 569 992 Bytes 510 570 888 Bytes +896 Bytes +0.000%

*please be aware that the difference is based on comparing your commit and the last completed build from the post-commit, check comparation

@XJIE6 XJIE6 marked this pull request as ready for review August 29, 2025 10:23
@XJIE6 XJIE6 requested a review from a team as a code owner August 29, 2025 10:23
@XJIE6 XJIE6 enabled auto-merge (squash) August 29, 2025 10:26
@XJIE6 XJIE6 requested a review from zverevgeny August 29, 2025 11:51
@@ -215,6 +215,19 @@ TWriteOperation::TPtr TOperationsManager::CreateWriteOperation(const TUnifiedPat
}

TConclusion<EOperationBehaviour> TOperationsManager::GetBehaviour(const NEvents::TDataEvents::TEvWrite& evWrite) {
//FIXME #23784
if (evWrite.Record.HasLocks() && evWrite.Record.GetLocks().GetOp() == NKikimrDataEvents::TKqpLocks::Rollback) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Может быть Rollback без локов?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Видимо нет, потому что Op лежит внутри Locks. Если нет Locks, то и нет Op
другими словами проверять HasLocks() нужно, чтобы справа сделать GetLocks()

@@ -215,6 +215,19 @@ TWriteOperation::TPtr TOperationsManager::CreateWriteOperation(const TUnifiedPat
}

TConclusion<EOperationBehaviour> TOperationsManager::GetBehaviour(const NEvents::TDataEvents::TEvWrite& evWrite) {
//FIXME #23784
if (evWrite.Record.HasLocks() && evWrite.Record.GetLocks().GetOp() == NKikimrDataEvents::TKqpLocks::Rollback) {
// AFL_VERIFY_DEBUG(!evWrite.Record.HasTxId())("TxId", evWrite.Record.GetTxId());
Copy link
Collaborator

Choose a reason for hiding this comment

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

Я бы не группировал проверки, а добавлял по одной
// AFL_VERIFY_DEBUG(!evWrite.Record.HasTxId())("TxId", evWrite.Record.GetTxId());
// if (!evWrite.Record.HasTxId()) {
// return EOperationBehaviour::AbortWriteLock;
// }
--- другие проверки ---

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Поправил

Copy link

github-actions bot commented Aug 30, 2025

2025-08-30 08:00:15 UTC Pre-commit check linux-x86_64-release-asan for c81a176 has started.
2025-08-30 08:00:43 UTC Artifacts will be uploaded here
2025-08-30 08:04:39 UTC ya make is running...
🟡 2025-08-30 10:03:54 UTC Some tests failed, follow the links below. This fail is not in blocking policy yet

Test history | Ya make output | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
14838 14327 0 139 339 33

🟢 2025-08-30 10:05:12 UTC Build successful.
🟡 2025-08-30 10:05:39 UTC ydbd size 4.0 GiB changed* by +148.3 KiB, which is >= 100.0 KiB vs main: Warning

ydbd size dash main: c9c09d7 merge: c81a176 diff diff %
ydbd size 4 284 567 288 Bytes 4 284 719 184 Bytes +148.3 KiB +0.004%
ydbd stripped size 1 486 099 128 Bytes 1 486 158 904 Bytes +58.4 KiB +0.004%

*please be aware that the difference is based on comparing your commit and the last completed build from the post-commit, check comparation

Copy link

github-actions bot commented Aug 30, 2025

2025-08-30 08:03:13 UTC Pre-commit check linux-x86_64-relwithdebinfo for c81a176 has started.
2025-08-30 08:03:27 UTC Artifacts will be uploaded here
2025-08-30 08:06:50 UTC ya make is running...
🟡 2025-08-30 09:17:55 UTC Some tests failed, follow the links below. Going to retry failed tests...

Test history | Ya make output | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
30175 28765 0 3 1372 35

2025-08-30 09:20:32 UTC ya make is running... (failed tests rerun, try 2)
🟡 2025-08-30 09:36:42 UTC Some tests failed, follow the links below. Going to retry failed tests...

Test history | Ya make output | Test bloat | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
419 (only retried tests) 382 0 1 10 26

2025-08-30 09:36:56 UTC ya make is running... (failed tests rerun, try 3)
🟢 2025-08-30 09:51:44 UTC Tests successful.

Test history | Ya make output | Test bloat | Test bloat | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
415 (only retried tests) 386 0 0 4 25

🟢 2025-08-30 09:51:52 UTC Build successful.
🟢 2025-08-30 09:52:11 UTC ydbd size 2.3 GiB changed* by +4.4 KiB, which is < 100.0 KiB vs main: OK

ydbd size dash main: 8d7b17f merge: c81a176 diff diff %
ydbd size 2 437 788 448 Bytes 2 437 792 912 Bytes +4.4 KiB +0.000%
ydbd stripped size 510 652 392 Bytes 510 653 224 Bytes +832 Bytes +0.000%

*please be aware that the difference is based on comparing your commit and the last completed build from the post-commit, check comparation

@XJIE6 XJIE6 merged commit e67a040 into ydb-platform:main Aug 30, 2025
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants