Skip to content

Conversation

@sre-bot
Copy link
Contributor

@sre-bot sre-bot commented May 29, 2020

cherry-pick #2600 to release-4.0


What is changed, added or deleted? (Required)

I've tried to build tidb locally using go 1.12 and fail with following error

# github.com/pingcap/tidb/store/tikv
store/tikv/2pc.go:765:69: time.Since(lockWaitStartTime).Milliseconds undefined (type time.Duration has no field or method Milliseconds)
store/tikv/2pc.go:838:37: time.Since(lockWaitStartTime).Milliseconds undefined (type time.Duration has no field or method Milliseconds)
note: module requires Go 1.13

It builds ok with Go 1.13+, so I think it's better to update those instruction that refer to Go 1.9 or later.

* Update Go requirements

* Apply suggestions from code review

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@sre-bot sre-bot mentioned this pull request May 29, 2020
@sre-bot sre-bot added contribution This PR is from a community contributor. size/small Changes of a small size. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR. labels May 29, 2020
Copy link
Contributor

@TomShawn TomShawn left a comment

Choose a reason for hiding this comment

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

LGTM

@TomShawn
Copy link
Contributor

/merge

@sre-bot sre-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 29, 2020
@sre-bot
Copy link
Contributor Author

sre-bot commented May 29, 2020

/run-all-tests

@TomShawn TomShawn merged commit 7ffedd8 into pingcap:release-4.0 May 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

contribution This PR is from a community contributor. size/small Changes of a small size. status/can-merge Indicates a PR has been approved by a committer. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants