session: track LastCommitTS in SessionVars and check timestamps of later txns are larger #57305

b6g · 2024-11-12T00:01:10Z

What problem does this PR solve?

Issue Number: close #57165

Problem Summary:

This PR checks the invariant that timestamps of transactions in a session should increase monotonically.

It saves the timestamp of the last transaction in SessionVars, after the transaction is committed. The saved timestamp is compared with the start_ts and the commit_ts of the next transaction.

This PR depends on the TiKV client-go PR, tikv/client-go#1489, which exports commit_ts of the transaction.

What changed and how does it work?

Check List

Tests

Unit test
Integration test
Manual test (add detailed scripts or steps below)
No need to test
- I checked and no code files have been changed.

Side effects

Performance regression: Consumes more CPU
Performance regression: Consumes more Memory
Breaking backward compatibility

Documentation

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

ti-chi-bot · 2024-11-12T00:01:20Z

Hi @b6g. Thanks for your PR.

I'm waiting for a pingcap member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

tiprow · 2024-11-12T00:01:28Z

Hi @b6g. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

b6g · 2024-11-12T00:01:50Z

pkg/session/session.go

@@ -929,6 +929,21 @@ func (s *session) CommitTxn(ctx context.Context) error {
 		s.sessionVars.StmtCtx.MergeExecDetails(nil, commitDetail)
 	}

