Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

store/tikv: set short pessimistic lock TTL through failpoints #22431

Merged
merged 5 commits into from
Jan 21, 2021
Merged

store/tikv: set short pessimistic lock TTL through failpoints #22431

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
43f0ac0
store/tikv: set short pessimistic lock TTL through failpoints
sticnarf Jan 19, 2021
df551a2
remove redundant ttlManager failpoint
sticnarf Jan 21, 2021
ea7aac9
Merge remote-tracking branch 'upstream/master' into short-ttl-pessimi…
sticnarf Jan 21, 2021
d608a4a
Merge branch 'master' into short-ttl-pessimistic
ti-srebot Jan 21, 2021
fb0d817
Merge branch 'master' into short-ttl-pessimistic
ti-srebot Jan 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions store/tikv/2pc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,6 +833,12 @@ type ttlManager struct {
}

func (tm *ttlManager) run(c *twoPhaseCommitter, lockCtx *kv.LockCtx) {
failpoint.Inject("runTTLManager", func() {
logutil.BgLogger().Info("[failpoint] injected failure at running ttlManager",
zap.Uint64("txnStartTS", c.startTS))
failpoint.Return()
})
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this redundant with doNotKeepAlive in this pr?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, yes. We should do these things in serial.


// Run only once.
if !atomic.CompareAndSwapUint32((*uint32)(&tm.state), uint32(stateUninitialized), uint32(stateRunning)) {
return
Expand Down
13 changes: 12 additions & 1 deletion store/tikv/pessimistic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
package tikv

import (
"encoding/hex"
"math/rand"
"strings"
"sync/atomic"
Expand Down Expand Up @@ -73,12 +74,22 @@ func (action actionPessimisticLock) handleSingleBatch(c *twoPhaseCommitter, bo *
mutations[i] = mut
}
elapsed := uint64(time.Since(c.txn.startTime) / time.Millisecond)
ttl := elapsed + atomic.LoadUint64(&ManagedLockTTL)
failpoint.Inject("shortPessimisticLockTTL", func() {
ttl = 1
keys := make([]string, 0, len(mutations))
for _, m := range mutations {
keys = append(keys, hex.EncodeToString(m.Key))
}
logutil.BgLogger().Info("[failpoint] injected lock ttl = 1 on pessimistic lock",
zap.Uint64("txnStartTS", c.startTS), zap.Strings("keys", keys))
})
req := tikvrpc.NewRequest(tikvrpc.CmdPessimisticLock, &pb.PessimisticLockRequest{
Mutations: mutations,
PrimaryLock: c.primary(),
StartVersion: c.startTS,
ForUpdateTs: c.forUpdateTS,
LockTtl: elapsed + atomic.LoadUint64(&ManagedLockTTL),
LockTtl: ttl,
IsFirstLock: c.isFirstLock,
WaitTimeout: action.LockWaitTime,
ReturnValues: action.ReturnValues,
Expand Down