+	if err == nil {
+		// save CommitTS in sessionVars for invariant check
+		// TODO: enable LastCommitTS with a session variable


I will add a session variable.

Added in a separate PR #57313, to make review easier.

Per discussion in #57313 (comment), we don't need a session variable.

pkg/sessiontxn/isolation/base.go

dveeden · 2024-11-18T06:28:38Z

/ok-to-test

pkg/sessiontxn/isolation/base.go

go.mod

codecov · 2024-11-25T08:35:01Z

Codecov Report

Attention: Patch coverage is 70.96774% with 9 lines in your changes missing coverage. Please review.

Project coverage is 73.4547%. Comparing base (b7e9769) to head (85e0179).
Report is 1 commits behind head on master.

Additional details and impacted files

@@               Coverage Diff                @@
##             master     #57305        +/-   ##
================================================
+ Coverage   72.9819%   73.4547%   +0.4727%     
================================================
  Files          1693       1693                
  Lines        467972     468042        +70     
================================================
+ Hits         341535     343799      +2264     
+ Misses       105410     103227      -2183     
+ Partials      21027      21016        -11

Flag	Coverage Δ
integration	`42.9857% <29.0322%> (?)`
unit	`72.2302% <70.9677%> (+0.0718%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components	Coverage Δ
dumpling	`52.6910% <ø> (ø)`
parser	`∅ <ø> (∅)`
br	`45.4740% <ø> (+0.0056%)`	⬆️

b6g · 2024-11-27T08:19:27Z

The client-go PR is merged and go.mod is updated. The PR is ready for review. PTAL Thanks!

hawkingrei · 2024-11-27T08:30:02Z

go.mod

@@ -109,7 +109,7 @@ require (
 	github.com/tdakkota/asciicheck v0.2.0


Please run the make bazel_preapre and upload the dependencies.

b6g · 2024-11-27T17:34:32Z

Some tests failed with

Was it because the client-go PR was just merged and it takes time to create http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241127071526-89643b0e8c9e.zip?

b6g · 2024-11-27T19:29:32Z

Some tests failed with

Was it because the client-go PR was just merged and it takes time to create http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241127071526-89643b0e8c9e.zip?

The error was,

Error in download_and_extract: java.io.IOException: Error downloading [http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241127071526-89643b0e8c9e.zip, http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241127071526-89643b0e8c9e.zip, https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241127071526-89643b0e8c9e.zip, https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241127071526-89643b0e8c9e.zip] to /root/.cache/bazel/_bazel_root/37ff7b0eddea115f60ab9f853788d7f5/external/com_github_tikv_client_go_v2/temp12921244511850196136/com_github_tikv_client_go_v2-v2.0.8-0.20241127071526-89643b0e8c9e.zip: GET returned 404 Not Found

b6g · 2024-11-28T05:30:23Z

/test build

ti-chi-bot · 2025-02-04T02:39:33Z

[LGTM Timeline notifier]

Timeline:

2025-01-08 04:38:11.286280732 +0000 UTC m=+328434.575112437: ☑️ agreed by ekexium.
2025-02-04 02:39:32.636618077 +0000 UTC m=+153044.169030075: ☑️ agreed by cfzjywxk.

you06 · 2025-02-04T05:51:44Z

pkg/session/session.go

+				zap.Uint64("txnLastCommitTS", s.txn.lastCommitTS),
+				zap.String("sql", redact.String(s.sessionVars.EnableRedactLog, s.sessionVars.StmtCtx.OriginalSQL)),
+			)
+			return kv.ErrAssertionFailed


kv.ErrAssertionFailed is an error contains key info.

Without any argument, it'll be confusing.

[tikv:8141]assertion failed: key: %s, assertion: %s, start_ts: %v, existing start ts: %v, existing commit ts: %v

Consider just create error by errors.Errorf(...)

you06 · 2025-02-04T05:57:25Z

pkg/session/test/txn/txn_test.go

+	tk := testkit.NewTestKit(t, store)
+	tk.MustExec("use test")
+	tk.MustExec("create table t(id int)")
+	ts := oracle.GoTimeToTS(time.Now().Add(time.Minute))


Better using a ts from timestamp oracle.

Suggested change

ts := oracle.GoTimeToTS(time.Now().Add(time.Minute))

currentTS, err := store.GetOracle().GetTimestamp(context.Background(), &oracle.Option{TxnScope: oracle.GlobalTxnScope})

ts := oracle.GoTimeToTS(oracle.GetTimeFromTS(currentTS).Add(time.Minute))

you06 · 2025-02-04T06:01:15Z

pkg/sessiontxn/isolation/base.go

+			zap.Uint64("startTS", sessVars.TxnCtx.StartTS),
+			zap.String("sql", redact.String(sessVars.EnableRedactLog, sessVars.StmtCtx.OriginalSQL)),
+		)
+		return nil, kv.ErrAssertionFailed


Same to the checking of commitTS, use errors.Errorf(...)

you06 · 2025-02-04T07:31:06Z

pkg/sessiontxn/isolation/base.go

@@ -268,6 +270,10 @@ func (p *baseTxnContextProvider) getTxnStartTS() (uint64, error) {
 	return txn.StartTS(), nil
 }

+func (p *baseTxnContextProvider) usePresetStartTS() bool {
+	return p.constStartTS != 0 || p.sctx.GetSessionVars().SnapshotTS != 0


usePresetStartTS looks fine for me. But better leave a comment that we may have a flag which indicate the start_ts is from PD.

I took a look at the code and feel like we can add StartTSFromPD here, and set it to true if the start_ts is from a ts future here.

b6g · 2025-02-09T21:31:48Z

Updated. PTAL. Need another approval to merge. Thanks!

… is larger

you06 · 2025-02-13T02:18:28Z

/retest

you06 · 2025-02-13T02:32:22Z

/retest

cfzjywxk · 2025-02-13T03:16:48Z

/retest

ti-chi-bot · 2025-02-13T03:17:35Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cfzjywxk, ekexium, you06, yudongusa

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [cfzjywxk,ekexium,you06]
~~pkg/sessionctx/variable/OWNERS~~ [yudongusa]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

hawkingrei · 2025-02-13T03:42:27Z

/retest

tiprow · 2025-02-13T03:45:39Z

@b6g: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
fast_test_tiprow	`85e0179`	link	true	`/test fast_test_tiprow`

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/needs-tests-checked labels Nov 12, 2024

ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. needs-ok-to-test Indicates a PR created by contributors and need ORG member send '/ok-to-test' to start testing. labels Nov 12, 2024

b6g commented Nov 12, 2024

View reviewed changes

pkg/sessiontxn/isolation/base.go Outdated Show resolved Hide resolved

b6g force-pushed the b6g/tsinvariant1 branch from e8df58f to e053b6f Compare November 12, 2024 07:04

b6g mentioned this pull request Nov 12, 2024

variable: session variable tidb_enable_commit_ts_order_check #57313

Closed

13 tasks

b6g force-pushed the b6g/tsinvariant1 branch 2 times, most recently from 5cc54f3 to 8297ca5 Compare November 17, 2024 08:39

ti-chi-bot bot added ok-to-test Indicates a PR is ready to be tested. and removed needs-ok-to-test Indicates a PR created by contributors and need ORG member send '/ok-to-test' to start testing. labels Nov 18, 2024

dveeden reviewed Nov 18, 2024

View reviewed changes

pkg/sessiontxn/isolation/base.go Show resolved Hide resolved

dveeden reviewed Nov 18, 2024

View reviewed changes

go.mod Outdated Show resolved Hide resolved

b6g force-pushed the b6g/tsinvariant1 branch 2 times, most recently from 4e39c69 to 31193ac Compare November 19, 2024 03:38

you06 mentioned this pull request Nov 25, 2024

Export commitTS of KVTxn tikv/client-go#1489

Merged

b6g force-pushed the b6g/tsinvariant1 branch 3 times, most recently from fbfaf0f to 3c7fb77 Compare November 27, 2024 08:17

hawkingrei reviewed Nov 27, 2024

View reviewed changes

b6g force-pushed the b6g/tsinvariant1 branch from 1af9227 to ef63538 Compare November 27, 2024 18:50

ti-chi-bot bot removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Feb 4, 2025

you06 reviewed Feb 4, 2025

View reviewed changes

b6g force-pushed the b6g/tsinvariant1 branch from ddd6f66 to ecaeea3 Compare February 9, 2025 19:12

cfzjywxk requested a review from you06 February 11, 2025 00:43

b6g added 12 commits February 12, 2025 15:39

session: track LastCommitTS in SessionVars and check StartTS of a txn…

7890699

… is larger

test

d4ef1cc

dont check startts if it is preset

d7889c3

bazel_prepare

9282f6c

redact sql string

915718a

bazel_prepare

f09dad3

return ErrAssertionFailed

8759101

fix lint

b017b51

use fmt.Errorf instead of ErrAssertionFailed

21161af

comment

1953963

use ts from TSO in test

e928e86

bazel_prepare

85e0179

b6g force-pushed the b6g/tsinvariant1 branch from 88102cb to 85e0179 Compare February 12, 2025 23:44

you06 approved these changes Feb 13, 2025

View reviewed changes

yudongusa approved these changes Feb 13, 2025

View reviewed changes

ti-chi-bot bot added the approved label Feb 13, 2025

ti-chi-bot bot removed the do-not-merge/needs-tests-checked label Feb 13, 2025

ti-chi-bot bot merged commit 0c99ccb into pingcap:master Feb 13, 2025
23 of 24 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

session: track LastCommitTS in SessionVars and check timestamps of later txns are larger #57305

session: track LastCommitTS in SessionVars and check timestamps of later txns are larger #57305

b6g commented Nov 12, 2024 •

edited by you06

Loading

ti-chi-bot bot commented Nov 12, 2024

tiprow bot commented Nov 12, 2024

b6g Nov 12, 2024

b6g Nov 12, 2024

b6g Nov 25, 2024

dveeden commented Nov 18, 2024

codecov bot commented Nov 25, 2024 •

edited

Loading

b6g commented Nov 27, 2024

hawkingrei Nov 27, 2024

b6g commented Nov 27, 2024

b6g commented Nov 27, 2024

b6g commented Nov 28, 2024

ti-chi-bot bot commented Feb 4, 2025

you06 Feb 4, 2025

cfzjywxk Feb 5, 2025

you06 Feb 4, 2025

you06 Feb 4, 2025

you06 Feb 4, 2025

b6g commented Feb 9, 2025

you06 commented Feb 13, 2025

you06 commented Feb 13, 2025

cfzjywxk commented Feb 13, 2025

ti-chi-bot bot commented Feb 13, 2025

hawkingrei commented Feb 13, 2025

tiprow bot commented Feb 13, 2025

		@@ -109,7 +109,7 @@ require (
		github.com/tdakkota/asciicheck v0.2.0

	ts := oracle.GoTimeToTS(time.Now().Add(time.Minute))
	currentTS, err := store.GetOracle().GetTimestamp(context.Background(), &oracle.Option{TxnScope: oracle.GlobalTxnScope})
	ts := oracle.GoTimeToTS(oracle.GetTimeFromTS(currentTS).Add(time.Minute))

session: track LastCommitTS in SessionVars and check timestamps of later txns are larger #57305

session: track LastCommitTS in SessionVars and check timestamps of later txns are larger #57305

Conversation

b6g commented Nov 12, 2024 • edited by you06 Loading

What problem does this PR solve?

What changed and how does it work?

Check List

Release note

ti-chi-bot bot commented Nov 12, 2024

tiprow bot commented Nov 12, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dveeden commented Nov 18, 2024

codecov bot commented Nov 25, 2024 • edited Loading

Codecov Report

b6g commented Nov 27, 2024

Choose a reason for hiding this comment

b6g commented Nov 27, 2024

b6g commented Nov 27, 2024

b6g commented Nov 28, 2024

ti-chi-bot bot commented Feb 4, 2025

[LGTM Timeline notifier]

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

b6g commented Feb 9, 2025

you06 commented Feb 13, 2025

you06 commented Feb 13, 2025

cfzjywxk commented Feb 13, 2025

ti-chi-bot bot commented Feb 13, 2025

hawkingrei commented Feb 13, 2025

tiprow bot commented Feb 13, 2025

b6g commented Nov 12, 2024 •

edited by you06

Loading

codecov bot commented Nov 25, 2024 •

edited

Loading